MM-55966 - Update ArrayFromJSON to use LimitedReader (#25510)

* update ArrayFromJSON to use LimitedReader

* update for bad merge

* fix lint errors

* update test code

* update unit tests

* update unit tests

* fix unit tests

* use consts, other cleanup

* add non sorting duplicate check

* set config to default value, then config setting if available

* fix lint errors

* fixes and debugs

* fix log test

* remove setting from Client, add unlimited Parser to client

* a couple more fixes

* another fix

* rename some variables

* remove superflous call

* check for valid MaximumPayloadSize

* update language file

* fix for e2e-tests

* update util function to return error

* lint fix

* update config property name to include unit

* fix for unit test

* add new config to telemetry

* call function to create LimitedReader

* Deprecate old function, use new function name

* return new AppError on failed parse

* return new AppError on failed parse

* return new AppError on failed parse

* add constant for i18n valid constants

* Update server/public/model/utils_test.go

Co-authored-by: Miguel de la Cruz <mgdelacroix@gmail.com>

* Apply suggestions from code review

Co-authored-by: Miguel de la Cruz <mgdelacroix@gmail.com>

* update error variable, remove unnecessary check

* Update function names

* fix errors from merge

* update unit test to create unique ids

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Miguel de la Cruz <mgdelacroix@gmail.com>
Этот коммит содержится в:
Scott Bishel
2024-01-09 10:04:16 -07:00
коммит произвёл GitHub
родитель 4f0598d592
Коммит 82b8d4dc07
22 изменённых файлов: 345 добавлений и 142 удалений

Просмотреть файл

@@ -45,7 +45,7 @@ describe('Channel Settings', () => {
}); });
// # Create DM with admin and user 1 // # Create DM with admin and user 1
cy.apiCreateDirectChannel([user1.id, user1.id]).then(() => { cy.apiCreateDirectChannel([admin.id, user1.id]).then(() => {
// # Go to DM // # Go to DM
cy.visit(`/${testTeam.name}/messages/@${user1.username}`); cy.visit(`/${testTeam.name}/messages/@${user1.username}`);

Просмотреть файл

@@ -425,9 +425,18 @@ func restoreChannel(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) { func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) {
userIds := model.ArrayFromJSON(r.Body) userIds, err := model.NonSortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
c.Err = model.NewAppError("createDirectChannel", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
}
allowed := false allowed := false
// single userId allowed if creating a self-channel
// NonSortedArrayFromJSON will remove duplicates, so need to add back
if len(userIds) == 1 && userIds[0] == c.AppContext.Session().UserId {
userIds = append(userIds, userIds[0])
}
if len(userIds) != 2 { if len(userIds) != 2 {
c.SetInvalidParam("user_ids") c.SetInvalidParam("user_ids")
return return
@@ -464,9 +473,9 @@ func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) {
audit.AddEventParameter(auditRec, "user_id", otherUserId) audit.AddEventParameter(auditRec, "user_id", otherUserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, otherUserId) canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, otherUserId)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -475,9 +484,9 @@ func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
sc, err := c.App.GetOrCreateDirectChannel(c.AppContext, userIds[0], userIds[1]) sc, appErr := c.App.GetOrCreateDirectChannel(c.AppContext, userIds[0], userIds[1])
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -511,9 +520,11 @@ func searchGroupChannels(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) { func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) {
userIds := model.ArrayFromJSON(r.Body) userIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
if len(userIds) == 0 { c.Err = model.NewAppError("createGroupChannel", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(userIds) == 0 {
c.SetInvalidParam("user_ids") c.SetInvalidParam("user_ids")
return return
} }
@@ -561,9 +572,9 @@ func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
groupChannel, err := c.App.CreateGroupChannel(c.AppContext, userIds, c.AppContext.Session().UserId) groupChannel, appErr := c.App.CreateGroupChannel(c.AppContext, userIds, c.AppContext.Session().UserId)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -697,7 +708,12 @@ func getChannelsMemberCount(c *Context, w http.ResponseWriter, r *http.Request)
return return
} }
channelIDs := model.ArrayFromJSON(r.Body) channelIDs, sortErr := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if sortErr != nil {
c.Err = model.NewAppError("getChannelsMemberCount", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(sortErr)
return
}
channels, err := c.App.GetChannels(c.AppContext, channelIDs) channels, err := c.App.GetChannels(c.AppContext, channelIDs)
if err != nil { if err != nil {
c.Err = err c.Err = err
@@ -711,10 +727,9 @@ func getChannelsMemberCount(c *Context, w http.ResponseWriter, r *http.Request)
} }
} }
channelsMemberCount, err := c.App.GetChannelsMemberCount(c.AppContext, channelIDs) channelsMemberCount, appErr := c.App.GetChannelsMemberCount(c.AppContext, channelIDs)
if appErr != nil {
if err != nil { c.Err = appErr
c.Err = err
return return
} }
@@ -899,8 +914,11 @@ func getPublicChannelsByIdsForTeam(c *Context, w http.ResponseWriter, r *http.Re
return return
} }
channelIds := model.ArrayFromJSON(r.Body) channelIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if len(channelIds) == 0 { if err != nil {
c.Err = model.NewAppError("getPublicChannelsByIdsForTeam", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(channelIds) == 0 {
c.SetInvalidParam("channel_ids") c.SetInvalidParam("channel_ids")
return return
} }
@@ -917,15 +935,15 @@ func getPublicChannelsByIdsForTeam(c *Context, w http.ResponseWriter, r *http.Re
return return
} }
channels, err := c.App.GetPublicChannelsByIdsForTeam(c.AppContext, c.Params.TeamId, channelIds) channels, appErr := c.App.GetPublicChannelsByIdsForTeam(c.AppContext, c.Params.TeamId, channelIds)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
err = c.App.FillInChannelsProps(c.AppContext, channels) appErr = c.App.FillInChannelsProps(c.AppContext, channels)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -1439,8 +1457,11 @@ func getChannelMembersByIds(c *Context, w http.ResponseWriter, r *http.Request)
return return
} }
userIds := model.ArrayFromJSON(r.Body) userIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if len(userIds) == 0 { if err != nil {
c.Err = model.NewAppError("getChannelMembersByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(userIds) == 0 {
c.SetInvalidParam("user_ids") c.SetInvalidParam("user_ids")
return return
} }
@@ -1450,9 +1471,9 @@ func getChannelMembersByIds(c *Context, w http.ResponseWriter, r *http.Request)
return return
} }
members, err := c.App.GetChannelMembersByIds(c.AppContext, c.Params.ChannelId, userIds) members, appErr := c.App.GetChannelMembersByIds(c.AppContext, c.Params.ChannelId, userIds)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -1562,14 +1583,16 @@ func viewChannel(c *Context, w http.ResponseWriter, r *http.Request) {
func readMultipleChannels(c *Context, w http.ResponseWriter, r *http.Request) { func readMultipleChannels(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequireUserId() c.RequireUserId()
var channelIDs []string channelIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
err := json.NewDecoder(r.Body).Decode(&channelIDs) if err != nil {
if err != nil || len(channelIDs) == 0 { c.Err = model.NewAppError("readMultipleChannels", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("channel_ids", err) return
} else if len(channelIds) == 0 {
c.SetInvalidParam("channel_ids")
return return
} }
times, appErr := c.App.MarkChannelsAsViewed(c.AppContext, channelIDs, c.Params.UserId, c.AppContext.Session().Id, true, c.App.IsCRTEnabledForUser(c.AppContext, c.Params.UserId)) times, appErr := c.App.MarkChannelsAsViewed(c.AppContext, channelIds, c.Params.UserId, c.AppContext.Session().Id, true, c.App.IsCRTEnabledForUser(c.AppContext, c.Params.UserId))
if appErr != nil { if appErr != nil {
c.Err = appErr c.Err = appErr
return return

Просмотреть файл

@@ -118,7 +118,11 @@ func updateCategoryOrderForTeamForUser(c *Context, w http.ResponseWriter, r *htt
auditRec := c.MakeAuditRecord("updateCategoryOrderForTeamForUser", audit.Fail) auditRec := c.MakeAuditRecord("updateCategoryOrderForTeamForUser", audit.Fail)
defer c.LogAuditRec(auditRec) defer c.LogAuditRec(auditRec)
categoryOrder := model.ArrayFromJSON(r.Body) categoryOrder, err := model.NonSortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
c.Err = model.NewAppError("updateCategoryOrderForTeamForUser", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
}
for _, categoryId := range categoryOrder { for _, categoryId := range categoryOrder {
if !c.App.SessionHasPermissionToCategory(c.AppContext, *c.AppContext.Session(), c.Params.UserId, c.Params.TeamId, categoryId) { if !c.App.SessionHasPermissionToCategory(c.AppContext, *c.AppContext.Session(), c.Params.UserId, c.Params.TeamId, categoryId) {
@@ -127,9 +131,9 @@ func updateCategoryOrderForTeamForUser(c *Context, w http.ResponseWriter, r *htt
} }
} }
err := c.App.UpdateSidebarCategoryOrder(c.AppContext, c.Params.UserId, c.Params.TeamId, categoryOrder) appErr := c.App.UpdateSidebarCategoryOrder(c.AppContext, c.Params.UserId, c.Params.TeamId, categoryOrder)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }

Просмотреть файл

@@ -264,10 +264,9 @@ func searchTeamsInPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
func addTeamsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) { func addTeamsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequirePolicyId() c.RequirePolicyId()
policyId := c.Params.PolicyId policyId := c.Params.PolicyId
var teamIDs []string teamIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
jsonErr := json.NewDecoder(r.Body).Decode(&teamIDs) if err != nil {
if jsonErr != nil { c.Err = model.NewAppError("addTeamsToPolicy", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("team_ids", jsonErr)
return return
} }
auditRec := c.MakeAuditRecord("addTeamsToPolicy", audit.Fail) auditRec := c.MakeAuditRecord("addTeamsToPolicy", audit.Fail)
@@ -279,9 +278,9 @@ func addTeamsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
err := c.App.AddTeamsToRetentionPolicy(policyId, teamIDs) appErr := c.App.AddTeamsToRetentionPolicy(policyId, teamIDs)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -292,10 +291,9 @@ func addTeamsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
func removeTeamsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request) { func removeTeamsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequirePolicyId() c.RequirePolicyId()
policyId := c.Params.PolicyId policyId := c.Params.PolicyId
var teamIDs []string teamIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
jsonErr := json.NewDecoder(r.Body).Decode(&teamIDs) if err != nil {
if jsonErr != nil { c.Err = model.NewAppError("removeTeamsFromPolicy", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("team_ids", jsonErr)
return return
} }
auditRec := c.MakeAuditRecord("removeTeamsFromPolicy", audit.Fail) auditRec := c.MakeAuditRecord("removeTeamsFromPolicy", audit.Fail)
@@ -308,9 +306,9 @@ func removeTeamsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
err := c.App.RemoveTeamsFromRetentionPolicy(policyId, teamIDs) appErr := c.App.RemoveTeamsFromRetentionPolicy(policyId, teamIDs)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -385,10 +383,9 @@ func searchChannelsInPolicy(c *Context, w http.ResponseWriter, r *http.Request)
func addChannelsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) { func addChannelsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequirePolicyId() c.RequirePolicyId()
policyId := c.Params.PolicyId policyId := c.Params.PolicyId
var channelIDs []string channelIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
jsonErr := json.NewDecoder(r.Body).Decode(&channelIDs) if err != nil {
if jsonErr != nil { c.Err = model.NewAppError("addChannelsToPolicy", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("channel_ids", jsonErr)
return return
} }
auditRec := c.MakeAuditRecord("addChannelsToPolicy", audit.Fail) auditRec := c.MakeAuditRecord("addChannelsToPolicy", audit.Fail)
@@ -401,9 +398,9 @@ func addChannelsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
err := c.App.AddChannelsToRetentionPolicy(policyId, channelIDs) appErr := c.App.AddChannelsToRetentionPolicy(policyId, channelIDs)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -414,10 +411,9 @@ func addChannelsToPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
func removeChannelsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request) { func removeChannelsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequirePolicyId() c.RequirePolicyId()
policyId := c.Params.PolicyId policyId := c.Params.PolicyId
var channelIDs []string channelIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
jsonErr := json.NewDecoder(r.Body).Decode(&channelIDs) if err != nil {
if jsonErr != nil { c.Err = model.NewAppError("removeChannelsFromPolicy", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("channel_ids", jsonErr)
return return
} }
auditRec := c.MakeAuditRecord("removeChannelsFromPolicy", audit.Fail) auditRec := c.MakeAuditRecord("removeChannelsFromPolicy", audit.Fail)
@@ -430,9 +426,9 @@ func removeChannelsFromPolicy(c *Context, w http.ResponseWriter, r *http.Request
return return
} }
err := c.App.RemoveChannelsFromRetentionPolicy(policyId, channelIDs) appErr := c.App.RemoveChannelsFromRetentionPolicy(policyId, channelIDs)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }

Просмотреть файл

@@ -240,8 +240,11 @@ func getEmojiByName(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getEmojisByNames(c *Context, w http.ResponseWriter, r *http.Request) { func getEmojisByNames(c *Context, w http.ResponseWriter, r *http.Request) {
names := model.ArrayFromJSON(r.Body) names, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if len(names) == 0 { if err != nil {
c.Err = model.NewAppError("getEmojisByNames", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(names) == 0 {
c.SetInvalidParam("names") c.SetInvalidParam("names")
return return
} }
@@ -258,9 +261,9 @@ func getEmojisByNames(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
emojis, err := c.App.GetMultipleEmojiByName(c.AppContext, names) emojis, appErr := c.App.GetMultipleEmojiByName(c.AppContext, names)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }

Просмотреть файл

@@ -316,25 +316,34 @@ func TestGetEmojisByNames(t *testing.T) {
t.Run("should return multiple emojis", func(t *testing.T) { t.Run("should return multiple emojis", func(t *testing.T) {
emojis, _, err := client.GetEmojisByNames(context.Background(), []string{emoji1.Name, emoji2.Name}) emojis, _, err := client.GetEmojisByNames(context.Background(), []string{emoji1.Name, emoji2.Name})
var emojiIds []string
for _, emoji := range emojis {
emojiIds = append(emojiIds, emoji.Id)
}
require.NoError(t, err) require.NoError(t, err)
require.Len(t, emojis, 2) require.Len(t, emojis, 2)
assert.Equal(t, emoji1.Id, emojis[0].Id) assert.Contains(t, emojiIds, emoji1.Id)
assert.Equal(t, emoji2.Id, emojis[1].Id) assert.Contains(t, emojiIds, emoji2.Id)
}) })
t.Run("should ignore non-existent emojis", func(t *testing.T) { t.Run("should ignore non-existent emojis", func(t *testing.T) {
emojis, _, err := client.GetEmojisByNames(context.Background(), []string{emoji1.Name, emoji2.Name, model.NewId()}) emojis, _, err := client.GetEmojisByNames(context.Background(), []string{emoji1.Name, emoji2.Name, model.NewId()})
var emojiIds []string
for _, emoji := range emojis {
emojiIds = append(emojiIds, emoji.Id)
}
require.NoError(t, err) require.NoError(t, err)
require.Len(t, emojis, 2) require.Len(t, emojis, 2)
assert.Equal(t, emoji1.Id, emojis[0].Id) assert.Contains(t, emojiIds, emoji1.Id)
assert.Equal(t, emoji2.Id, emojis[1].Id) assert.Contains(t, emojiIds, emoji2.Id)
}) })
t.Run("should return an error when too many emojis are requested", func(t *testing.T) { t.Run("should return an error when too many emojis are requested", func(t *testing.T) {
names := make([]string, GetEmojisByNamesMax+1) names := make([]string, GetEmojisByNamesMax+1)
for i := 0; i < len(names); i++ { for i := 0; i < len(names); i++ {
names[i] = emoji1.Name names[i] = model.NewId()
} }
_, _, err := client.GetEmojisByNames(context.Background(), names) _, _, err := client.GetEmojisByNames(context.Background(), names)

Просмотреть файл

@@ -504,9 +504,11 @@ func getPost(c *Context, w http.ResponseWriter, r *http.Request) {
// getPostsByIds also sets a header to indicate, if posts were truncated as per the cloud plan's limit. // getPostsByIds also sets a header to indicate, if posts were truncated as per the cloud plan's limit.
func getPostsByIds(c *Context, w http.ResponseWriter, r *http.Request) { func getPostsByIds(c *Context, w http.ResponseWriter, r *http.Request) {
postIDs := model.ArrayFromJSON(r.Body) postIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
if len(postIDs) == 0 { c.Err = model.NewAppError("getPostsByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(postIDs) == 0 {
c.SetInvalidParam("post_ids") c.SetInvalidParam("post_ids")
return return
} }
@@ -516,9 +518,9 @@ func getPostsByIds(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
postsList, firstInaccessiblePostTime, err := c.App.GetPostsByIds(postIDs) postsList, firstInaccessiblePostTime, appErr := c.App.GetPostsByIds(postIDs)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
@@ -530,9 +532,9 @@ func getPostsByIds(c *Context, w http.ResponseWriter, r *http.Request) {
if val, ok := channelMap[post.ChannelId]; ok { if val, ok := channelMap[post.ChannelId]; ok {
channel = val channel = val
} else { } else {
channel, err = c.App.GetChannel(c.AppContext, post.ChannelId) channel, appErr = c.App.GetChannel(c.AppContext, post.ChannelId)
if err != nil { if appErr != nil {
c.Err = err c.Err = appErr
return return
} }
channelMap[channel.Id] = channel channelMap[channel.Id] = channel

Просмотреть файл

@@ -119,7 +119,11 @@ func deleteReaction(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getBulkReactions(c *Context, w http.ResponseWriter, r *http.Request) { func getBulkReactions(c *Context, w http.ResponseWriter, r *http.Request) {
postIds := model.ArrayFromJSON(r.Body) postIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
c.Err = model.NewAppError("getBulkReactions", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
}
for _, postId := range postIds { for _, postId := range postIds {
if !c.App.SessionHasPermissionToChannelByPost(*c.AppContext.Session(), postId, model.PermissionReadChannelContent) { if !c.App.SessionHasPermissionToChannelByPost(*c.AppContext.Session(), postId, model.PermissionReadChannelContent) {
c.SetPermissionError(model.PermissionReadChannelContent) c.SetPermissionError(model.PermissionReadChannelContent)

Просмотреть файл

@@ -84,9 +84,11 @@ func getRoleByName(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getRolesByNames(c *Context, w http.ResponseWriter, r *http.Request) { func getRolesByNames(c *Context, w http.ResponseWriter, r *http.Request) {
rolenames := model.ArrayFromJSON(r.Body) rolenames, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
if len(rolenames) == 0 { c.Err = model.NewAppError("getRolesByNames", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(rolenames) == 0 {
c.SetInvalidParam("rolenames") c.SetInvalidParam("rolenames")
return return
} }

Просмотреть файл

@@ -5,6 +5,7 @@ package api4
import ( import (
"context" "context"
"fmt"
"sort" "sort"
"strings" "strings"
"testing" "testing"
@@ -189,7 +190,7 @@ func TestGetRolesByNames(t *testing.T) {
// too many roles should error with bad request // too many roles should error with bad request
roles := []string{} roles := []string{}
for i := 0; i < GetRolesByNamesMax+10; i++ { for i := 0; i < GetRolesByNamesMax+10; i++ {
roles = append(roles, role1.Name) roles = append(roles, fmt.Sprintf("role1.Name%v", i))
} }
_, resp, err := client.GetRolesByNames(context.Background(), roles) _, resp, err := client.GetRolesByNames(context.Background(), roles)

Просмотреть файл

@@ -49,9 +49,11 @@ func getUserStatus(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getUserStatusesByIds(c *Context, w http.ResponseWriter, r *http.Request) { func getUserStatusesByIds(c *Context, w http.ResponseWriter, r *http.Request) {
userIds := model.ArrayFromJSON(r.Body) userIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
if len(userIds) == 0 { c.Err = model.NewAppError("getUserStatusesByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(userIds) == 0 {
c.SetInvalidParam("user_ids") c.SetInvalidParam("user_ids")
return return
} }

Просмотреть файл

@@ -967,7 +967,11 @@ func updateViewedProductNotices(c *Context, w http.ResponseWriter, r *http.Reque
defer c.LogAuditRec(auditRec) defer c.LogAuditRec(auditRec)
c.LogAudit("attempt") c.LogAudit("attempt")
ids := model.ArrayFromJSON(r.Body) ids, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
c.Err = model.NewAppError("updateViewedProductNotices", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
}
appErr := c.App.UpdateViewedProductNotices(c.AppContext.Session().UserId, ids) appErr := c.App.UpdateViewedProductNotices(c.AppContext.Session().UserId, ids)
if appErr != nil { if appErr != nil {
c.Err = appErr c.Err = appErr

Просмотреть файл

@@ -644,10 +644,12 @@ func getTeamMembersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
var userIDs []string userIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
err := json.NewDecoder(r.Body).Decode(&userIDs) if err != nil {
if err != nil || len(userIDs) == 0 { c.Err = model.NewAppError("getTeamMembersByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("user_ids", err) return
} else if len(userIDs) == 0 {
c.SetInvalidParam("user_ids")
return return
} }

Просмотреть файл

@@ -623,9 +623,11 @@ func getFilteredUsersStats(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getUsersByGroupChannelIds(c *Context, w http.ResponseWriter, r *http.Request) { func getUsersByGroupChannelIds(c *Context, w http.ResponseWriter, r *http.Request) {
channelIds := model.ArrayFromJSON(r.Body) channelIds, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil || len(channelIds) == 0 {
if len(channelIds) == 0 { c.Err = model.NewAppError("getUsersByGroupChannelIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(channelIds) == 0 {
c.SetInvalidParam("channel_ids") c.SetInvalidParam("channel_ids")
return return
} }
@@ -636,7 +638,7 @@ func getUsersByGroupChannelIds(c *Context, w http.ResponseWriter, r *http.Reques
return return
} }
err := json.NewEncoder(w).Encode(usersByChannelId) err = json.NewEncoder(w).Encode(usersByChannelId)
if err != nil { if err != nil {
c.Logger.Warn("Error writing response", mlog.Err(err)) c.Logger.Warn("Error writing response", mlog.Err(err))
} }
@@ -953,17 +955,15 @@ func requireGroupAccess(c *web.Context, groupID string) *model.AppError {
} }
func getUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) { func getUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
var userIDs []string userIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
err := json.NewDecoder(r.Body).Decode(&userIDs) if err != nil {
if err != nil || len(userIDs) == 0 { c.Err = model.NewAppError("getUsersByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("user_ids", err) return
} else if len(userIDs) == 0 {
c.SetInvalidParam("user_ids")
return return
} }
// we remove the duplicate IDs as it can bring a significant load to the
// database.
userIDs = model.RemoveDuplicateStrings(userIDs)
sinceString := r.URL.Query().Get("since") sinceString := r.URL.Query().Get("since")
options := &store.UserGetByIdsOpts{ options := &store.UserGetByIdsOpts{
@@ -1002,10 +1002,12 @@ func getUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func getUsersByNames(c *Context, w http.ResponseWriter, r *http.Request) { func getUsersByNames(c *Context, w http.ResponseWriter, r *http.Request) {
var usernames []string usernames, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
err := json.NewDecoder(r.Body).Decode(&usernames) if err != nil {
if err != nil || len(usernames) == 0 { c.Err = model.NewAppError("getUsersByNames", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
c.SetInvalidParamWithErr("usernames", err) return
} else if len(usernames) == 0 {
c.SetInvalidParam("usernames")
return return
} }

Просмотреть файл

@@ -233,17 +233,15 @@ func localGetUsers(c *Context, w http.ResponseWriter, r *http.Request) {
} }
func localGetUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) { func localGetUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
userIDs := model.ArrayFromJSON(r.Body) userIDs, err := model.SortedArrayFromJSON(r.Body, *c.App.Config().ServiceSettings.MaximumPayloadSizeBytes)
if err != nil {
if len(userIDs) == 0 { c.Err = model.NewAppError("localGetUsersByIds", model.PayloadParseError, nil, "", http.StatusBadRequest).Wrap(err)
return
} else if len(userIDs) == 0 {
c.SetInvalidParam("user_ids") c.SetInvalidParam("user_ids")
return return
} }
// we remove the duplicate IDs as it can bring a significant load to the
// database.
userIDs = model.RemoveDuplicateStrings(userIDs)
sinceString := r.URL.Query().Get("since") sinceString := r.URL.Query().Get("since")
options := &store.UserGetByIdsOpts{ options := &store.UserGetByIdsOpts{
@@ -251,9 +249,9 @@ func localGetUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
} }
if sinceString != "" { if sinceString != "" {
since, err := strconv.ParseInt(sinceString, 10, 64) since, parseErr := strconv.ParseInt(sinceString, 10, 64)
if err != nil { if parseErr != nil {
c.SetInvalidParamWithErr("since", err) c.SetInvalidParamWithErr("since", parseErr)
return return
} }
options.Since = since options.Since = since

Просмотреть файл

@@ -2376,6 +2376,10 @@
"id": "api.outgoing_webhook.disabled.app_error", "id": "api.outgoing_webhook.disabled.app_error",
"translation": "Outgoing webhooks have been disabled by the system admin." "translation": "Outgoing webhooks have been disabled by the system admin."
}, },
{
"id": "api.payload.parse.error",
"translation": "An error occurred while parsing the payload."
},
{ {
"id": "api.plugin.install.download_failed.app_error", "id": "api.plugin.install.download_failed.app_error",
"translation": "An error occurred while downloading the plugin." "translation": "An error occurred while downloading the plugin."
@@ -8926,6 +8930,10 @@
"id": "model.config.is_valid.max_notify_per_channel.app_error", "id": "model.config.is_valid.max_notify_per_channel.app_error",
"translation": "Invalid maximum notifications per channel for team settings. Must be a positive number." "translation": "Invalid maximum notifications per channel for team settings. Must be a positive number."
}, },
{
"id": "model.config.is_valid.max_payload_size.app_error",
"translation": "Invalid max payload size for service settings. Must be a whole number greater than zero."
},
{ {
"id": "model.config.is_valid.max_users.app_error", "id": "model.config.is_valid.max_users.app_error",
"translation": "Invalid maximum users per team for team settings. Must be a positive number." "translation": "Invalid maximum users per team for team settings. Must be a positive number."

Просмотреть файл

@@ -495,6 +495,7 @@ func (ts *TelemetryService) trackConfig() {
"self_hosted_purchase": *cfg.ServiceSettings.SelfHostedPurchase, "self_hosted_purchase": *cfg.ServiceSettings.SelfHostedPurchase,
"allow_synced_drafts": *cfg.ServiceSettings.AllowSyncedDrafts, "allow_synced_drafts": *cfg.ServiceSettings.AllowSyncedDrafts,
"refresh_post_stats_run_time": *cfg.ServiceSettings.RefreshPostStatsRunTime, "refresh_post_stats_run_time": *cfg.ServiceSettings.RefreshPostStatsRunTime,
"maximum_payload_size": *cfg.ServiceSettings.MaximumPayloadSizeBytes,
}) })
ts.SendTelemetry(TrackConfigTeam, map[string]any{ ts.SendTelemetry(TrackConfigTeam, map[string]any{

Просмотреть файл

@@ -103,6 +103,15 @@ func (c *Client4) boolString(value bool) string {
return "false" return "false"
} }
func (c *Client4) ArrayFromJSON(data io.Reader) []string {
var objmap []string
json.NewDecoder(data).Decode(&objmap)
if objmap == nil {
return make([]string, 0)
}
return objmap
}
func closeBody(r *http.Response) { func closeBody(r *http.Response) {
if r.Body != nil { if r.Body != nil {
_, _ = io.Copy(io.Discard, r.Body) _, _ = io.Copy(io.Discard, r.Body)
@@ -3136,7 +3145,7 @@ func (c *Client4) GetChannelMembersTimezones(ctx context.Context, channelId stri
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
// GetPinnedPosts gets a list of pinned posts. // GetPinnedPosts gets a list of pinned posts.
@@ -5818,7 +5827,7 @@ func (c *Client4) GetLogs(ctx context.Context, page, perPage int) ([]string, *Re
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
// PostLog is a convenience Web Service call so clients can log messages into // PostLog is a convenience Web Service call so clients can log messages into
@@ -7922,7 +7931,7 @@ func (c *Client4) GetSidebarCategoryOrderForTeamForUser(ctx context.Context, use
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
func (c *Client4) UpdateSidebarCategoryOrderForTeamForUser(ctx context.Context, userID, teamID string, order []string) ([]string, *Response, error) { func (c *Client4) UpdateSidebarCategoryOrderForTeamForUser(ctx context.Context, userID, teamID string, order []string) ([]string, *Response, error) {
@@ -7936,7 +7945,7 @@ func (c *Client4) UpdateSidebarCategoryOrderForTeamForUser(ctx context.Context,
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
func (c *Client4) GetSidebarCategoryForTeamForUser(ctx context.Context, userID, teamID, categoryID, etag string) (*SidebarCategoryWithChannels, *Response, error) { func (c *Client4) GetSidebarCategoryForTeamForUser(ctx context.Context, userID, teamID, categoryID, etag string) (*SidebarCategoryWithChannels, *Response, error) {
@@ -8396,7 +8405,7 @@ func (c *Client4) ListImports(ctx context.Context) ([]string, *Response, error)
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
func (c *Client4) ListExports(ctx context.Context) ([]string, *Response, error) { func (c *Client4) ListExports(ctx context.Context) ([]string, *Response, error) {
@@ -8405,7 +8414,7 @@ func (c *Client4) ListExports(ctx context.Context) ([]string, *Response, error)
return nil, BuildResponse(r), err return nil, BuildResponse(r), err
} }
defer closeBody(r) defer closeBody(r)
return ArrayFromJSON(r.Body), BuildResponse(r), nil return c.ArrayFromJSON(r.Body), BuildResponse(r), nil
} }
func (c *Client4) DeleteExport(ctx context.Context, name string) (*Response, error) { func (c *Client4) DeleteExport(ctx context.Context, name string) (*Response, error) {

Просмотреть файл

@@ -402,6 +402,7 @@ type ServiceSettings struct {
AllowSyncedDrafts *bool `access:"site_posts"` AllowSyncedDrafts *bool `access:"site_posts"`
UniqueEmojiReactionLimitPerPost *int `access:"site_posts"` UniqueEmojiReactionLimitPerPost *int `access:"site_posts"`
RefreshPostStatsRunTime *string `access:"site_users_and_teams"` RefreshPostStatsRunTime *string `access:"site_users_and_teams"`
MaximumPayloadSizeBytes *int64 `access:"environment_file_storage,write_restrictable,cloud_restrictable"`
} }
var MattermostGiphySdkKey string var MattermostGiphySdkKey string
@@ -908,6 +909,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
if s.RefreshPostStatsRunTime == nil { if s.RefreshPostStatsRunTime == nil {
s.RefreshPostStatsRunTime = NewString("00:00") s.RefreshPostStatsRunTime = NewString("00:00")
} }
if s.MaximumPayloadSizeBytes == nil {
s.MaximumPayloadSizeBytes = NewInt64(100000)
}
} }
type ClusterSettings struct { type ClusterSettings struct {
@@ -3978,6 +3983,10 @@ func (s *ServiceSettings) isValid() *AppError {
} }
} }
if *s.MaximumPayloadSizeBytes <= 0 {
return NewAppError("Config.IsValid", "model.config.is_valid.max_payload_size.app_error", nil, "", http.StatusBadRequest)
}
if *s.ReadTimeout <= 0 { if *s.ReadTimeout <= 0 {
return NewAppError("Config.IsValid", "model.config.is_valid.read_timeout.app_error", nil, "", http.StatusBadRequest) return NewAppError("Config.IsValid", "model.config.is_valid.read_timeout.app_error", nil, "", http.StatusBadRequest)
} }

Просмотреть файл

@@ -29,13 +29,14 @@ import (
) )
const ( const (
LowercaseLetters = "abcdefghijklmnopqrstuvwxyz" LowercaseLetters = "abcdefghijklmnopqrstuvwxyz"
UppercaseLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" UppercaseLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
NUMBERS = "0123456789" NUMBERS = "0123456789"
SYMBOLS = " !\"\\#$%&'()*+,-./:;<=>?@[]^_`|~" SYMBOLS = " !\"\\#$%&'()*+,-./:;<=>?@[]^_`|~"
BinaryParamKey = "MM_BINARY_PARAMETERS" BinaryParamKey = "MM_BINARY_PARAMETERS"
NoTranslation = "<untranslated>" NoTranslation = "<untranslated>"
maxPropSizeBytes = 1024 * 1024 maxPropSizeBytes = 1024 * 1024
PayloadParseError = "api.payload.parse.error"
) )
var ErrMaxPropSizeExceeded = fmt.Errorf("max prop size of %d exceeded", maxPropSizeBytes) var ErrMaxPropSizeExceeded = fmt.Errorf("max prop size of %d exceeded", maxPropSizeBytes)
@@ -484,17 +485,41 @@ func ArrayToJSON(objmap []string) string {
return string(b) return string(b)
} }
// Deprecated: ArrayFromJSON is deprecated,
// use SortedArrayFromJSON or NonSortedArrayFromJSON instead
func ArrayFromJSON(data io.Reader) []string { func ArrayFromJSON(data io.Reader) []string {
var objmap []string var objmap []string
json.NewDecoder(data).Decode(&objmap) json.NewDecoder(data).Decode(&objmap)
if objmap == nil { if objmap == nil {
return make([]string, 0) return make([]string, 0)
} }
return objmap return objmap
} }
func SortedArrayFromJSON(data io.Reader, maxBytes int64) ([]string, error) {
var obj []string
lr := io.LimitReader(data, maxBytes)
err := json.NewDecoder(lr).Decode(&obj)
if err != nil || obj == nil {
return nil, err
}
// Remove duplicate IDs as it can bring a significant load to the database.
return RemoveDuplicateStrings(obj), nil
}
func NonSortedArrayFromJSON(data io.Reader, maxBytes int64) ([]string, error) {
var obj []string
lr := io.LimitReader(data, maxBytes)
err := json.NewDecoder(lr).Decode(&obj)
if err != nil || obj == nil {
return nil, err
}
// Remove duplicate IDs, but don't sort.
return RemoveDuplicateStringsNonSort(obj), nil
}
func ArrayFromInterface(data any) []string { func ArrayFromInterface(data any) []string {
stringArray := []string{} stringArray := []string{}
@@ -737,6 +762,20 @@ func RemoveDuplicateStrings(in []string) []string {
return in[:j+1] return in[:j+1]
} }
// RemoveDuplicateStringsNonSort does a removal of duplicate
// strings using a map.
func RemoveDuplicateStringsNonSort(in []string) []string {
allKeys := make(map[string]bool)
list := []string{}
for _, item := range in {
if _, value := allKeys[item]; !value {
allKeys[item] = true
list = append(list, item)
}
}
return list
}
func GetPreferredTimezone(timezone StringMap) string { func GetPreferredTimezone(timezone StringMap) string {
if timezone["useAutomaticTimezone"] == "true" { if timezone["useAutomaticTimezone"] == "true" {
return timezone["automaticTimezone"] return timezone["automaticTimezone"]

Просмотреть файл

@@ -5,8 +5,10 @@ package model
import ( import (
"bytes" "bytes"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"net/http" "net/http"
"reflect" "reflect"
"strings" "strings"
@@ -200,6 +202,88 @@ func TestMapJson(t *testing.T) {
require.LessOrEqual(t, len(rm2), 0, "make should be invalid") require.LessOrEqual(t, len(rm2), 0, "make should be invalid")
} }
func TestSortedArrayFromJSON(t *testing.T) {
t.Run("Successful parse", func(t *testing.T) {
ids := []string{NewId(), NewId(), NewId()}
b, _ := json.Marshal(ids)
a, err := SortedArrayFromJSON(bytes.NewReader(b), 1000)
require.NoError(t, err)
require.ElementsMatch(t, ids, a)
})
t.Run("Empty Array", func(t *testing.T) {
ids := []string{}
b, _ := json.Marshal(ids)
a, err := SortedArrayFromJSON(bytes.NewReader(b), 1000)
require.NoError(t, err)
require.Empty(t, a)
})
t.Run("Error too large", func(t *testing.T) {
var ids []string
for i := 0; i <= 100; i++ {
ids = append(ids, NewId())
}
b, _ := json.Marshal(ids)
_, err := SortedArrayFromJSON(bytes.NewReader(b), 1000)
require.Error(t, err)
require.ErrorIs(t, err, io.ErrUnexpectedEOF)
})
t.Run("Duplicate keys, returns one", func(t *testing.T) {
var ids []string
id := NewId()
for i := 0; i < 10; i++ {
ids = append(ids, id)
}
b, _ := json.Marshal(ids)
a, err := SortedArrayFromJSON(bytes.NewReader(b), 26000)
require.NoError(t, err)
require.Len(t, a, 1)
})
}
func TestNonSortedArrayFromJSON(t *testing.T) {
t.Run("Successful parse", func(t *testing.T) {
ids := []string{NewId(), NewId(), NewId()}
b, _ := json.Marshal(ids)
a, err := NonSortedArrayFromJSON(bytes.NewReader(b), 1000)
require.NoError(t, err)
require.Equal(t, ids, a)
})
t.Run("Empty Array", func(t *testing.T) {
ids := []string{}
b, _ := json.Marshal(ids)
a, err := NonSortedArrayFromJSON(bytes.NewReader(b), 1000)
require.NoError(t, err)
require.Empty(t, a)
})
t.Run("Error too large", func(t *testing.T) {
var ids []string
for i := 0; i <= 100; i++ {
ids = append(ids, NewId())
}
b, _ := json.Marshal(ids)
_, err := NonSortedArrayFromJSON(bytes.NewReader(b), 1000)
require.Error(t, err)
require.ErrorIs(t, err, io.ErrUnexpectedEOF)
})
t.Run("Duplicate keys, returns one", func(t *testing.T) {
var ids []string
id := NewId()
for i := 0; i <= 10; i++ {
ids = append(ids, id)
}
b, _ := json.Marshal(ids)
a, err := NonSortedArrayFromJSON(bytes.NewReader(b), 26000)
require.NoError(t, err)
require.Len(t, a, 1)
})
}
func TestIsValidEmail(t *testing.T) { func TestIsValidEmail(t *testing.T) {
for _, testCase := range []struct { for _, testCase := range []struct {
Input string Input string

Просмотреть файл

@@ -466,6 +466,7 @@ func extractForConstants(name string, valueNode ast.Expr) *string {
"ExpiredLicenseError": true, "ExpiredLicenseError": true,
"InvalidLicenseError": true, "InvalidLicenseError": true,
"NoTranslation": true, "NoTranslation": true,
"PayloadParseError": true,
} }
if _, ok := validConstants[name]; !ok { if _, ok := validConstants[name]; !ok {