[MM-58492][MM-58523] Fixed some access control bugs around archived channels by replacing the permission check with HasPermissionToReadChannel #27409
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,15 +257,20 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { | |
| return | ||
| } | ||
|
|
||
| channel, err := c.App.GetChannel(c.AppContext, channelId) | ||
| if err != nil { | ||
| c.Err = err | ||
| return | ||
| } | ||
| if !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) { | ||
|
There was a problem hiding this comment. If I am not mistaken, from the implementation of This means that now sysadmins won't be able to get the posts for an archived channel. Is that the desired behavior, or we have to rethink the There was a problem hiding this comment. Let's bring this up in the sync meeting. There was a problem hiding this comment. As a note, anywhere else we check for archived channels we don't check if they're a system admin, so I think it actually makes sense to deny if it's off.
We don't have per-user group permissions to view, only to archive 😅 There was a problem hiding this comment. Decided not to make an exception for system admins: https://hub.mattermost.com/private-core/pl/iopz1gkws7yjbqpqzq8k6kbacy |
||
| c.SetPermissionError(model.PermissionReadChannelContent) | ||
| return | ||
| } | ||
devinbinnie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if !*c.App.Config().TeamSettings.ExperimentalViewArchivedChannels { | ||
| channel, appErr := c.App.GetChannel(c.AppContext, channelId) | ||
| if appErr != nil { | ||
| c.Err = appErr | ||
| return | ||
| } | ||
| if channel.DeleteAt != 0 { | ||
|
|
@@ -275,7 +280,6 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { | |
| } | ||
|
|
||
| var list *model.PostList | ||
| etag := "" | ||
|
|
||
| if since > 0 { | ||
|
|
@@ -341,7 +345,12 @@ func getPostsForChannelAroundLastUnread(c *Context, w http.ResponseWriter, r *ht | |
| } | ||
|
|
||
| channelId := c.Params.ChannelId | ||
| channel, err := c.App.GetChannel(c.AppContext, channelId) | ||
| if err != nil { | ||
| c.Err = err | ||
|
Comment on lines
+348
to
+350
There was a problem hiding this comment. Here and in a few other places I'd recommend to use |
||
| return | ||
| } | ||
| if !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) { | ||
| c.SetPermissionError(model.PermissionReadChannelContent) | ||
| return | ||
| } | ||
|
|
@@ -423,6 +432,20 @@ func getFlaggedPostsForUser(c *Context, w http.ResponseWriter, r *http.Request) | |
| return | ||
| } | ||
|
|
||
| channelMap := make(map[string]*model.Channel) | ||
| channelIds := []string{} | ||
| for _, post := range posts.Posts { | ||
| channelIds = append(channelIds, post.ChannelId) | ||
| } | ||
| channels, err := c.App.GetChannels(c.AppContext, channelIds) | ||
| if err != nil { | ||
| c.Err = err | ||
| return | ||
| } | ||
| for _, channel := range channels { | ||
| channelMap[channel.Id] = channel | ||
| } | ||
|
|
||
| pl := model.NewPostList() | ||
| channelReadPermission := make(map[string]bool) | ||
|
|
||
|
|
@@ -432,7 +455,11 @@ func getFlaggedPostsForUser(c *Context, w http.ResponseWriter, r *http.Request) | |
| if !ok { | ||
| allowed = false | ||
|
|
||
| channel, ok := channelMap[post.ChannelId] | ||
| if !ok { | ||
| continue | ||
| } | ||
| if c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) { | ||
| allowed = true | ||
| } | ||
|
|
||
|
|
@@ -523,23 +550,28 @@ func getPostsByIds(c *Context, w http.ResponseWriter, r *http.Request) { | |
| return | ||
| } | ||
|
|
||
| channelMap := make(map[string]*model.Channel) | ||
| channelIds := []string{} | ||
| for _, post := range postsList { | ||
| channelIds = append(channelIds, post.ChannelId) | ||
| } | ||
| channels, appErr := c.App.GetChannels(c.AppContext, channelIds) | ||
| if appErr != nil { | ||
| c.Err = appErr | ||
| return | ||
| } | ||
| for _, channel := range channels { | ||
| channelMap[channel.Id] = channel | ||
| } | ||
|
|
||
| var posts = []*model.Post{} | ||
| for _, post := range postsList { | ||
| channel, ok := channelMap[post.ChannelId] | ||
| if !ok { | ||
| continue | ||
| } | ||
|
|
||
| if !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) { | ||
| if channel.Type != model.ChannelTypeOpen || (channel.Type == model.ChannelTypeOpen && !c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), channel.TeamId, model.PermissionReadPublicChannel)) { | ||
| continue | ||
| } | ||
|
|
@@ -1031,7 +1063,12 @@ func saveIsPinnedPost(c *Context, w http.ResponseWriter, isPinned bool) { | |
| auditRec.AddEventPriorState(post) | ||
| auditRec.AddEventObjectType("post") | ||
|
|
||
| channel, err := c.App.GetChannel(c.AppContext, post.ChannelId) | ||
| if err != nil { | ||
| c.Err = err | ||
| return | ||
| } | ||
| if !c.App.SessionHasPermissionToReadChannel(c.AppContext, *c.AppContext.Session(), channel) { | ||
| c.SetPermissionError(model.PermissionReadChannelContent) | ||
| return | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general, I'd prefer if we added a new test case rather than changing an existing one.