domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Change EncodePasswd to HashPassword (#3329)

Browse source 
* Change EncodePasswd to HashPassword

* Create test+benchmark for HashPassword
This commit is contained in:
Morgan Bazalgette 2018-01-08 23:28:18 +01:00 • committed by Kim "BKC" Carlbäcker
parent f2b841d0ec
commit 674cfb7cac
7 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/user.go
View file

@ -388,8 +388,8 @@ func (u *User) NewGitSig() *git.Signature {
}
}
// EncodePasswd encodes password to safe format.
func (u *User) EncodePasswd() {
// 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)
}
@ -397,7 +397,7 @@ func (u *User) EncodePasswd() {
// 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.EncodePasswd()
newUser.HashPassword()
return subtle.ConstantTimeCompare([]byte(u.Passwd), []byte(newUser.Passwd)) == 1
}
@ -711,7 +711,7 @@ func CreateUser(u *User) (err error) {
if u.Salt, err = GetUserSalt(); err != nil {
return err
}
u.EncodePasswd()
u.HashPassword()
u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization
u.MaxRepoCreation = -1