Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-21 15:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(db): rename User.Passwd to User.Password (#7196)

Browse Source
This commit is contained in:
Joe Chen
2022-10-22 14:56:25 +08:00
committed by GitHub
parent c502dc6ed8
commit 7cbd84d5b3
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/db/user.go
View File

@@ -168,15 +168,15 @@ func (u *User) NewGitSig() *git.Signature {
// EncodePassword encodes password to safe format.
func (u *User) EncodePassword() {
newPasswd := pbkdf2.Key([]byte(u.Passwd), []byte(u.Salt), 10000, 50, sha256.New)
u.Passwd = fmt.Sprintf("%x", newPasswd)
newPasswd := pbkdf2.Key([]byte(u.Password), []byte(u.Salt), 10000, 50, sha256.New)
u.Password = fmt.Sprintf("%x", newPasswd)
}
// 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 := &User{Password: passwd, Salt: u.Salt}
newUser.EncodePassword()
return subtle.ConstantTimeCompare([]byte(u.Passwd), []byte(newUser.Passwd)) == 1
return subtle.ConstantTimeCompare([]byte(u.Password), []byte(newUser.Password)) == 1
}
// UploadAvatar saves custom avatar for user.
@@ -499,7 +499,7 @@ func VerifyUserActiveCode(code string) (user *User) {
if user = parseUserFromCode(code); user != nil {
// time limit code
prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands
data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Password + user.Rands
if tool.VerifyTimeLimitCode(data, minutes, prefix) {
return user
@@ -515,7 +515,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
if user := parseUserFromCode(code); user != nil {
// time limit code
prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
data := com.ToStr(user.ID) + email + user.LowerName + user.Password + user.Rands
if tool.VerifyTimeLimitCode(data, minutes, prefix) {
emailAddress := &EmailAddress{Email: email}