Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: make usernameFromCtx more go style

Browse Source
This commit is contained in:
Xiang Li 2016-06-07 21:17:32 -07:00
parent 9a14b796e0
commit cc1155c93b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etcdserver/v3_server.go
View File

@ -394,20 +394,23 @@ func (s *EtcdServer) RoleDelete(ctx context.Context, r *pb.AuthRoleDeleteRequest
}
func (s *EtcdServer) usernameFromCtx(ctx context.Context) (string, error) {
md, mdexist := metadata.FromContext(ctx)
if mdexist {
token, texist := md["token"]
if texist {
username, uexist := s.AuthStore().UsernameFromToken(token[0])
if !uexist {
plog.Warningf("invalid auth token: %s", token[0])
return "", ErrInvalidAuthToken
}
return username, nil
}
md, ok := metadata.FromContext(ctx)
if !ok {
return "", nil
}
return "", nil
ts, tok := md["token"]
if !tok {
return "", nil
}
token := ts[0]
username, uok := s.AuthStore().UsernameFromToken(token)
if !uok {
plog.Warningf("invalid auth token: %s", token)
return "", ErrInvalidAuthToken
}
return username, nil
}
func (s *EtcdServer) processInternalRaftRequest(ctx context.Context, r pb.InternalRaftRequest) (*applyResult, error) {