Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword

Hotfix/type fix validate password
This commit is contained in:
Lunny Xiao 2015-04-24 15:03:21 +08:00
commit 673a76d638
4 changed files with 5 additions and 5 deletions

View file

@ -169,7 +169,7 @@ func UserSignIn(uname, passwd string) (*User, error) {
// For plain login, user must exist to reach this line.
// Now verify password.
if u.LoginType == PLAIN {
if !u.ValidtePassword(passwd) {
if !u.ValidatePassword(passwd) {
return nil, ErrUserNotExist
}
return u, nil

View file

@ -143,8 +143,8 @@ func (u *User) EncodePasswd() {
u.Passwd = fmt.Sprintf("%x", newPasswd)
}
// ValidtePassword checks if given password matches the one belongs to the user.
func (u *User) ValidtePassword(passwd string) bool {
// 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()
return u.Passwd == newUser.Passwd

View file

@ -164,7 +164,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) {
}
return
}
if !u.ValidtePassword(ctx.Query("password")) {
if !u.ValidatePassword(ctx.Query("password")) {
ctx.HandleAPI(422, "Username or password is not correct.")
return
}