upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-02-03 20:40:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

invalidate channel cache after deleting a channel access control policy

Browse source
This commit is contained in:
Ibrahim Serdar Acikgoz 2026-02-03 23:31:52 +01:00
parent 0263262ef4
commit 2632da313c
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/channels/app/access_control.go
View file

@ -229,6 +229,8 @@ func (a *App) UnassignPoliciesFromChannels(rctx request.CTX, policyID string, ch
if err := acs.DeletePolicy(rctx, child.ID); err != nil {
return model.NewAppError("UnassignPoliciesFromChannels", "app.pap.unassign_access_control_policy_from_channels.app_error", nil, err.Error(), http.StatusInternalServerError)
}
// invalidate the channel cache
a.Srv().Store().Channel().InvalidateChannel(channelID)
continue
}
_, appErr = acs.SavePolicy(rctx, child)

48
server/channels/app/access_control_test.go
View file

@ -13,6 +13,7 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
"github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
)
@ -483,6 +484,53 @@ func TestUnassignPoliciesFromChannels(t *testing.T) {
appErr := th.App.UnassignPoliciesFromChannels(th.Context, parentPolicy.ID, []string{ch1.Id, ch2.Id})
require.Nil(t, appErr)
})
t.Run("Invalidate channel cache", func(t *testing.T) {
thMock := SetupWithStoreMock(t)
channelID := model.NewId()
parentPolicyID := model.NewId()
// Create a child policy for the channel that only has the parent policy as an import (no rules)
childPolicy := &model.AccessControlPolicy{
Type: model.AccessControlPolicyTypeChannel,
ID: channelID,
Revision: 1,
Version: model.AccessControlPolicyVersionV0_2,
Imports: []string{parentPolicyID},
Rules: []model.AccessControlPolicyRule{},
}
mockStore := thMock.App.Srv().Store().(*storemocks.Store)
mockAccessControlPolicyStore := storemocks.AccessControlPolicyStore{}
mockStore.On("AccessControlPolicy").Return(&mockAccessControlPolicyStore)
// Mock SearchPolicies to return the child policy as a child of the parent
mockAccessControlPolicyStore.On("SearchPolicies", thMock.Context, model.AccessControlPolicySearch{
Type: model.AccessControlPolicyTypeChannel,
ParentID: parentPolicyID,
Limit: 1000,
}).Return([]*model.AccessControlPolicy{childPolicy}, int64(1), nil)
mockChannelStore := storemocks.ChannelStore{}
mockStore.On("Channel").Return(&mockChannelStore)
// Expect InvalidateChannel to be called
mockChannelStore.On("InvalidateChannel", channelID).Once()
mockAccessControl := &mocks.AccessControlServiceInterface{}
thMock.App.Srv().ch.AccessControl = mockAccessControl
// Mock GetPolicy to return the child policy
mockAccessControl.On("GetPolicy", thMock.Context, channelID).Return(childPolicy, nil).Once()
// Mock DeletePolicy to return nil (successful deletion)
mockAccessControl.On("DeletePolicy", thMock.Context, channelID).Return(nil).Once()
appErr := thMock.App.UnassignPoliciesFromChannels(thMock.Context, parentPolicyID, []string{channelID})
require.Nil(t, appErr)
mockChannelStore.AssertCalled(t, "InvalidateChannel", channelID)
})
}
func TestValidateChannelAccessControlPermission(t *testing.T) {