IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-25713] Adds props check to post import validator (#14728)

Browse Source 
* [MM-25713] Adds props check to post import validator

* Fix linter

* Address review comments

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Miguel de la Cruz
2020-06-08 21:20:40 +02:00
committed by GitHub
parent 6cd898fab7
commit 457903a12c
4 changed files with 132 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/import_functions.go
View File

@@ -1082,7 +1082,7 @@ func (a *App) importAttachment(data *AttachmentImportData, post *model.Post, tea
}
fileInfo, appErr := a.DoUploadFile(timestamp, teamId, post.ChannelId, post.UserId, file.Name(), buf.Bytes())
if appErr != nil {
mlog.Error("Failed to upload file:", mlog.Err(err))
mlog.Error("Failed to upload file:", mlog.Err(appErr))
return nil, appErr
}

4
app/import_validators.go
View File

@@ -457,6 +457,10 @@ func validatePostImportData(data *PostImportData, maxPostSize int) *model.AppErr
}
}
if data.Props != nil && utf8.RuneCountInString(model.StringInterfaceToJson(*data.Props)) > model.POST_PROPS_MAX_RUNES {
return model.NewAppError("BulkImport", "app.import.validate_post_import_data.props_too_large.error", nil, "", http.StatusBadRequest)
}
return nil
}

216
app/import_validators_test.go
View File

@@ -895,109 +895,139 @@ func TestImportValidateReplyImportData(t *testing.T) {
func TestImportValidatePostImportData(t *testing.T) {
maxPostSize := 10000
// Test with minimum required valid properties.
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err := validatePostImportData(&data, maxPostSize)
require.Nil(t, err, "Validation failed but should have been valid.")
t.Run("Test with minimum required valid properties", func(t *testing.T) {
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err := validatePostImportData(&data, maxPostSize)
require.Nil(t, err, "Validation failed but should have been valid.")
})
// Test with missing required properties.
data = PostImportData{
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
t.Run("Test with missing required properties", func(t *testing.T) {
data := PostImportData{
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err := validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.team_missing.error")
data = PostImportData{
Team: ptrStr("teamname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
data = PostImportData{
Team: ptrStr("teamname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.channel_missing.error")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.user_missing.error")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.message_missing.error")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to missing required property.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.create_at_missing.error")
})
// Test with invalid message.
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr(strings.Repeat("0", maxPostSize+1)),
CreateAt: ptrInt64(model.GetMillis()),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to too long message.")
t.Run("Test with invalid message", func(t *testing.T) {
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr(strings.Repeat("0", maxPostSize+1)),
CreateAt: ptrInt64(model.GetMillis()),
}
err := validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to too long message.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.message_length.error")
})
// Test with invalid CreateAt
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(0),
}
err = validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to 0 create-at value.")
t.Run("Test with invalid CreateAt", func(t *testing.T) {
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(0),
}
err := validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to 0 create-at value.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.create_at_zero.error")
})
// Test with valid all optional parameters.
reactions := []ReactionImportData{{
User: ptrStr("username"),
EmojiName: ptrStr("emoji"),
CreateAt: ptrInt64(model.GetMillis()),
}}
t.Run("Test with valid all optional parameters", func(t *testing.T) {
reactions := []ReactionImportData{{
User: ptrStr("username"),
EmojiName: ptrStr("emoji"),
CreateAt: ptrInt64(model.GetMillis()),
}}
replies := []ReplyImportData{{
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}}
replies := []ReplyImportData{{
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
}}
data = PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
Reactions: &reactions,
Replies: &replies,
}
err = validatePostImportData(&data, maxPostSize)
require.Nil(t, err, "Should have succeeded.")
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
CreateAt: ptrInt64(model.GetMillis()),
Reactions: &reactions,
Replies: &replies,
}
err := validatePostImportData(&data, maxPostSize)
require.Nil(t, err, "Should have succeeded.")
})
t.Run("Test with props too large", func(t *testing.T) {
props := model.StringInterface{
"attachment": strings.Repeat("a", model.POST_PROPS_MAX_RUNES),
}
data := PostImportData{
Team: ptrStr("teamname"),
Channel: ptrStr("channelname"),
User: ptrStr("username"),
Message: ptrStr("message"),
Props: &props,
CreateAt: ptrInt64(model.GetMillis()),
}
err := validatePostImportData(&data, maxPostSize)
require.NotNil(t, err, "Should have failed due to long props.")
assert.Equal(t, err.Id, "app.import.validate_post_import_data.props_too_large.error")
})
}
func TestImportValidateDirectChannelImportData(t *testing.T) {

4
i18n/en.json
View File

@@ -3370,6 +3370,10 @@
"id": "app.import.validate_post_import_data.message_missing.error",
"translation": "Missing required Post property: Message."
},
{
"id": "app.import.validate_post_import_data.props_too_large.error",
"translation": "Post Props are longer than the maximum permitted length."
},
{
"id": "app.import.validate_post_import_data.team_missing.error",
"translation": "Missing required Post property: Team."