opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MM-62092] Allow system admins to pull posts in from DMs they're not in (#29557)

Browse Source
This commit is contained in:
Devin Binnie
2024-12-12 15:12:21 +00:00
committed by GitHub
parent b60ce28726
commit 57372bd06b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/api4/post.go
+1 -1
View File
@@ -214,7 +214,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = err
return
}
if !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) {
if !c.IsSystemAdmin() && !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) {
c.SetPermissionError(model.PermissionReadChannelContent)
return
}
server/channels/api4/post_test.go
+8
View File
@@ -1994,6 +1994,14 @@ func TestGetPostsForChannel(t *testing.T) {
require.NoError(t, err)
CheckOKStatus(t, resp)
require.Len(t, posts.Order, 10, "expected 10 posts")
// allow viewing of direct messages
dmChannel := th.CreateDmChannel(th.BasicUser2)
th.CreateMessagePostNoClient(dmChannel, "test1", model.GetMillis())
posts, resp, err = c.GetPostsForChannel(context.Background(), dmChannel.Id, 0, 100, "", false, false)
require.NoError(t, err)
CheckOKStatus(t, resp)
})
}