mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
153 lines
6.1 KiB
Go
153 lines
6.1 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/public/model"
|
|
"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 = model.UserPasswordMaxLength
|
|
)
|
|
|
|
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 wraps [model.ErrPasswordTooLong] so that errors.Is
|
|
// matches both the hashers-level and model-level sentinel.
|
|
ErrPasswordTooLong = fmt.Errorf("hashers: %w", model.ErrPasswordTooLong)
|
|
|
|
// 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 GetLatestHasher().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 GetLatestHasher().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 GetLatestHasher() == hasher
|
|
}
|