mirror of
https://github.com/go-gitea/gitea
synced 2024-12-20 11:14:29 +01:00
623c93ff46
- The current implementation of `RandomString` doesn't give you a most-possible unique randomness. It gives you 6*`length` instead of the possible 8*`length` bits(or as `length`x bytes) randomness. This is because `RandomString` is being limited to a max value of 63, this in order to represent the random byte as a letter/digit.
- The recommendation of pbkdf2 is to use 64+ bit salt, which the `RandomString` doesn't give with a length of 10, instead of increasing 10 to a higher number, this patch adds a new function called `RandomBytes` which does give you the guarentee of 8*`length` randomness and thus corresponding of `length`x bytes randomness.
- Use hexadecimal to store the bytes value in the database, as mentioned, it doesn't play nice in order to convert it to a string. This will always be a length of 32(with `length` being 16).
- When we detect on `Authenticate`(source: db) that a user has the old format of salt, re-hash the password such that the user will have it's password hashed with increased salt.
Thanks to @zeripath for working out the rouge edges from my first commit 😄.
Co-authored-by: lafriks <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
45 lines
1.5 KiB
Go
45 lines
1.5 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package db
|
|
|
|
import (
|
|
"code.gitea.io/gitea/models/db"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// Authenticate authenticates the provided user against the DB
|
|
func Authenticate(user *user_model.User, login, password string) (*user_model.User, error) {
|
|
if user == nil {
|
|
return nil, user_model.ErrUserNotExist{Name: login}
|
|
}
|
|
|
|
if !user.IsPasswordSet() || !user.ValidatePassword(password) {
|
|
return nil, user_model.ErrUserNotExist{UID: user.ID, Name: user.Name}
|
|
}
|
|
|
|
// Update password hash if server password hash algorithm have changed
|
|
// Or update the password when the salt length doesn't match the current
|
|
// recommended salt length, this in order to migrate user's salts to a more secure salt.
|
|
if user.PasswdHashAlgo != setting.PasswordHashAlgo || len(user.Salt) != user_model.SaltByteLength*2 {
|
|
if err := user.SetPassword(password); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := user_model.UpdateUserCols(db.DefaultContext, user, "passwd", "passwd_hash_algo", "salt"); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// WARN: DON'T check user.IsActive, that will be checked on reqSign so that
|
|
// user could be hint to resend confirm email.
|
|
if user.ProhibitLogin {
|
|
return nil, user_model.ErrUserProhibitLogin{
|
|
UID: user.ID,
|
|
Name: user.Name,
|
|
}
|
|
}
|
|
|
|
return user, nil
|
|
}
|