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]>
240 lines
7.9 KiB
Go
240 lines
7.9 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRemoteClusterIsValid(t *testing.T) {
|
|
id := NewId()
|
|
creator := NewId()
|
|
now := GetMillis()
|
|
data := []struct {
|
|
name string
|
|
rc *RemoteCluster
|
|
valid bool
|
|
}{
|
|
{name: "Zero value", rc: &RemoteCluster{}, valid: false},
|
|
{name: "Missing cluster_name", rc: &RemoteCluster{RemoteId: id}, valid: false},
|
|
{name: "Missing host_name", rc: &RemoteCluster{RemoteId: id, Name: NewId()}, valid: false},
|
|
{name: "Missing create_at", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com"}, valid: false},
|
|
{name: "Missing last_ping_at", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com", CreatorId: creator, CreateAt: now}, valid: true},
|
|
{name: "Missing creator", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com", CreateAt: now, LastPingAt: now}, valid: false},
|
|
{name: "Bad default_team_id", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com", CreateAt: now, LastPingAt: now, CreatorId: creator, DefaultTeamId: "bad-id"}, valid: false},
|
|
{name: "Valid default_team_id", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com", CreateAt: now, LastPingAt: now, CreatorId: creator, DefaultTeamId: NewId()}, valid: true},
|
|
{name: "RemoteCluster valid", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "example.com", CreateAt: now, LastPingAt: now, CreatorId: creator}, valid: true},
|
|
{name: "Include protocol", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "http://example.com", CreateAt: now, LastPingAt: now, CreatorId: creator}, valid: true},
|
|
{name: "Include protocol & port", rc: &RemoteCluster{RemoteId: id, Name: NewId(), SiteURL: "http://example.com:8065", CreateAt: now, LastPingAt: now, CreatorId: creator}, valid: true},
|
|
}
|
|
|
|
for _, item := range data {
|
|
appErr := item.rc.IsValid()
|
|
if item.valid {
|
|
assert.Nil(t, appErr, item.name)
|
|
} else {
|
|
assert.NotNil(t, appErr, item.name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestRemoteClusterPreSave(t *testing.T) {
|
|
now := GetMillis()
|
|
|
|
o := RemoteCluster{RemoteId: NewId(), Name: NewId()}
|
|
o.PreSave()
|
|
|
|
require.GreaterOrEqual(t, o.CreateAt, now)
|
|
}
|
|
|
|
func TestRemoteClusterMsgIsValid(t *testing.T) {
|
|
id := NewId()
|
|
now := GetMillis()
|
|
data := []struct {
|
|
name string
|
|
msg *RemoteClusterMsg
|
|
valid bool
|
|
}{
|
|
{name: "Zero value", msg: &RemoteClusterMsg{}, valid: false},
|
|
{name: "Missing remote id", msg: &RemoteClusterMsg{Id: id}, valid: false},
|
|
{name: "Missing Topic", msg: &RemoteClusterMsg{Id: id}, valid: false},
|
|
{name: "Missing Payload", msg: &RemoteClusterMsg{Id: id, CreateAt: now, Topic: "shared_channel"}, valid: false},
|
|
{name: "RemoteClusterMsg valid", msg: &RemoteClusterMsg{Id: id, CreateAt: now, Topic: "shared_channel", Payload: []byte("{\"hello\":\"world\"}")}, valid: true},
|
|
}
|
|
|
|
for _, item := range data {
|
|
appErr := item.msg.IsValid()
|
|
if item.valid {
|
|
assert.Nil(t, appErr, item.name)
|
|
} else {
|
|
assert.NotNil(t, appErr, item.name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestRemoteClusterInviteIsValid(t *testing.T) {
|
|
id := NewId()
|
|
url := "https://localhost:8080/test"
|
|
token := NewId()
|
|
|
|
data := []struct {
|
|
name string
|
|
invite *RemoteClusterInvite
|
|
valid bool
|
|
}{
|
|
{name: "Zero value", invite: &RemoteClusterInvite{}, valid: false},
|
|
{name: "Missing remote id", invite: &RemoteClusterInvite{Token: token, SiteURL: url}, valid: false},
|
|
{name: "Missing site url", invite: &RemoteClusterInvite{RemoteId: id, Token: token}, valid: false},
|
|
{name: "Bad site url", invite: &RemoteClusterInvite{RemoteId: id, Token: token, SiteURL: ":/localhost"}, valid: false},
|
|
{name: "Missing token", invite: &RemoteClusterInvite{RemoteId: id, SiteURL: url}, valid: false},
|
|
{name: "RemoteClusterInvite valid", invite: &RemoteClusterInvite{RemoteId: id, Token: token, SiteURL: url}, valid: true},
|
|
}
|
|
|
|
for _, item := range data {
|
|
appErr := item.invite.IsValid()
|
|
if item.valid {
|
|
assert.Nil(t, appErr, item.name)
|
|
} else {
|
|
assert.NotNil(t, appErr, item.name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestFixTopics(t *testing.T) {
|
|
testData := []struct {
|
|
topics string
|
|
expected string
|
|
}{
|
|
{topics: "", expected: ""},
|
|
{topics: " ", expected: ""},
|
|
{topics: "share", expected: " share "},
|
|
{topics: "share incident", expected: " share incident "},
|
|
{topics: " share incident ", expected: " share incident "},
|
|
{topics: " share incident ", expected: " share incident "},
|
|
}
|
|
|
|
for _, tt := range testData {
|
|
rc := &RemoteCluster{Topics: tt.topics}
|
|
rc.fixTopics()
|
|
assert.Equal(t, tt.expected, rc.Topics)
|
|
}
|
|
}
|
|
|
|
func TestRemoteClusterInviteEncryption(t *testing.T) {
|
|
testData := []struct {
|
|
name string
|
|
badDecrypt bool
|
|
password string
|
|
invite RemoteClusterInvite
|
|
skipFIPS bool
|
|
}{
|
|
{name: "empty password", badDecrypt: false, password: "", invite: makeInvite("https://example.com:8065"), skipFIPS: true},
|
|
{name: "good password", badDecrypt: false, password: "Ultra secret password!", invite: makeInvite("https://example.com:8065")},
|
|
{name: "bad decrypt", badDecrypt: true, password: "correct horse battery staple", invite: makeInvite("https://example.com:8065")},
|
|
}
|
|
|
|
for _, tt := range testData {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if tt.skipFIPS && FIPSEnabled {
|
|
t.Skip("skipping under FIPS: encryption requires keys >= 14 bytes")
|
|
}
|
|
encrypted, err := tt.invite.Encrypt(tt.password)
|
|
require.NoError(t, err)
|
|
|
|
invite := RemoteClusterInvite{}
|
|
if tt.badDecrypt {
|
|
buf := make([]byte, len(encrypted))
|
|
_, err = io.ReadFull(rand.Reader, buf)
|
|
assert.NoError(t, err)
|
|
|
|
err = invite.Decrypt(buf, tt.password)
|
|
require.Error(t, err)
|
|
} else {
|
|
err = invite.Decrypt(encrypted, tt.password)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tt.invite, invite)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRemoteClusterInviteBackwardCompatibility(t *testing.T) {
|
|
// Test that we can decrypt invites created with the old scrypt method
|
|
oldInvite := RemoteClusterInvite{
|
|
RemoteId: NewId(),
|
|
SiteURL: "https://example.com:8065",
|
|
Token: NewId(),
|
|
RefreshedToken: NewId(),
|
|
Version: 2, // Old version using scrypt
|
|
}
|
|
|
|
password := NewTestPassword()
|
|
|
|
// Encrypt with old method (scrypt)
|
|
encrypted, err := oldInvite.Encrypt(password)
|
|
require.NoError(t, err)
|
|
|
|
// Decrypt should work with backward compatibility
|
|
decryptedInvite := RemoteClusterInvite{}
|
|
err = decryptedInvite.Decrypt(encrypted, password)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, oldInvite, decryptedInvite)
|
|
|
|
// Test new version (PBKDF2)
|
|
newInvite := RemoteClusterInvite{
|
|
RemoteId: NewId(),
|
|
SiteURL: "https://example.com:8065",
|
|
Token: NewId(),
|
|
RefreshedToken: NewId(),
|
|
Version: 3, // New version using PBKDF2
|
|
}
|
|
|
|
// Encrypt with new method (PBKDF2)
|
|
encrypted, err = newInvite.Encrypt(password)
|
|
require.NoError(t, err)
|
|
|
|
// Decrypt should work
|
|
decryptedInvite = RemoteClusterInvite{}
|
|
err = decryptedInvite.Decrypt(encrypted, password)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, newInvite, decryptedInvite)
|
|
}
|
|
|
|
func makeInvite(url string) RemoteClusterInvite {
|
|
return RemoteClusterInvite{
|
|
RemoteId: NewId(),
|
|
SiteURL: url,
|
|
Token: NewId(),
|
|
RefreshedToken: NewId(),
|
|
Version: 3,
|
|
}
|
|
}
|
|
|
|
func TestNewIDFromBytes(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
ss string
|
|
}{
|
|
{name: "empty", ss: ""},
|
|
{name: "very short", ss: "x"},
|
|
{name: "normal", ss: "com.mattermost.msteams-sync"},
|
|
{name: "long", ss: "com.mattermost.msteams-synccom.mattermost.msteams-synccom.mattermost.msteams-synccom.mattermost.msteams-sync"},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got1 := newIDFromBytes([]byte(tt.ss))
|
|
|
|
assert.True(t, IsValidId(got1), "not a valid id")
|
|
|
|
got2 := newIDFromBytes([]byte(tt.ss))
|
|
assert.Equal(t, got1, got2, "newIDFromBytes must generate same id for same inputs")
|
|
})
|
|
}
|
|
}
|