mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* MM-67592 - be changes for team admin abac channels (#35353) * MM-67592 - be changes for team admin abac channels * Revert team-scoped API routes, keep app layer business logic * move from config to permission; Add cluster-aware LRU cache for policy team scope lookup * remove unnecessary references to config value * local/remote cache invalidation consistency for policy scope * Replace policy scope cache with store-level team scope query * rename functions and add comments to query --------- Co-authored-by: Mattermost Build <[email protected]> * MM 67594 - policies CUD operations to team settings modal channels ABAC (#35590) * MM-67592 - be changes for team admin abac channels * Revert team-scoped API routes, keep app layer business logic * move from config to permission; Add cluster-aware LRU cache for policy team scope lookup * remove unnecessary references to config value * local/remote cache invalidation consistency for policy scope * Replace policy scope cache with store-level team scope query * format files correctly * fix mock expectations for store-query approach in tests * rename functions and add comments to query * revert error ids to original to prevent break tests * adjust translations * MM-67669 - add tab to team settings modal and basic listing * adjust tests and fix linter * use existing search api logic * fix style and adjust flaky test to clean up and restore orinals * address ai corabbit feedback and fix linter * fix unit tests * MM-67592 - be changes for team admin abac channels (#35353) * MM-67592 - be changes for team admin abac channels * fix linter * fix ts linter for playwright * Revert team-scoped API routes, keep app layer business logic * move from config to permission; Add cluster-aware LRU cache for policy team scope lookup * remove unnecessary references to config value * local/remote cache invalidation consistency for policy scope * Replace policy scope cache with store-level team scope query * format files correctly * fix mock expectations for store-query approach in tests * rename functions and add comments to query * revert error ids to original to prevent break tests * adjust translations --------- Co-authored-by: Mattermost Build <[email protected]> * MM-67594 - support cud operations for team abac BE changes * create the team settings policy edit section, reuse most components, add basic e2e * move optional refresh policy list button to list component * temp get team admins cud policies and sync job * enhance validation and adjust e2e * Fix testExpression permission; fix pagination of team policies; add isValidId validation * adjust styles, handling renaming and add permission migrations * update the permissions names, use the simple confirmation modal, define the delete modal * fix policy deletion flow * fix some linter issues and adjust helper tests * remove delete from list and fix e2e * code comments clean up * remove CEL editor for now, clean styles, enhance e2e * fix linter, adjust unit test * fix linter and add missing translation * fix policy deletion ownership and sanitize test expression * fixed e2e tests * rollback orphaned policy on failed channel assignment * enforce channelless check before last_team_id fallback * enforce channelless guard on assign fallback too * add translations missing * add teamId to audit payload when present * fix refresh button pagination reset * fix null safety in channel selector loadChannels * use responsive width cap for team settings modal and adjust header size * remove redundant raw term from channel search URL, add showRefreshButton prop to PolicyList component * handle error when stamping last team ID on channelless policy * replace Props-based ownership with in-memory LRU cache, disable save on zero channels * make e2e tests more reliable in CI * test skip if no license valid found * add childCount guard to cache-hit paths and reduce TTL to 5s * fix e2e, adjust translation * address review feedback: flatten permission checks and separate error types - Flatten nested permission branching in deleteAccessControlPolicy using early returns to reduce indentation (review: isacikgoz) - Validate teamID as input (400) before using it for permission checks (403) in testExpression and validateExpressionAgainstRequester handlers - Remove redundant hasSystemPermission check in searchAccessControlPolicies since system_admin role already includes manage_team_access_rules - Refactor ValidateTeamAdminPolicyOwnership to return (bool, *model.AppError) separating "not owned" from "internal error" across all 8 call sites - Update tests to assert on both return values * add persistent team scope to access control policies, replace in-memory cache * fix translation * fix case-insensitive policy search and sanitize search term input * make policies tests have a unique name * decouple scope/scopeID filter from TeamID in policy store * Fix authZ bypass searchChannelsForAccessControlPolicy by forcing TeamIds to authorized team * show unsaved changes on navigator back, and list all private channels on load * filter already applied channels to a policy * adjust the styles to dark mode; do not show added channels to the policy in the add channels modal * fix linter * MM-67967 add sync status footer to team settings (#35729) * MM-67967 add sync status footer to team settings * remove magic numbers and strings and polish the code * fix linter * fix linter: replace interface{} with any per gofmt rewrite rule * refine getJobsByType team-scoped filtering and permissions * fix sync footer stuck in syncing state on job creation error * fix team-scoped job pagination in getJobsByType * Fix authZ bypass searchChannelsForAccessControlPolicy by forcing TeamIds to authorized team * implement ux feedback, change titles font, fix marging and scroll view jump * MM-68135 - migrate add channels to policy modal to generic modal (#35907) * MM-67920 unify e2e team settings tests (#35867) * MM-67920 - extract duplicated policy editor helpers * remove duplicate team icon test file * rename Access Control to Membership Policies in e2e * replace networkidle with explicit element waits * fix attribute loading issue --------- --------- Co-authored-by: Mattermost Build <[email protected]> * fix playwright feedback issues and persist filters to the store layer in the no systemconsole path * Improve policy scope validation and team admin security checks * Renamed public channels to "AAA Public Channel %03d" and private ones to "ZZZ Private..." so the 55 public channels now fill the 50-result cap * fix e2e tests and add new unit tests to improve coverage * Improve e2e test stability: race condition handling and timeout adjustments * Improve team-scoped ABAC policies: scope preservation, input validation, shared exclusion * Add comprehensive ABAC test coverage: team admin ops and security validation to reduce flakyness * Fix team policy editor back button: preserve navigation intent through Undo * style: format import statements for better readability * Enhance access control policy creation for team admins: enforce scope stamping from query parameters to prevent unauthorized team assignments --------- Co-authored-by: Mattermost Build <[email protected]> Co-authored-by: Hanzo Dev <[email protected]>
580 lines
22 KiB
Go
580 lines
22 KiB
Go
// 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"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
|
|
)
|
|
|
|
// createTestPolicyHierarchy creates a parent policy and child channel policies in the real store,
|
|
// and configures the AccessControl mock to return the parent via GetPolicy.
|
|
// It returns (parentPolicy, mockACS) for further configuration.
|
|
func createTestPolicyHierarchy(
|
|
t *testing.T,
|
|
th *TestHelper,
|
|
channels []*model.Channel,
|
|
) (*model.AccessControlPolicy, *mocks.AccessControlServiceInterface) {
|
|
t.Helper()
|
|
|
|
parentPolicy := &model.AccessControlPolicy{
|
|
ID: model.NewId(),
|
|
Type: model.AccessControlPolicyTypeParent,
|
|
Version: model.AccessControlPolicyVersionV0_2,
|
|
Revision: 1,
|
|
Name: "Test Team Policy " + model.NewId(),
|
|
Rules: []model.AccessControlPolicyRule{
|
|
{Expression: "true", Actions: []string{"*"}},
|
|
},
|
|
}
|
|
|
|
var err error
|
|
parentPolicy, err = th.App.Srv().Store().AccessControlPolicy().Save(th.Context, parentPolicy)
|
|
require.NoError(t, err)
|
|
|
|
for _, ch := range channels {
|
|
child := &model.AccessControlPolicy{
|
|
ID: ch.Id,
|
|
Type: model.AccessControlPolicyTypeChannel,
|
|
Version: model.AccessControlPolicyVersionV0_2,
|
|
Revision: 1,
|
|
}
|
|
appErr := child.Inherit(parentPolicy)
|
|
require.Nil(t, appErr)
|
|
|
|
_, err = th.App.Srv().Store().AccessControlPolicy().Save(th.Context, child)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
|
|
mockACS.On("GetPolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.policy_not_found", nil, "", 404)).Maybe()
|
|
mockACS.On("NormalizePolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("*model.AccessControlPolicy")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.normalize_skip", nil, "", 500)).Maybe()
|
|
|
|
return parentPolicy, mockACS
|
|
}
|
|
|
|
func TestValidateTeamScopePolicyChannelAssignment(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
t.Run("empty channel list returns error", func(t *testing.T) {
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{})
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.team.access_policies.channels_required.app_error", appErr.Id)
|
|
})
|
|
|
|
t.Run("nonexistent channel returns error", func(t *testing.T) {
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{model.NewId()})
|
|
require.NotNil(t, appErr)
|
|
})
|
|
|
|
t.Run("public channel returns error", func(t *testing.T) {
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{th.BasicChannel.Id})
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.pap.access_control.channel_not_private", appErr.Id)
|
|
})
|
|
|
|
t.Run("channel from wrong team returns error", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
otherChannel := th.CreatePrivateChannel(t, otherTeam)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{otherChannel.Id})
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.team.access_policies.channel_wrong_team.app_error", appErr.Id)
|
|
})
|
|
|
|
t.Run("shared channel returns error", func(t *testing.T) {
|
|
channel := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
channel.Shared = model.NewPointer(true)
|
|
_, err := th.App.UpdateChannel(th.Context, channel)
|
|
require.Nil(t, err)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{channel.Id})
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.pap.access_control.channel_shared", appErr.Id)
|
|
})
|
|
|
|
t.Run("group-constrained channel returns error", func(t *testing.T) {
|
|
channel := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
channel.GroupConstrained = model.NewPointer(true)
|
|
_, err := th.App.UpdateChannel(th.Context, channel)
|
|
require.Nil(t, err)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{channel.Id})
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.pap.access_control.channel_group_constrained", appErr.Id)
|
|
})
|
|
|
|
t.Run("valid private channel in team succeeds", func(t *testing.T) {
|
|
channel := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{channel.Id})
|
|
require.Nil(t, appErr)
|
|
})
|
|
|
|
t.Run("multiple valid private channels succeed", func(t *testing.T) {
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
ch2 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{ch1.Id, ch2.Id})
|
|
require.Nil(t, appErr)
|
|
})
|
|
|
|
t.Run("mix of valid and invalid channels returns error", func(t *testing.T) {
|
|
validChannel := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
|
|
appErr := th.App.ValidateTeamScopePolicyChannelAssignment(th.Context, th.BasicTeam.Id, []string{
|
|
validChannel.Id,
|
|
th.BasicChannel.Id, // public — invalid
|
|
})
|
|
require.NotNil(t, appErr)
|
|
})
|
|
}
|
|
|
|
func TestValidateTeamAdminSelfInclusion(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
t.Run("empty expression passes", func(t *testing.T) {
|
|
appErr := th.App.ValidateTeamAdminSelfInclusion(th.Context, th.BasicUser.Id, "")
|
|
require.Nil(t, appErr)
|
|
})
|
|
|
|
t.Run("matching expression passes", func(t *testing.T) {
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), "true", mock.Anything).
|
|
Return([]*model.User{th.BasicUser}, int64(1), nil)
|
|
|
|
appErr := th.App.ValidateTeamAdminSelfInclusion(th.Context, th.BasicUser.Id, "true")
|
|
require.Nil(t, appErr)
|
|
})
|
|
|
|
t.Run("non-matching expression returns error", func(t *testing.T) {
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), "false", mock.Anything).
|
|
Return([]*model.User{}, int64(0), nil)
|
|
|
|
appErr := th.App.ValidateTeamAdminSelfInclusion(th.Context, th.BasicUser.Id, "false")
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.team.access_policies.self_exclusion.app_error", appErr.Id)
|
|
})
|
|
|
|
t.Run("expression evaluation error wraps as validation error", func(t *testing.T) {
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), "bad_expr", mock.Anything).
|
|
Return(([]*model.User)(nil), int64(0), model.NewAppError("test", "test.eval_failed", nil, "", 500))
|
|
|
|
appErr := th.App.ValidateTeamAdminSelfInclusion(th.Context, th.BasicUser.Id, "bad_expr")
|
|
require.NotNil(t, appErr)
|
|
assert.Equal(t, "app.team.access_policies.validation_error.app_error", appErr.Id)
|
|
})
|
|
}
|
|
|
|
func TestSearchTeamAccessPolicies(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
t.Run("returns empty when no policies match", func(t *testing.T) {
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
mockACS.On("GetPolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.not_found", nil, "", 404)).Maybe()
|
|
mockACS.On("NormalizePolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("*model.AccessControlPolicy")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.normalize_skip", nil, "", 500)).Maybe()
|
|
|
|
policies, total, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
assert.Empty(t, policies)
|
|
assert.Equal(t, int64(0), total)
|
|
})
|
|
|
|
t.Run("filters out system-scoped policies", func(t *testing.T) {
|
|
// Create a parent policy with NO child channels -> system-scoped
|
|
_, _ = createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
|
|
policies, total, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
assert.Empty(t, policies, "system-scoped policy should be filtered out")
|
|
assert.Equal(t, int64(0), total)
|
|
})
|
|
|
|
t.Run("includes team-scoped policy", func(t *testing.T) {
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
teamPolicy, mockACS := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), "true", mock.Anything).
|
|
Return([]*model.User{th.BasicUser}, int64(1), nil)
|
|
|
|
policies, total, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
found := false
|
|
for _, p := range policies {
|
|
if p.ID == teamPolicy.ID {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
assert.True(t, found, "team-scoped policy should be in results")
|
|
assert.True(t, total >= 1, "at least one policy expected")
|
|
})
|
|
|
|
t.Run("filters out cross-team policies", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
crossTeamChannel := th.CreatePrivateChannel(t, otherTeam)
|
|
crossTeamPolicy, mockACS := createTestPolicyHierarchy(t, th, []*model.Channel{crossTeamChannel})
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string"), mock.Anything).
|
|
Return([]*model.User{th.BasicUser}, int64(1), nil).Maybe()
|
|
|
|
policies, _, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
for _, p := range policies {
|
|
assert.NotEqual(t, crossTeamPolicy.ID, p.ID, "cross-team policy should be filtered out")
|
|
}
|
|
})
|
|
|
|
t.Run("includes channelless policy found via scope query", func(t *testing.T) {
|
|
// Policy with no channels but with scope=team — found only via the second
|
|
// (scope-based) query in SearchTeamAccessPolicies, not via channel inference.
|
|
policy, mockACS := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
policy.Scope = model.AccessControlPolicyScopeTeam
|
|
policy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, policy)
|
|
require.NoError(t, err)
|
|
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"), "true", mock.Anything).
|
|
Return([]*model.User{th.BasicUser}, int64(1), nil)
|
|
|
|
policies, _, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
found := false
|
|
for _, p := range policies {
|
|
if p.ID == policy.ID {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
assert.True(t, found, "channelless policy with team scope should appear in search results")
|
|
})
|
|
}
|
|
|
|
// TestSearchTeamAccessPolicies_SelfExclusionFiltering verifies that policies
|
|
// whose rules the admin doesn't satisfy are filtered out of search results.
|
|
func TestSearchTeamAccessPolicies_SelfExclusionFiltering(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
|
|
parentPolicy := &model.AccessControlPolicy{
|
|
ID: model.NewId(),
|
|
Type: model.AccessControlPolicyTypeParent,
|
|
Version: model.AccessControlPolicyVersionV0_2,
|
|
Revision: 1,
|
|
Name: "Exclusive Policy",
|
|
Rules: []model.AccessControlPolicyRule{
|
|
{Expression: "user.attributes.clearance == 'top-secret'", Actions: []string{"*"}},
|
|
},
|
|
}
|
|
var err error
|
|
parentPolicy, err = th.App.Srv().Store().AccessControlPolicy().Save(th.Context, parentPolicy)
|
|
require.NoError(t, err)
|
|
|
|
child := &model.AccessControlPolicy{
|
|
ID: ch1.Id,
|
|
Type: model.AccessControlPolicyTypeChannel,
|
|
Version: model.AccessControlPolicyVersionV0_2,
|
|
Revision: 1,
|
|
}
|
|
appErr := child.Inherit(parentPolicy)
|
|
require.Nil(t, appErr)
|
|
_, err = th.App.Srv().Store().AccessControlPolicy().Save(th.Context, child)
|
|
require.NoError(t, err)
|
|
|
|
originalACS := th.App.Srv().ch.AccessControl
|
|
mockACS := &mocks.AccessControlServiceInterface{}
|
|
th.App.Srv().ch.AccessControl = mockACS
|
|
t.Cleanup(func() {
|
|
th.App.Srv().ch.AccessControl = originalACS
|
|
mockACS.AssertExpectations(t)
|
|
})
|
|
|
|
mockACS.On("GetPolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("string")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.policy_not_found", nil, "", 404)).Maybe()
|
|
mockACS.On("NormalizePolicy", mock.AnythingOfType("*request.Context"), mock.AnythingOfType("*model.AccessControlPolicy")).
|
|
Return((*model.AccessControlPolicy)(nil), model.NewAppError("test", "test.normalize_skip", nil, "", 500)).Maybe()
|
|
mockACS.On("QueryUsersForExpression", mock.AnythingOfType("*request.Context"),
|
|
"user.attributes.clearance == 'top-secret'", mock.Anything).
|
|
Return([]*model.User{}, int64(0), nil)
|
|
|
|
policies, total, appErr := th.App.SearchTeamAccessPolicies(th.Context, th.BasicTeam.Id, th.BasicUser.Id, model.AccessControlPolicySearch{})
|
|
require.Nil(t, appErr)
|
|
assert.Empty(t, policies, "policy where admin doesn't satisfy rules should be filtered out")
|
|
assert.Equal(t, int64(0), total, "total should reflect filtered count")
|
|
}
|
|
|
|
func TestValidateTeamAdminPolicyOwnership(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
t.Run("policy scoped to team passes", func(t *testing.T) {
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
teamPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, teamPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.True(t, owned)
|
|
})
|
|
|
|
t.Run("policy scoped to different team fails", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
ch1 := th.CreatePrivateChannel(t, otherTeam)
|
|
otherTeamPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, otherTeamPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.False(t, owned)
|
|
})
|
|
|
|
t.Run("cross-team policy fails", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
ch2 := th.CreatePrivateChannel(t, otherTeam)
|
|
crossPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1, ch2})
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, crossPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.False(t, owned)
|
|
})
|
|
|
|
t.Run("policy with no channels but with scope passes", func(t *testing.T) {
|
|
noChannelPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
// Set scope on the channelless policy
|
|
noChannelPolicy.Scope = model.AccessControlPolicyScopeTeam
|
|
noChannelPolicy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, noChannelPolicy)
|
|
require.NoError(t, err)
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, noChannelPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.True(t, owned)
|
|
})
|
|
|
|
t.Run("policy with no channels and no scope fails", func(t *testing.T) {
|
|
noChannelPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, noChannelPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.False(t, owned)
|
|
})
|
|
|
|
t.Run("policy with scope for different team fails", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
noChannelPolicy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
noChannelPolicy.Scope = model.AccessControlPolicyScopeTeam
|
|
noChannelPolicy.ScopeID = otherTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, noChannelPolicy)
|
|
require.NoError(t, err)
|
|
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, noChannelPolicy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.False(t, owned)
|
|
})
|
|
|
|
t.Run("nonexistent policy fails", func(t *testing.T) {
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, model.NewId())
|
|
require.Nil(t, appErr)
|
|
assert.False(t, owned)
|
|
})
|
|
}
|
|
|
|
func TestReconcilePolicyTeamScope(t *testing.T) {
|
|
th := Setup(t).InitBasic(t)
|
|
|
|
// Helper to read scope directly from the store (bypasses enterprise layer).
|
|
getScope := func(t *testing.T, policyID string) (string, string) {
|
|
t.Helper()
|
|
p, err := th.App.Srv().Store().AccessControlPolicy().Get(th.Context, policyID)
|
|
require.NoError(t, err)
|
|
return p.Scope, p.ScopeID
|
|
}
|
|
|
|
t.Run("single team channels sets scope", func(t *testing.T) {
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
ch2 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1, ch2})
|
|
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope)
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
})
|
|
|
|
t.Run("cross-team channels clears scope", func(t *testing.T) {
|
|
otherTeam := th.CreateTeam(t)
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
ch2 := th.CreatePrivateChannel(t, otherTeam)
|
|
|
|
// Create policy with scope already set
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1, ch2})
|
|
policy.Scope = model.AccessControlPolicyScopeTeam
|
|
policy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, policy)
|
|
require.NoError(t, err)
|
|
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Empty(t, scope)
|
|
assert.Empty(t, scopeID)
|
|
})
|
|
|
|
t.Run("no channels preserves existing scope", func(t *testing.T) {
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
policy.Scope = model.AccessControlPolicyScopeTeam
|
|
policy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, policy)
|
|
require.NoError(t, err)
|
|
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope)
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
})
|
|
|
|
t.Run("no channels and no scope stays empty", func(t *testing.T) {
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{})
|
|
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Empty(t, scope)
|
|
assert.Empty(t, scopeID)
|
|
})
|
|
|
|
t.Run("skip save when scope already correct", func(t *testing.T) {
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
// Pre-set the correct scope
|
|
policy.Scope = model.AccessControlPolicyScopeTeam
|
|
policy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, policy)
|
|
require.NoError(t, err)
|
|
|
|
// SavePolicy should NOT be called since scope is already correct
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
// Verify scope unchanged
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope)
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
})
|
|
|
|
t.Run("stale channel reference skips reconciliation", func(t *testing.T) {
|
|
// Simulate a channel being deleted after it was assigned to a policy.
|
|
// GetChannels returns fewer channels than channelIDs, so reconciliation
|
|
// must be skipped to avoid stamping an incorrect scope.
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
// Pre-set a scope so we can verify it is preserved after the no-op.
|
|
policy.Scope = model.AccessControlPolicyScopeTeam
|
|
policy.ScopeID = th.BasicTeam.Id
|
|
_, err := th.App.Srv().Store().AccessControlPolicy().Save(th.Context, policy)
|
|
require.NoError(t, err)
|
|
|
|
// Delete the channel from the DB to make the reference stale.
|
|
err = th.App.Srv().Store().Channel().PermanentDelete(th.Context, ch1.Id)
|
|
require.NoError(t, err)
|
|
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope, "scope should be preserved when channel is stale")
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
})
|
|
|
|
t.Run("pre-scope policy migration: reconcile before unassign sets scope", func(t *testing.T) {
|
|
// Simulates a pre-scope policy (no scope field) with channels in a team.
|
|
// The pre-flight reconcile before unassign should set the scope.
|
|
ch1 := th.CreatePrivateChannel(t, th.BasicTeam)
|
|
policy, _ := createTestPolicyHierarchy(t, th, []*model.Channel{ch1})
|
|
|
|
// Verify scope is initially empty (pre-scope policy)
|
|
scope, _ := getScope(t, policy.ID)
|
|
assert.Empty(t, scope)
|
|
|
|
// Pre-flight reconcile (called before unassign in the handler)
|
|
appErr := th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
// Scope is now set
|
|
scope, scopeID := getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope)
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
|
|
// Simulate unassign: remove the child policy
|
|
err := th.App.Srv().Store().AccessControlPolicy().Delete(th.Context, ch1.Id)
|
|
require.NoError(t, err)
|
|
|
|
// Post-unassign reconcile: no channels → no-op, scope preserved
|
|
appErr = th.App.ReconcilePolicyTeamScope(th.Context, policy.ID)
|
|
require.Nil(t, appErr)
|
|
|
|
scope, scopeID = getScope(t, policy.ID)
|
|
assert.Equal(t, model.AccessControlPolicyScopeTeam, scope)
|
|
assert.Equal(t, th.BasicTeam.Id, scopeID)
|
|
|
|
// Ownership check should pass now
|
|
owned, appErr := th.App.ValidateTeamAdminPolicyOwnership(th.Context, th.BasicTeam.Id, policy.ID)
|
|
require.Nil(t, appErr)
|
|
assert.True(t, owned, "channelless policy with scope should pass ownership check")
|
|
})
|
|
}
|