Cleanup models.User.HashPassword (#3334)

2 files changed, 13 insertions, 13 deletions

diff --git a/models/user.go b/models/user.go
index c30c66d6c3..aaf2320b42 100644
--- a/models/user.go
+++ b/models/user.go
@@ -388,17 +388,20 @@ func (u *User) NewGitSig() *git.Signature {
 	}
 }
 
+func hashPassword(passwd, salt string) string {
+	tempPasswd := pbkdf2.Key([]byte(passwd), []byte(salt), 10000, 50, sha256.New)
+	return fmt.Sprintf("%x", tempPasswd)
+}
+
 // HashPassword hashes a password using PBKDF.
-func (u *User) HashPassword() {
-	newPasswd := pbkdf2.Key([]byte(u.Passwd), []byte(u.Salt), 10000, 50, sha256.New)
-	u.Passwd = fmt.Sprintf("%x", newPasswd)
+func (u *User) HashPassword(passwd string) {
+	u.Passwd = hashPassword(passwd, u.Salt)
 }
 
 // ValidatePassword checks if given password matches the one belongs to the user.
 func (u *User) ValidatePassword(passwd string) bool {
-	newUser := &User{Passwd: passwd, Salt: u.Salt}
-	newUser.HashPassword()
-	return subtle.ConstantTimeCompare([]byte(u.Passwd), []byte(newUser.Passwd)) == 1
+	tempHash := hashPassword(passwd, u.Salt)
+	return subtle.ConstantTimeCompare([]byte(u.Passwd), []byte(tempHash)) == 1
 }
 
 // IsPasswordSet checks if the password is set or left empty
@@ -711,7 +714,7 @@ func CreateUser(u *User) (err error) {
 	if u.Salt, err = GetUserSalt(); err != nil {
 		return err
 	}
-	u.HashPassword()
+	u.HashPassword(u.Passwd)
 	u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization
 	u.MaxRepoCreation = -1
 
diff --git a/models/user_test.go b/models/user_test.go
index c0b7dace7f..4fd0bc0fad 100644
--- a/models/user_test.go
+++ b/models/user_test.go
@@ -135,13 +135,11 @@ func TestHashPasswordDeterministic(t *testing.T) {
 		pass := string(b)
 
 		// save the current password in the user - hash it and store the result
-		u.Passwd = pass
-		u.HashPassword()
+		u.HashPassword(pass)
 		r1 := u.Passwd
 
 		// run again
-		u.Passwd = pass
-		u.HashPassword()
+		u.HashPassword(pass)
 		r2 := u.Passwd
 
 		// assert equal (given the same salt+pass, the same result is produced)
@@ -158,7 +156,6 @@ func BenchmarkHashPassword(b *testing.B) {
 	u := &User{Salt: string(bs), Passwd: pass}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		u.HashPassword()
-		u.Passwd = pass
+		u.HashPassword(pass)
 	}
 }