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

Merge master into PR branch

Browse source 
Resolve channel_join_request ABAC call to use channel-scoped
BuildAccessControlSubject per upstream fix.

Co-authored-by: mattermost-code <matty-code@mattermost.com>
This commit is contained in:
Cursor Agent 2026-05-21 17:31:19 +00:00
commit fe82bf0a52
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -334,7 +334,7 @@ func (a *App) evaluateChannelMembership(rctx request.CTX, user *model.User, chan
return false, nil
}
subject, appErr := a.BuildAccessControlSubject(rctx, user.Id, user.Roles, "")
subject, appErr := a.BuildAccessControlSubject(rctx, user.Id, user.Roles, channel.Id)
if appErr != nil {
return false, appErr
}