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

ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)

Browse Source 
* Prevent changing PluginSettings.EnableUploads through the API

* Contain api4 test case in it's own test
This commit is contained in:
Joram Wilander
2018-02-13 11:08:49 -05:00
committed by GitHub
parent d88d2bc2ed
commit 5c560db810
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/admin.go
View File

@@ -108,6 +108,9 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
// Do not allow plugin uploads to be toggled through the API
cfg.PluginSettings.EnableUploads = c.App.GetConfig().PluginSettings.EnableUploads
err := c.App.SaveConfig(cfg, true)
if err != nil {
c.Err = err

13
api/admin_test.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
"github.com/stretchr/testify/assert"
)
func TestGetLogs(t *testing.T) {
@@ -149,6 +150,18 @@ func TestSaveConfig(t *testing.T) {
}
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true })
// Should not be able to modify PluginSettings.EnableUploads
oldEnableUploads := *th.App.GetConfig().PluginSettings.EnableUploads
cfg := &model.Config{}
cfg.SetDefaults()
*cfg.PluginSettings.EnableUploads = !oldEnableUploads
if _, err := th.SystemAdminClient.SaveConfig(cfg); err != nil {
t.Fatal(err)
}
assert.Equal(t, oldEnableUploads, *th.App.Config().PluginSettings.EnableUploads)
}
func TestRecycleDatabaseConnection(t *testing.T) {