Automatic Merge
Этот коммит содержится в:
29
api4/post.go
29
api4/post.go
@@ -530,35 +530,6 @@ func getPostThread(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
rPost, err := c.App.GetSinglePost(c.Params.PostId, false)
|
|
||||||
if err != nil {
|
|
||||||
c.Err = err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
hasPermission := false
|
|
||||||
becauseCompliance := false
|
|
||||||
if c.App.SessionHasPermissionToChannel(c.AppContext, *c.AppContext.Session(), rPost.ChannelId, model.PermissionReadChannel) {
|
|
||||||
hasPermission = true
|
|
||||||
} else if channel, cErr := c.App.GetChannel(c.AppContext, rPost.ChannelId); cErr == nil {
|
|
||||||
if channel.Type == model.ChannelTypeOpen &&
|
|
||||||
c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), channel.TeamId, model.PermissionReadPublicChannel) {
|
|
||||||
hasPermission = true
|
|
||||||
if *c.App.Config().MessageExportSettings.EnableExport {
|
|
||||||
hasPermission = false
|
|
||||||
becauseCompliance = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !hasPermission {
|
|
||||||
if becauseCompliance {
|
|
||||||
c.Err = model.NewAppError("getPostThread", "api.post.compliance_enabled.join_channel_to_view_post", nil, "", http.StatusForbidden)
|
|
||||||
} else {
|
|
||||||
c.SetPermissionError(model.PermissionReadChannel)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// For now, by default we return all items unless it's set to maintain
|
// For now, by default we return all items unless it's set to maintain
|
||||||
// backwards compatibility with mobile. But when the next ESR passes, we need to
|
// backwards compatibility with mobile. But when the next ESR passes, we need to
|
||||||
// change this to web.PerPageDefault.
|
// change this to web.PerPageDefault.
|
||||||
|
|||||||
@@ -2195,26 +2195,10 @@ func TestGetPostThread(t *testing.T) {
|
|||||||
|
|
||||||
client.RemoveUserFromChannel(th.BasicChannel.Id, th.BasicUser.Id)
|
client.RemoveUserFromChannel(th.BasicChannel.Id, th.BasicUser.Id)
|
||||||
|
|
||||||
messageExportEnabled := *th.App.Config().MessageExportSettings.EnableExport
|
// Channel is public, should be able to read post
|
||||||
// Channel is public, and compliance export is OFF, should be able to read post
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
||||||
*cfg.MessageExportSettings.EnableExport = false
|
|
||||||
})
|
|
||||||
_, _, err = client.GetPostThread(th.BasicPost.Id, "", false)
|
_, _, err = client.GetPostThread(th.BasicPost.Id, "", false)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// channel is public, and compliance export is ON, should NOT be able to read post
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
||||||
*cfg.MessageExportSettings.EnableExport = true
|
|
||||||
})
|
|
||||||
_, resp, err = client.GetPostThread(th.BasicPost.Id, "", false)
|
|
||||||
require.Error(t, err)
|
|
||||||
CheckForbiddenStatus(t, resp)
|
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
|
||||||
*cfg.MessageExportSettings.EnableExport = messageExportEnabled
|
|
||||||
})
|
|
||||||
|
|
||||||
privatePost := th.CreatePostWithClient(client, th.BasicPrivateChannel)
|
privatePost := th.CreatePostWithClient(client, th.BasicPrivateChannel)
|
||||||
|
|
||||||
_, _, err = client.GetPostThread(privatePost.Id, "", false)
|
_, _, err = client.GetPostThread(privatePost.Id, "", false)
|
||||||
|
|||||||
@@ -2233,10 +2233,6 @@
|
|||||||
"id": "api.post.check_for_out_of_channel_mentions.message.one",
|
"id": "api.post.check_for_out_of_channel_mentions.message.one",
|
||||||
"translation": "@{{.Username}} did not get notified by this mention because they are not in the channel."
|
"translation": "@{{.Username}} did not get notified by this mention because they are not in the channel."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "api.post.compliance_enabled.join_channel_to_view_post",
|
|
||||||
"translation": "Due to compliance rules configured on this instance the channel must be joined before its posts can be read."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "api.post.create_post.can_not_post_to_deleted.error",
|
"id": "api.post.create_post.can_not_post_to_deleted.error",
|
||||||
"translation": "Can not post to deleted channel."
|
"translation": "Can not post to deleted channel."
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user