From cf99d596f56bc77a95b0867e0b0ece71ee63852b Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Fri, 10 Jun 2016 13:23:28 -0700 Subject: [PATCH] auth: cleanup get user and get role usage --- auth/store.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/auth/store.go b/auth/store.go index a8d1b6dc2..398eacc9a 100644 --- a/auth/store.go +++ b/auth/store.go @@ -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 } }