Minor changes

pkg/hypervisor/user.go

@@ -197,7 +197,7 @@ func NewSingleUserStore(username string, users UserStore) *SingleUserStore {
 
 // User gets a user.
 func (s *SingleUserStore) User(name string) (*User, error) {
-	if !s.allowName(name) {
+	if !s.isNameAllowed(name) {
 		return nil, ErrNameNotAllowed
 	}
 
@@ -206,7 +206,7 @@ func (s *SingleUserStore) User(name string) (*User, error) {
 
 // AddUser adds a new user.
 func (s *SingleUserStore) AddUser(user User) error {
-	if !s.allowName(user.Name) {
+	if !s.isNameAllowed(user.Name) {
 		return ErrNameNotAllowed
 	}
 
@@ -215,7 +215,7 @@ func (s *SingleUserStore) AddUser(user User) error {
 
 // SetUser sets an existing user.
 func (s *SingleUserStore) SetUser(user User) error {
-	if !s.allowName(user.Name) {
+	if !s.isNameAllowed(user.Name) {
 		return ErrNameNotAllowed
 	}
 
@@ -224,14 +224,14 @@ func (s *SingleUserStore) SetUser(user User) error {
 
 // RemoveUser removes a user.
 func (s *SingleUserStore) RemoveUser(name string) error {
-	if !s.allowName(name) {
+	if !s.isNameAllowed(name) {
 		return ErrNameNotAllowed
 	}
 
 	return s.UserStore.RemoveUser(name)
 }
 
-func (s *SingleUserStore) allowName(name string) bool {
+func (s *SingleUserStore) isNameAllowed(name string) bool {
 	return name == s.username
 }
 

pkg/hypervisor/user_manager.go

@@ -143,8 +143,6 @@ func (s *UserManager) Authorize(next http.Handler) http.Handler {
 // ChangePassword returns a HandlerFunc for changing the user's password.
 func (s *UserManager) ChangePassword() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var user = r.Context().Value(userKey).(User)
-
 		var rb struct {
 			OldPassword string `json:"old_password"`
 			NewPassword string `json:"new_password"`
@@ -155,6 +153,7 @@ func (s *UserManager) ChangePassword() http.HandlerFunc {
 			return
 		}
 
+		user := r.Context().Value(userKey).(User)
 		if ok := user.VerifyPassword(rb.OldPassword); !ok {
 			httputil.WriteJSON(w, r, http.StatusUnauthorized, ErrBadLogin)
 			return