61b89747ed
This PR refactors and improves the password hashing code within gitea and makes it possible for server administrators to set the password hashing parameters In addition it takes the opportunity to adjust the settings for `pbkdf2` in order to make the hashing a little stronger. The majority of this work was inspired by PR #14751 and I would like to thank @boppy for their work on this. Thanks to @gusted for the suggestion to adjust the `pbkdf2` hashing parameters. Close #14751 --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: John Olheiser <john.olheiser@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
54 lines
1.4 KiB
Go
54 lines
1.4 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package hash
|
|
|
|
import (
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
func init() {
|
|
Register("bcrypt", NewBcryptHasher)
|
|
}
|
|
|
|
// BcryptHasher implements PasswordHasher
|
|
// and uses the bcrypt password hash function.
|
|
type BcryptHasher struct {
|
|
cost int
|
|
}
|
|
|
|
// HashWithSaltBytes a provided password and salt
|
|
func (hasher *BcryptHasher) HashWithSaltBytes(password string, salt []byte) string {
|
|
if hasher == nil {
|
|
return ""
|
|
}
|
|
hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(password), hasher.cost)
|
|
return string(hashedPassword)
|
|
}
|
|
|
|
func (hasher *BcryptHasher) VerifyPassword(password, hashedPassword, salt string) bool {
|
|
return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password)) == nil
|
|
}
|
|
|
|
// NewBcryptHasher is a factory method to create an BcryptHasher
|
|
// The provided config should be either empty or the string representation of the "<cost>"
|
|
// as an integer
|
|
func NewBcryptHasher(config string) *BcryptHasher {
|
|
// This matches the original configuration for `bcrypt` prior to storing hash parameters
|
|
// in the database.
|
|
// THESE VALUES MUST NOT BE CHANGED OR BACKWARDS COMPATIBILITY WILL BREAK
|
|
hasher := &BcryptHasher{
|
|
cost: 10, // cost=10. i.e. 2^10 rounds of key expansion.
|
|
}
|
|
|
|
if config == "" {
|
|
return hasher
|
|
}
|
|
var err error
|
|
hasher.cost, err = parseIntParam(config, "cost", "bcrypt", config, nil)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
return hasher
|
|
}
|