Files
9ed85b6850 Cherry-pick Go 1.25.8 upgrade and FIPS password fixes to release-11.4 (#36123)
* ci: shard server Postgres tests into 4 parallel runners (#35739)

Cherry-pick of 00296f9b49 from master.

* updated go to version 1.25.8 (#35817)

Cherry-pick of 32a10bac62 from master.

* Move password hashers from server/v8 to server/public (#35805)

Cherry-pick of cca3f08574 from master.

* Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905)

Cherry-pick of 1bdd985b41 from master.

* upgrade golangci-lint (#35845)

Cherry-pick of 157e0400b2 from 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 of 866f759e4b (Mm 66662 bump deps)
relevant to this incompatibility.

* Fix FIPS-incompatible passwords and config in e2e test suites (#36001)

Cherry-pick of b51b4a8937 from 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 of 39f1979aa5 from 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 of 9223935f16 from 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 of 39f1979aa5, 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 in 39f1979aa5 is 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]>
2026-04-16 12:10:03 -03:00

409 lines
8.4 KiB
Go

package cluster
import (
"sync"
"sync/atomic"
"testing"
"time"
"github.com/mattermost/mattermost/server/public/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestMakeWaitForInterval(t *testing.T) {
t.Run("panics on invalid interval", func(t *testing.T) {
assert.Panics(t, func() {
MakeWaitForInterval(0)
})
})
const neverRun = -1 * time.Second
testCases := []struct {
Description string
Interval time.Duration
LastFinished time.Duration
Expected time.Duration
}{
{
"never run, 5 minutes",
5 * time.Minute,
neverRun,
0,
},
{
"run 1 minute ago, 5 minutes",
5 * time.Minute,
-1 * time.Minute,
4 * time.Minute,
},
{
"run 2 minutes ago, 5 minutes",
5 * time.Minute,
-2 * time.Minute,
3 * time.Minute,
},
{
"run 4 minutes 30 seconds ago, 5 minutes",
5 * time.Minute,
-4*time.Minute - 30*time.Second,
30 * time.Second,
},
{
"run 4 minutes 59 seconds ago, 5 minutes",
5 * time.Minute,
-4*time.Minute - 59*time.Second,
1 * time.Second,
},
{
"never run, 1 hour",
1 * time.Hour,
neverRun,
0,
},
{
"run 1 minute ago, 1 hour",
1 * time.Hour,
-1 * time.Minute,
59 * time.Minute,
},
{
"run 20 minutes ago, 1 hour",
1 * time.Hour,
-20 * time.Minute,
40 * time.Minute,
},
{
"run 55 minutes 30 seconds ago, 1 hour",
1 * time.Hour,
-55*time.Minute - 30*time.Second,
4*time.Minute + 30*time.Second,
},
{
"run 59 minutes 59 seconds ago, 1 hour",
1 * time.Hour,
-59*time.Minute - 59*time.Second,
1 * time.Second,
},
}
for _, testCase := range testCases {
t.Run(testCase.Description, func(t *testing.T) {
now := time.Now()
var lastFinished time.Time
if testCase.LastFinished != neverRun {
lastFinished = now.Add(testCase.LastFinished)
}
actual := MakeWaitForInterval(testCase.Interval)(now, JobMetadata{
LastFinished: lastFinished,
})
assert.Equal(t, testCase.Expected, actual)
})
}
}
func TestMakeWaitForRoundedInterval(t *testing.T) {
t.Run("panics on invalid interval", func(t *testing.T) {
assert.Panics(t, func() {
MakeWaitForRoundedInterval(0)
})
})
const neverRun = -1 * time.Second
topOfTheHour := time.Now().Truncate(1 * time.Hour)
topOfTheDay := time.Now().Truncate(24 * time.Hour)
testCases := []struct {
Description string
Interval time.Duration
Now time.Time
LastFinished time.Duration
Expected time.Duration
}{
{
"5 minutes, top of the hour, never run",
5 * time.Minute,
topOfTheHour,
neverRun,
0,
},
{
"5 minutes, top of the hour less 1 minute, never run",
5 * time.Minute,
topOfTheHour.Add(-1 * time.Minute),
neverRun,
0,
},
{
"5 minutes, top of the hour less 1 minute, run 1 minute ago",
5 * time.Minute,
topOfTheHour.Add(-1 * time.Minute),
-1 * time.Minute,
1 * time.Minute,
},
{
"5 minutes, top of the hour plus 1 minute, run 2 minutes ago",
5 * time.Minute,
topOfTheHour.Add(1 * time.Minute),
-2 * time.Minute,
0,
},
{
"5 minutes, top of the hour plus 1 minute, run 30 seconds ago",
5 * time.Minute,
topOfTheHour.Add(1 * time.Minute),
-30 * time.Second,
4 * time.Minute,
},
{
"5 minutes, top of the hour plus 7 minutes, run 30 seconds ago",
5 * time.Minute,
topOfTheHour.Add(7 * time.Minute),
-30 * time.Second,
3 * time.Minute,
},
{
"30 minutes, top of the hour, never run",
30 * time.Minute,
topOfTheHour,
neverRun,
0,
},
{
"30 minutes, top of the hour less 1 minute, never run",
30 * time.Minute,
topOfTheHour.Add(-1 * time.Minute),
neverRun,
0,
},
{
"30 minutes, top of the hour less 1 minute, run 1 minute ago",
30 * time.Minute,
topOfTheHour.Add(-1 * time.Minute),
-1 * time.Minute,
1 * time.Minute,
},
{
"30 minutes, top of the hour plus 1 minute, run 2 minutes ago",
30 * time.Minute,
topOfTheHour.Add(1 * time.Minute),
-2 * time.Minute,
0,
},
{
"30 minutes, top of the hour plus 1 minute, run 30 seconds ago",
30 * time.Minute,
topOfTheHour.Add(1 * time.Minute),
-30 * time.Second,
29 * time.Minute,
},
{
"30 minutes, top of the hour plus 7 minutes, run 30 seconds ago",
30 * time.Minute,
topOfTheHour.Add(7 * time.Minute),
-30 * time.Second,
23 * time.Minute,
},
{
"24 hours, top of the day, never run",
24 * time.Hour,
topOfTheDay,
neverRun,
0,
},
{
"24 hours, top of the day less 1 minute, never run",
24 * time.Hour,
topOfTheDay.Add(-1 * time.Minute),
neverRun,
0,
},
{
"24 hours, top of the day less 1 minute, run 1 minute ago",
24 * time.Hour,
topOfTheDay.Add(-1 * time.Minute),
-1 * time.Minute,
1 * time.Minute,
},
{
"24 hours, top of the day plus 1 minute, run 2 minutes ago",
24 * time.Hour,
topOfTheDay.Add(1 * time.Minute),
-2 * time.Minute,
0,
},
{
"24 hours, top of the day plus 1 minute, run 30 seconds ago",
24 * time.Hour,
topOfTheDay.Add(1 * time.Minute),
-30 * time.Second,
23*time.Hour + 59*time.Minute,
},
{
"24 hours, top of the day plus 7 minutes, run 30 seconds ago",
24 * time.Hour,
topOfTheDay.Add(7 * time.Minute),
-30 * time.Second,
23*time.Hour + 53*time.Minute,
},
}
for _, testCase := range testCases {
t.Run(testCase.Description, func(t *testing.T) {
var lastFinished time.Time
if testCase.LastFinished != neverRun {
lastFinished = testCase.Now.Add(testCase.LastFinished)
}
actual := MakeWaitForRoundedInterval(testCase.Interval)(testCase.Now, JobMetadata{
LastFinished: lastFinished,
})
assert.Equal(t, testCase.Expected, actual)
})
}
}
func TestSchedule(t *testing.T) {
t.Parallel()
makeKey := model.NewId
t.Run("single-threaded", func(t *testing.T) {
t.Parallel()
mockPluginAPI := newMockPluginAPI(t)
count := new(int32)
callback := func() {
atomic.AddInt32(count, 1)
}
job, err := Schedule(mockPluginAPI, makeKey(), MakeWaitForInterval(100*time.Millisecond), callback)
require.NoError(t, err)
require.NotNil(t, job)
time.Sleep(1 * time.Second)
err = job.Close()
require.NoError(t, err)
time.Sleep(1 * time.Second)
// Shouldn't have hit 20 in this time frame
assert.Less(t, *count, int32(20))
// Should have hit at least 5 in this time frame
assert.Greater(t, *count, int32(5))
})
t.Run("multi-threaded, single job", func(t *testing.T) {
t.Parallel()
mockPluginAPI := newMockPluginAPI(t)
count := new(int32)
callback := func() {
atomic.AddInt32(count, 1)
}
var jobs []*Job
key := makeKey()
for range 3 {
job, err := Schedule(mockPluginAPI, key, MakeWaitForInterval(100*time.Millisecond), callback)
require.NoError(t, err)
require.NotNil(t, job)
jobs = append(jobs, job)
}
time.Sleep(1 * time.Second)
var wg sync.WaitGroup
for i := range 3 {
job := jobs[i]
wg.Go(func() {
err := job.Close()
require.NoError(t, err)
})
}
wg.Wait()
time.Sleep(1 * time.Second)
// Shouldn't have hit 20 in this time frame
assert.Less(t, *count, int32(20))
// Should have hit at least 5 in this time frame
assert.Greater(t, *count, int32(5))
})
t.Run("multi-threaded, multiple jobs", func(t *testing.T) {
t.Parallel()
mockPluginAPI := newMockPluginAPI(t)
countA := new(int32)
callbackA := func() {
atomic.AddInt32(countA, 1)
}
countB := new(int32)
callbackB := func() {
atomic.AddInt32(countB, 1)
}
keyA := makeKey()
keyB := makeKey()
var jobs []*Job
for i := range 3 {
var key string
var callback func()
if i <= 1 {
key = keyA
callback = callbackA
} else {
key = keyB
callback = callbackB
}
job, err := Schedule(mockPluginAPI, key, MakeWaitForInterval(100*time.Millisecond), callback)
require.NoError(t, err)
require.NotNil(t, job)
jobs = append(jobs, job)
}
time.Sleep(1 * time.Second)
var wg sync.WaitGroup
for i := range 3 {
job := jobs[i]
wg.Go(func() {
err := job.Close()
require.NoError(t, err)
})
}
wg.Wait()
time.Sleep(1 * time.Second)
// Shouldn't have hit 20 in this time frame
assert.Less(t, *countA, int32(20))
// Should have hit at least 5 in this time frame
assert.Greater(t, *countA, int32(5))
// Shouldn't have hit 20 in this time frame
assert.Less(t, *countB, int32(20))
// Should have hit at least 5 in this time frame
assert.Greater(t, *countB, int32(5))
})
}