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

auth: cleanup get user and get role usage

Browse Source
This commit is contained in:
Xiang Li 2016-06-10 13:23:28 -07:00
parent 0914d65c1f
commit cf99d596f5
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
auth/store.go
View File

@ -177,16 +177,9 @@ func (as *authStore) Authenticate(name string, password string) (*pb.Authenticat
tx.Lock()
defer tx.Unlock()
_, vs := tx.UnsafeRange(authUsersBucketName, []byte(name), nil, 0)
if len(vs) != 1 {
plog.Noticef("authentication failed, user %s doesn't exist", name)
return &pb.AuthenticateResponse{}, ErrAuthFailed
}
user := &authpb.User{}
err := user.Unmarshal(vs[0])
if err != nil {
return nil, err
user := getUser(tx, name)
if user == nil {
return nil, ErrAuthFailed
}
if bcrypt.CompareHashAndPassword(user.Password, []byte(password)) != nil {
@ -309,8 +302,8 @@ func (as *authStore) UserGrantRole(r *pb.AuthUserGrantRoleRequest) (*pb.AuthUser
}
if r.Role != rootRole {
_, vs := tx.UnsafeRange(authRolesBucketName, []byte(r.Role), nil, 0)
if len(vs) != 1 {
role := getRole(tx, r.Role)
if role == nil {
return nil, ErrRoleNotFound
}
}