mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* Add parser and hasher packages The new `password` module includes two packages: - `hashers` provides a structure allowing for seamless migrations between password hashing methods. It also implements two password hashers: bcrypt, which was the current hashing method, and PBKDF2, which is the one we are migrating to. - `parser` provides types and primitives to parse PHC[0] strings, serving as the foundation of the `PasswordHasher` interface and implementations, which are all PHC-based. [0] https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md * Use latest hasher to hash new passwords The previous commit added a LatestHasher variable, that contains the `PasswordHasher` currently in use. Here, we make sure we use it for hashing new passwords, instead of the currently hardcoded bcrypt. * Use errors from hashers' package Some chore work to unify errors defined in `hashers`, not from external packages like `bcrypt`. * Implement password migration logic This commit implements the actual logic to migrate passwords, which can be summarized as: 0. When the user enters their password (either for login in `App.CheckPasswordAndAllCriteria` or for double-checking the password when the app needs additional confirmation for anything in `App.DoubleCheckPassword`), this process is started. 1. The new `App.checkUserPassword` is called. In `users.CheckUserPassword`, we parse the stored hashed password with the new PHC parser and identify whether it was generated with the current hashing method (PBKDF2). If it is, just verify the password as usual and continue normally. 2. If not, start the migration calling `App.migratePassword`: a. First, we call `Users.MigratePassword`, which validates that the stored hash and the provided password match, using the hasher that generated the old hash. b. If the user-provided password matches the old hash, then we simply re-hash that password with our current hasher, the one in `hashers.LatestHasher`. If not, we fail. c. Back in `App.migratePassword`, if the migration was successful, then we update the user in the database with the newly generated hash. * make i18n-extract * Rename getDefaultHasher to getOriginalHasher * Refactor App checkUserPsasword and migratePassword Simplify the flow in these two methods, removing the similarly named users.CheckUserPassword and users.MigratePassword, inlining the logic needed in the App layer and at the same time removing the need to parse the stored hash twice. This implements a package-level function, CompareHashAndPassword: the first step to unexport LatestHasher. * Add a package level Hash method This completely removes the need to expose LatestHasher, and lets us also remove model.HashPassword, in favour of the new hashers.Hash * Unexport LatestHasher * Remove tests for removed functions * Make the linter happy * Remove error no longer used * Allow for parameter migrations on the same hasher Before this, we were only checking that the function ID of the stored hash was the ID of the latest hashing method. Here, we no longer ignore the parameters, so that if in the future we need to migrate to the same hashing method with a different parameter (let's say PBKDF2 with work factor 120,000 instead of work factor 60,000), we can do it by updating the latestHasher variable. IsPHCValid will detect this change and force a migration if needed. * Document new functions * make i18n-extract * Fix typo in comment Co-authored-by: Ben Cooke <[email protected]> * Rename parser package to phcparser * Simplify phcparser.New documentation * Rename scanSymbol to scanSeparator Redefine the list of separator tokens, including EOF as one. * Document undocumented functions that are unexported * Reorder error block in checkUserPassword * Add unit tests for IsLatestHasher * Reorder code in parser.go * Enforce SHA256 as internal function for PBKDF2 * Fix typo in comment Co-authored-by: Eva Sarafianou <[email protected]> --------- Co-authored-by: Ben Cooke <[email protected]> Co-authored-by: Eva Sarafianou <[email protected]> Co-authored-by: Mattermost Build <[email protected]>
152 lines
6.0 KiB
Go
152 lines
6.0 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
// Package hashers provides several implementations of password hashing functions.
|
|
//
|
|
// This package allows for seamless migrations of password hashing methods. To
|
|
// migrate to a new hasher in the future, the steps needed are:
|
|
// 1. Add a new type that implements the [PasswordHasher] interface. Let's call
|
|
// it `NewHasher`.
|
|
// 2. Update the [latestHasher] variable so that it points to a `NewHasher`
|
|
// instance:
|
|
//
|
|
// ``` diff
|
|
// var (
|
|
//
|
|
// // latestHasher is the hasher currently in use.
|
|
// // Any password hashed with a different hasher must be migrated to this one.
|
|
//
|
|
// - latestHasher PasswordHasher = DefaultPBKDF2()
|
|
// + latestHasher PasswordHasher = DefaultNewHasher()
|
|
// ```
|
|
// 3. Modify [GetHasherFromPHCString] to add a new case in the switch to
|
|
// identify the new function ID.
|
|
//
|
|
// If what is needed is to upgrade to a new set of parameters for the same
|
|
// hashing method (let's say keep using PBKDF2 but increase the work factor
|
|
// from 60,000 to 120,000), then no modification to [GetHasherFromPHCString]
|
|
// is needed. Simply update the [latestHasher] varible with the new parameter,
|
|
// and [IsPHCValid] will detect the difference in the parameter.
|
|
//
|
|
// Note that the migration happens in [App.migratePassword], which is triggered
|
|
// whenever the user enters their password and an old hashing method is
|
|
// identified when parsing their stored hashed password.
|
|
// This means that the older password hashers can *never* be removed, unless all
|
|
// users whose passwords are not migrated are either forced to re-login, or
|
|
// forced to generate a new password.
|
|
//
|
|
// Another important note is that once a server upgrades to a version with an
|
|
// updated hashing method, downgrading to any previous version will break the
|
|
// login flow for users whose passwords were migrated to the newer method.
|
|
package hashers
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mattermost/mattermost/server/v8/channels/app/password/phcparser"
|
|
)
|
|
|
|
// PasswordHasher is a password hasher compliant with the PHC string format:
|
|
// https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md
|
|
//
|
|
// Implementations of this interface need to make sure that all of the methods
|
|
// are thread-safe.
|
|
type PasswordHasher interface {
|
|
// Hash computes a hash of the provided password, returning a PHC string
|
|
// containing all the information that was needed to compute it: the function
|
|
// used to generate it, its version, parameters and salt, if needed.
|
|
//
|
|
// If an implementation of Hash needs a salt to generate the hash, it will
|
|
// create one, so that callers don't need to provide it.
|
|
Hash(password string) (string, error)
|
|
|
|
// CompareHashAndPassword compares the parsed PHC and a provided password,
|
|
// returning an error if and only if the hashes do not match.
|
|
//
|
|
// Implementations need to make sure that the comparisons are done in constant
|
|
// time; e.g., using crypto/internal/fips140/subtle.ConstantTimeCompare.
|
|
CompareHashAndPassword(hash phcparser.PHC, password string) error
|
|
|
|
// IsPHCValid validates whether a parsed PHC string conforms to the parameters
|
|
// of the hasher.
|
|
IsPHCValid(hash phcparser.PHC) bool
|
|
}
|
|
|
|
const (
|
|
// Maximum password length for all password hashers
|
|
PasswordMaxLengthBytes = 72
|
|
)
|
|
|
|
var (
|
|
// latestHasher is the hasher currently in use.
|
|
// Any password hashed with a different hasher must be migrated to this one.
|
|
latestHasher PasswordHasher = DefaultPBKDF2()
|
|
|
|
// ErrPasswordTooLong is the error returned when the provided password is
|
|
// longer than [PasswordMaxLengthBytes].
|
|
ErrPasswordTooLong = fmt.Errorf("password too long; maximum length in bytes: %d", PasswordMaxLengthBytes)
|
|
|
|
// ErrMismatchedHashAndPassword is the error returned when the provided
|
|
// password does not match the stored hash
|
|
ErrMismatchedHashAndPassword = fmt.Errorf("hash and password do not match")
|
|
)
|
|
|
|
// getOriginalHasher returns a [BCrypt] hasher, the first hasher used in the
|
|
// codebase.
|
|
func getOriginalHasher(phcString string) (PasswordHasher, phcparser.PHC) {
|
|
// [BCrypt] is somewhat of an edge case, since it is not PHC-compliant, and
|
|
// needs the whole PHC string in its Hash field
|
|
return NewBCrypt(), phcparser.PHC{Hash: phcString}
|
|
}
|
|
|
|
// GetHasherFromPHC returns the password hasher that was used to generate the
|
|
// provided PHC string.
|
|
// If the PHC string is not valid, or the function ID is unknown, this function
|
|
// defaults to the first hasher ever used, which did not properly implement PHC:
|
|
// the [BCrypt] hasher.
|
|
func GetHasherFromPHCString(phcString string) (PasswordHasher, phcparser.PHC, error) {
|
|
phc, err := phcparser.New(strings.NewReader(phcString)).Parse()
|
|
if err != nil {
|
|
// If the PHC string is invalid, return the original hasher, bcrypt
|
|
bcrypt, bcryptPhc := getOriginalHasher(phcString)
|
|
return bcrypt, bcryptPhc, nil
|
|
}
|
|
|
|
// First check whether PHC conforms to the latest hasher
|
|
if latestHasher.IsPHCValid(phc) {
|
|
return latestHasher, phc, nil
|
|
}
|
|
|
|
// If not, check the function ID and create a new one depending on it
|
|
switch phc.Id {
|
|
case PBKDF2FunctionId:
|
|
pbkdf2, err := NewPBKDF2FromPHC(phc)
|
|
if err != nil {
|
|
return PBKDF2{}, phcparser.PHC{}, fmt.Errorf("the provided PHC string is PBKDF2, but is not valid: %w", err)
|
|
}
|
|
return pbkdf2, phc, nil
|
|
// If the function ID is unknown, return the original hasher
|
|
default:
|
|
bcrypt, phc := getOriginalHasher(phcString)
|
|
return bcrypt, phc, nil
|
|
}
|
|
}
|
|
|
|
// Hash hashes the provided password with the latest hashing method.
|
|
func Hash(password string) (string, error) {
|
|
return latestHasher.Hash(password)
|
|
}
|
|
|
|
// CompareHashAndPassword compares the parsed [phcparser.PHC] and the provided
|
|
// password using the latest hashing method.
|
|
func CompareHashAndPassword(phc phcparser.PHC, password string) error {
|
|
return latestHasher.CompareHashAndPassword(phc, password)
|
|
}
|
|
|
|
// IsLatestHasher verifies that the provided hasher is the latest one. This
|
|
// function is useful for identifying stored hashes that require a migration.
|
|
func IsLatestHasher(hasher PasswordHasher) bool {
|
|
return latestHasher == hasher
|
|
}
|