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]>
245 lines
7.6 KiB
Go
245 lines
7.6 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package hashers
|
|
|
|
import (
|
|
"crypto/pbkdf2"
|
|
"crypto/rand"
|
|
"crypto/sha256"
|
|
"crypto/subtle"
|
|
"encoding/base64"
|
|
"fmt"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/mattermost/mattermost/server/v8/channels/app/password/phcparser"
|
|
)
|
|
|
|
const (
|
|
// PBKDF2FunctionId is the name of the PBKDF2 hasher.
|
|
PBKDF2FunctionId string = "pbkdf2"
|
|
)
|
|
|
|
const (
|
|
// Default parameter values
|
|
defaultPRFName = "SHA256"
|
|
defaultWorkFactor = 600000
|
|
defaultKeyLength = 32
|
|
|
|
// Length of the salt, in bytes
|
|
saltLenBytes = 16
|
|
)
|
|
|
|
var (
|
|
defaultPRF = sha256.New
|
|
)
|
|
|
|
// PBKDF2 implements the [PasswordHasher] interface using [crypto/pbkdf2] as the
|
|
// hashing method.
|
|
//
|
|
// It is parametrized by:
|
|
// - The work factor: the number of iterations performed during hashing. The
|
|
// larger this number, the longer and more costly the hashing process. OWASP
|
|
// has some recommendations on what number to use here:
|
|
// https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2
|
|
// - The key length: the desired length, in bytes, of the resulting hash.
|
|
//
|
|
// The internal hashing function is always set to SHA256.
|
|
//
|
|
// Its PHC string is of the form:
|
|
//
|
|
// $pbkdf2$f=<F>,w=<W>,l=<L>$<salt>$<hash>
|
|
//
|
|
// Where:
|
|
// - <F> is a string specifying the internal hashing function (defaults to SHA256).
|
|
// - <W> is an integer specifying the work factor (defaults to 600000).
|
|
// - <L> is an integer specifying the key length (defaults to 32).
|
|
// - <salt> is the base64-encoded salt.
|
|
// - <hash> is the base64-encoded hash.
|
|
type PBKDF2 struct {
|
|
workFactor int
|
|
keyLength int
|
|
|
|
phcHeader string
|
|
}
|
|
|
|
// DefaultPBKDF2 returns a [PBKDF2] already initialized with the following
|
|
// parameters:
|
|
// - Internal hashing function: SHA256
|
|
// - Work factor: 600,000
|
|
// - Key length: 32 bytes
|
|
func DefaultPBKDF2() PBKDF2 {
|
|
hasher, err := NewPBKDF2(defaultWorkFactor, defaultKeyLength)
|
|
if err != nil {
|
|
panic("DefaultPBKDF2 implementation is incorrect")
|
|
}
|
|
return hasher
|
|
}
|
|
|
|
// NewPBKDF2 returns a [PBKDF2] initialized with the provided parameters
|
|
func NewPBKDF2(workFactor int, keyLength int) (PBKDF2, error) {
|
|
if workFactor <= 0 {
|
|
return PBKDF2{}, fmt.Errorf("work factor must be strictly positive")
|
|
}
|
|
|
|
if keyLength <= 0 {
|
|
return PBKDF2{}, fmt.Errorf("key length must be strictly positive")
|
|
}
|
|
// Precompute and store the PHC header, since it is common to every hashed
|
|
// password; it will be something like:
|
|
// $pbkdf2$f=SHA256,w=600000,l=32$
|
|
phcHeader := new(strings.Builder)
|
|
|
|
// First, the function ID
|
|
phcHeader.WriteRune('$')
|
|
phcHeader.WriteString(PBKDF2FunctionId)
|
|
|
|
// Then, the parameters
|
|
phcHeader.WriteString("$f=")
|
|
phcHeader.WriteString(defaultPRFName)
|
|
phcHeader.WriteString(",w=")
|
|
phcHeader.WriteString(strconv.Itoa(workFactor))
|
|
phcHeader.WriteString(",l=")
|
|
phcHeader.WriteString(strconv.Itoa(keyLength))
|
|
|
|
// Finish with the '$' that will mark the start of the salt
|
|
phcHeader.WriteRune('$')
|
|
|
|
return PBKDF2{
|
|
workFactor: workFactor,
|
|
keyLength: keyLength,
|
|
phcHeader: phcHeader.String(),
|
|
}, nil
|
|
}
|
|
|
|
// NewPBKDF2FromPHC returns a [PBKDF2] that conforms to the provided parsed PHC,
|
|
// using the same parameters (if valid) present there.
|
|
func NewPBKDF2FromPHC(phc phcparser.PHC) (PBKDF2, error) {
|
|
workFactor, err := strconv.Atoi(phc.Params["w"])
|
|
if err != nil {
|
|
return PBKDF2{}, fmt.Errorf("invalid work factor parameter 'w=%s'", phc.Params["w"])
|
|
}
|
|
|
|
keyLength, err := strconv.Atoi(phc.Params["l"])
|
|
if err != nil {
|
|
return PBKDF2{}, fmt.Errorf("invalid key length parameter 'l=%s'", phc.Params["l"])
|
|
}
|
|
|
|
return NewPBKDF2(workFactor, keyLength)
|
|
}
|
|
|
|
// hashWithSalt calls crypto/pbkdf2.Key with the provided salt and the stored
|
|
// parameters.
|
|
func (p PBKDF2) hashWithSalt(password string, salt []byte) (string, error) {
|
|
hash, err := pbkdf2.Key(defaultPRF, password, salt, p.workFactor, p.keyLength)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed hashing the password: %w", err)
|
|
}
|
|
|
|
encodedHash := base64.RawStdEncoding.EncodeToString(hash)
|
|
return encodedHash, nil
|
|
}
|
|
|
|
// Hash hashes the provided password using the PBKDF2 algorithm with the stored
|
|
// parameters, returning a PHC-compliant string.
|
|
//
|
|
// The salt is generated randomly and stored in the returned PHC string. If the
|
|
// provided password is longer than [PasswordMaxLengthBytes], [ErrPasswordTooLong]
|
|
// is returned.
|
|
func (p PBKDF2) Hash(password string) (string, error) {
|
|
// Enforce a maximum length, even if PBKDF2 can theoretically accept *any* length
|
|
if len(password) > PasswordMaxLengthBytes {
|
|
return "", ErrPasswordTooLong
|
|
}
|
|
|
|
// Create random salt
|
|
salt := make([]byte, saltLenBytes)
|
|
if _, err := io.ReadFull(rand.Reader, salt); err != nil {
|
|
return "", fmt.Errorf("unable to generate salt for user: %w", err)
|
|
}
|
|
|
|
// Compute hash
|
|
hash, err := p.hashWithSalt(password, salt)
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to hash the password: %w", err)
|
|
}
|
|
|
|
// Initialize string builder and base64 encoder
|
|
phcString := new(strings.Builder)
|
|
b64Encoder := base64.RawStdEncoding
|
|
|
|
// Now, start writing: first, the stored header: function ID and parameters
|
|
phcString.WriteString(p.phcHeader)
|
|
|
|
// Next, the encoded salt (the header already contains the initial $, so we
|
|
// can skip it)
|
|
// If we were to use a real encoder using an io.Writer, we would need to
|
|
// call Close after the salt, otherwise the last block doesn't get written;
|
|
// but we don't want to close it yet, because we want to write the hash later;
|
|
// so I think it's not worth using an encoder, and it's better to call
|
|
// EncodeToString directly, here and when writing the hash
|
|
phcString.WriteString(b64Encoder.EncodeToString(salt))
|
|
|
|
// Finally, the encoded hash
|
|
phcString.WriteRune('$')
|
|
phcString.WriteString(hash)
|
|
|
|
return phcString.String(), nil
|
|
}
|
|
|
|
// CompareHashAndPassword compares the provided [phcparser.PHC] with the plain-text
|
|
// password.
|
|
//
|
|
// The provided [phcparser.PHC] is validated to double-check it was generated with
|
|
// this hasher and parameters.
|
|
func (p PBKDF2) CompareHashAndPassword(hash phcparser.PHC, password string) error {
|
|
if len(password) > PasswordMaxLengthBytes {
|
|
return ErrPasswordTooLong
|
|
}
|
|
|
|
// Under FIPS, the OpenSSL PBKDF2 implementation requires keys of at least
|
|
// fipsMinKeyLength bytes. A password shorter than this can never match a
|
|
// stored hash, so return ErrMismatchedHashAndPassword directly rather than
|
|
// letting PBKDF2 fail with a generic crypto error.
|
|
if fipsMinKeyLength > 0 && len(password) < fipsMinKeyLength {
|
|
return ErrMismatchedHashAndPassword
|
|
}
|
|
|
|
// Validate parameters
|
|
if !p.IsPHCValid(hash) {
|
|
return fmt.Errorf("the stored password does not comply with the PBKDF2 parser's PHC serialization")
|
|
}
|
|
|
|
salt, err := base64.RawStdEncoding.DecodeString(hash.Salt)
|
|
if err != nil {
|
|
return fmt.Errorf("failed decoding hash's salt: %w", err)
|
|
}
|
|
|
|
// Hash the new password with the stored hash's salt
|
|
newHash, err := p.hashWithSalt(password, salt)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to hash the password: %w", err)
|
|
}
|
|
|
|
// Compare both hashes
|
|
if subtle.ConstantTimeCompare([]byte(hash.Hash), []byte(newHash)) != 1 {
|
|
return ErrMismatchedHashAndPassword
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// IsPHCValid validates that the provided [phcparser.PHC] is valid, meaning:
|
|
// - The function used to generate it was [PBKDF2FunctionId].
|
|
// - The parameters used to generate it were the same as the ones used to
|
|
// create this hasher.
|
|
func (p PBKDF2) IsPHCValid(phc phcparser.PHC) bool {
|
|
return phc.Id == PBKDF2FunctionId &&
|
|
len(phc.Params) == 3 &&
|
|
phc.Params["f"] == defaultPRFName &&
|
|
phc.Params["w"] == strconv.Itoa(p.workFactor) &&
|
|
phc.Params["l"] == strconv.Itoa(p.keyLength)
|
|
}
|