enforce License.IsSeatCountEnforced if set (#31354)

* enforce License.IsSeatCountEnforced if set

If a license sets `IsSeatCountEnforced`, enforce the user limit therein
as a hard cap.

Fixes: https://mattermost.atlassian.net/browse/CLD-9260

* remove duplicate tests

* Improve user limit error messages and display

- Add separate error messages for licensed vs unlicensed servers
- Licensed servers: "Server exceeds maximum licensed users. ERROR_LICENSED_USERS_LIMITS"
- Unlicensed servers: "Server exceeds safe user limit. ERROR_SAFETY_LIMITS_EXCEEDED"
- Remove redundant "Contact administrator" text from activation errors shown to admins
- Fix system console to display actual server error messages instead of generic "Failed to activate user"

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Add license nil check and test coverage

- Add license != nil check in GetServerLimits to prevent panic
- Add test case to verify graceful handling of license being set to nil
- Ensures fallback to hard-coded limits when license becomes nil

Co-authored-by: lieut-data <lieut-data@users.noreply.github.com>

* Fix user limits tests to expect license-specific error IDs

Update test expectations to use the new license-specific error IDs:
- app.user.update_active.license_user_limit.exceeded for licensed server user activation
- api.user.create_user.license_user_limits.exceeded for licensed server user creation

Also update frontend to show actual server error messages instead of generic ones in system console.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Remove redundant license nil test

The test couldn't meaningfully verify nil license behavior since it relied on
hard-coded constants that can't be modified in the test.

Co-authored-by: lieut-data <lieut-data@users.noreply.github.com>

* Fix whitespace issue in limits_test.go

Remove unnecessary trailing newline to pass style checks.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* updated i18n

* s/ERROR_LICENSED_USERS_LIMITS/ERROR_LICENSED_USERS_LIMIT_EXCEEDED/, expand warning log

* Add 5% grace period for licensed user limits

- Add calculateGraceLimit() function with 5% or +1 minimum grace
- Apply grace period only to licensed servers with seat count enforcement
- Handle zero user licenses by returning zero grace limit
- Add comprehensive test coverage for grace period scenarios
- Unlicensed servers maintain existing hard-coded limits without grace

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix TestCreateUserOrGuestSeatCountEnforcement to account for 5% grace period

The test was failing because it expected user creation to fail at exactly
the license limit, but the implementation now includes a 5% grace period
before enforcement kicks in.

Changes:
- Update test cases to create users up to the grace limit (6 for a 5-user license)
- Add comments explaining the grace period calculation
- Both regular user and guest user creation tests now properly validate
  enforcement at the grace limit rather than the base license limit

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Fix TestUpdateActiveWithUserLimits to account for 5% grace period

Update test expectations to match the new grace period behavior:
- At base limit (100) but below grace limit (105): should succeed
- At grace limit (105): should fail
- Above grace limit (106): should fail

This aligns the tests with the license enforcement implementation
that includes a 5% grace period above the licensed user count.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
Co-authored-by: lieut-data <lieut-data@users.noreply.github.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Jesse Hallam
2025-06-13 17:12:05 -03:00
коммит произвёл GitHub
родитель f89326574f
Коммит 0082e3e94d
8 изменённых файлов: 978 добавлений и 204 удалений

496
server/channels/app/user_limits_test.go Обычный файл
Просмотреть файл

@@ -0,0 +1,496 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
package app
import (
"testing"
"github.com/mattermost/mattermost/server/public/model"
storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func TestUpdateActiveWithUserLimits(t *testing.T) {
mainHelper.Parallel(t)
t.Run("unlicensed server", func(t *testing.T) {
t.Run("reactivation allowed below hard limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.Srv().SetLicense(nil)
// Deactivate user
deactivatedUser, appErr := th.App.UpdateActive(th.Context, th.BasicUser, false)
require.Nil(t, appErr)
require.NotEqual(t, 0, deactivatedUser.DeleteAt)
// Reactivate user (should succeed - below hard limit)
updatedUser, appErr := th.App.UpdateActive(th.Context, th.BasicUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
t.Run("reactivation blocked at hard limit", func(t *testing.T) {
th := SetupWithStoreMock(t)
defer th.TearDown()
th.App.Srv().SetLicense(nil)
// Mock user count at hard limit
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(5000), nil) // At 5000 hard limit
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
user := &model.User{
Id: model.NewId(),
Email: "test@example.com",
Username: "testuser",
DeleteAt: model.GetMillis(),
}
// Try to reactivate user (should fail)
updatedUser, appErr := th.App.UpdateActive(th.Context, user, true)
require.NotNil(t, appErr)
require.Nil(t, updatedUser)
require.Equal(t, "app.user.update_active.user_limit.exceeded", appErr.Id)
})
t.Run("reactivation blocked above hard limit", func(t *testing.T) {
th := SetupWithStoreMock(t)
defer th.TearDown()
th.App.Srv().SetLicense(nil)
// Mock user count to exceed hard limit
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(6000), nil) // Over 5000 hard limit
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
user := &model.User{
Id: model.NewId(),
Email: "test@example.com",
Username: "testuser",
DeleteAt: model.GetMillis(),
}
// Try to reactivate user (should fail)
updatedUser, appErr := th.App.UpdateActive(th.Context, user, true)
require.NotNil(t, appErr)
require.Nil(t, updatedUser)
require.Equal(t, "app.user.update_active.user_limit.exceeded", appErr.Id)
})
})
t.Run("licensed server with seat count enforcement", func(t *testing.T) {
t.Run("reactivation allowed below limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 100
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Deactivate user
_, appErr := th.App.UpdateActive(th.Context, th.BasicUser, false)
require.Nil(t, appErr)
// Reactivate user (should succeed - below limit)
updatedUser, appErr := th.App.UpdateActive(th.Context, th.BasicUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
t.Run("reactivation blocked at grace limit", func(t *testing.T) {
th := SetupWithStoreMock(t)
defer th.TearDown()
userLimit := 100
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Mock user count at grace limit (105 = 100 + 5% grace period)
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(105), nil) // At grace limit
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
user := &model.User{
Id: model.NewId(),
Email: "test@example.com",
Username: "testuser",
DeleteAt: model.GetMillis(),
}
// Try to reactivate user (should fail)
updatedUser, appErr := th.App.UpdateActive(th.Context, user, true)
require.NotNil(t, appErr)
require.Nil(t, updatedUser)
require.Equal(t, "app.user.update_active.license_user_limit.exceeded", appErr.Id)
})
t.Run("reactivation allowed at base limit but below grace limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5 // Grace limit will be 6 (5 + 1 minimum)
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// InitBasic creates 3 users, create 2 more to reach base limit of 5
th.CreateUser()
th.CreateUser()
// Deactivate a user
_, appErr := th.App.UpdateActive(th.Context, th.BasicUser, false)
require.Nil(t, appErr)
// Reactivate user (should succeed - we're at base limit 5 but below grace limit 6)
updatedUser, appErr := th.App.UpdateActive(th.Context, th.BasicUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
t.Run("reactivation blocked above grace limit", func(t *testing.T) {
th := SetupWithStoreMock(t)
defer th.TearDown()
userLimit := 100
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Mock user count above grace limit (106 > 105 grace limit)
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(106), nil) // Above grace limit
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
user := &model.User{
Id: model.NewId(),
Email: "test@example.com",
Username: "testuser",
DeleteAt: model.GetMillis(),
}
// Try to reactivate user (should fail)
updatedUser, appErr := th.App.UpdateActive(th.Context, user, true)
require.NotNil(t, appErr)
require.Nil(t, updatedUser)
require.Equal(t, "app.user.update_active.license_user_limit.exceeded", appErr.Id)
})
})
t.Run("licensed server without seat count enforcement", func(t *testing.T) {
t.Run("reactivation allowed below unenforced limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = false
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create 2 additional users to have 3 total (below limit of 5)
th.CreateUser()
th.CreateUser()
// Deactivate user
_, appErr := th.App.UpdateActive(th.Context, th.BasicUser, false)
require.Nil(t, appErr)
// Reactivate user (should succeed - enforcement disabled and below limit)
updatedUser, appErr := th.App.UpdateActive(th.Context, th.BasicUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
t.Run("reactivation allowed at unenforced limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = false
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create 4 additional users to have 5 total (at limit of 5)
th.CreateUser()
th.CreateUser()
th.CreateUser()
th.CreateUser()
// Create a user and then deactivate them
testUser := th.CreateUser()
_, appErr := th.App.UpdateActive(th.Context, testUser, false)
require.Nil(t, appErr)
// Reactivate user (should succeed - enforcement disabled)
updatedUser, appErr := th.App.UpdateActive(th.Context, testUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
t.Run("reactivation allowed above unenforced limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = false
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create 5 additional users to have 6 total (above limit of 5)
th.CreateUser()
th.CreateUser()
th.CreateUser()
th.CreateUser()
th.CreateUser()
// Create a user and then deactivate them
testUser := th.CreateUser()
_, appErr := th.App.UpdateActive(th.Context, testUser, false)
require.Nil(t, appErr)
// Reactivate user (should succeed - enforcement disabled)
updatedUser, appErr := th.App.UpdateActive(th.Context, testUser, true)
require.Nil(t, appErr)
require.Equal(t, int64(0), updatedUser.DeleteAt)
})
})
}
func TestCreateUserOrGuestSeatCountEnforcement(t *testing.T) {
mainHelper.Parallel(t)
t.Run("seat count enforced - allows user creation when under limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// InitBasic creates 3 users, so we're under the limit of 5
user := &model.User{
Email: "TestCreateUserOrGuest@example.com",
Username: "username_123",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.Nil(t, appErr)
require.NotNil(t, createdUser)
require.Equal(t, "username_123", createdUser.Username)
})
t.Run("seat count enforced - blocks user creation when at limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create 3 additional users to reach the grace limit of 6 (3 from InitBasic + 3)
// Grace limit for 5 users is 6 (5% grace period)
th.CreateUser()
th.CreateUser()
th.CreateUser()
// Now at grace limit - attempting to create another user should fail
user := &model.User{
Email: "TestSeatCount@example.com",
Username: "seat_test_user",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.NotNil(t, appErr)
require.Nil(t, createdUser)
require.Equal(t, "api.user.create_user.license_user_limits.exceeded", appErr.Id)
})
t.Run("seat count enforced - blocks user creation when over limit", func(t *testing.T) {
// Use mocks for this test since we can't actually create users beyond the safety limit
th := SetupWithStoreMock(t)
defer th.TearDown()
userLimit := 5
currentUserCount := int64(6) // Over limit
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(currentUserCount, nil)
mockUserStore.On("IsEmpty", true).Return(false, nil)
mockGroupStore := storemocks.GroupStore{}
mockGroupStore.On("GetByName", "seat_test_user", mock.Anything).Return(nil, nil)
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
mockStore.On("Group").Return(&mockGroupStore)
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
user := &model.User{
Email: "TestSeatCount@example.com",
Username: "seat_test_user",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.NotNil(t, appErr)
require.Nil(t, createdUser)
require.Equal(t, "api.user.create_user.license_user_limits.exceeded", appErr.Id)
})
t.Run("seat count not enforced - allows user creation even when over limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = false
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create additional users to exceed the limit (3 from InitBasic + 3 = 6, over limit of 5)
th.CreateUser()
th.CreateUser()
th.CreateUser()
// Should still allow creation since enforcement is disabled
user := &model.User{
Email: "TestSeatCount@example.com",
Username: "seat_test_user",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.Nil(t, appErr)
require.NotNil(t, createdUser)
require.Equal(t, "seat_test_user", createdUser.Username)
})
t.Run("no license - uses existing hard limit logic", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.Srv().SetLicense(nil)
// Should allow creation under hard limit
user := &model.User{
Email: "TestSeatCount@example.com",
Username: "seat_test_user",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.Nil(t, appErr)
require.NotNil(t, createdUser)
require.Equal(t, "seat_test_user", createdUser.Username)
})
t.Run("license without Users feature - no seat count enforcement", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = nil
th.App.Srv().SetLicense(license)
// Should allow creation since Users feature is nil
user := &model.User{
Email: "TestSeatCount@example.com",
Username: "seat_test_user",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, false)
require.Nil(t, appErr)
require.NotNil(t, createdUser)
require.Equal(t, "seat_test_user", createdUser.Username)
})
t.Run("guest creation with seat count enforcement - blocks when at limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// Create 3 additional users to reach the grace limit of 6 (3 from InitBasic + 3)
// Grace limit for 5 users is 6 (5% grace period)
th.CreateUser()
th.CreateUser()
th.CreateUser()
// Now at grace limit - attempting to create a guest should fail
user := &model.User{
Email: "TestSeatCountGuest@example.com",
Username: "seat_test_guest",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, true)
require.NotNil(t, appErr)
require.Nil(t, createdUser)
require.Equal(t, "api.user.create_user.license_user_limits.exceeded", appErr.Id)
})
t.Run("guest creation with seat count enforcement - allows when under limit", func(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
userLimit := 5
license := model.NewTestLicense("")
license.IsSeatCountEnforced = true
license.Features.Users = &userLimit
th.App.Srv().SetLicense(license)
// InitBasic creates 3 users, so we're under the limit of 5
user := &model.User{
Email: "TestSeatCountGuest@example.com",
Username: "seat_test_guest",
Password: "Password1",
EmailVerified: true,
}
createdUser, appErr := th.App.createUserOrGuest(th.Context, user, true)
require.Nil(t, appErr)
require.NotNil(t, createdUser)
require.Equal(t, "seat_test_guest", createdUser.Username)
})
}