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-27836] Fix possible panic when patching config (#15262)

Browse Source 
* Fix possible panic when updating/patching config

* Remove un-needed check
This commit is contained in:
Claudio Costa
2020-08-17 14:53:48 +02:00
committed by GitHub
parent 095e5d788b
commit 58c6eabf95
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api4/config.go
View File

@@ -180,7 +180,7 @@ func patchConfig(c *Context, w http.ResponseWriter, r *http.Request) {
}
appCfg := c.App.Config()
if *appCfg.ServiceSettings.SiteURL != "" && *cfg.ServiceSettings.SiteURL == "" {
if *appCfg.ServiceSettings.SiteURL != "" && (cfg.ServiceSettings.SiteURL == nil || *cfg.ServiceSettings.SiteURL == "") {
c.Err = model.NewAppError("patchConfig", "api.config.update_config.clear_siteurl.app_error", nil, "", http.StatusBadRequest)
return
}

6
api4/config_test.go
View File

@@ -550,6 +550,12 @@ func TestPatchConfig(t *testing.T) {
cfg, resp = th.SystemAdminClient.GetConfig()
CheckNoError(t, resp)
require.Equal(t, nonEmptyURL, *cfg.ServiceSettings.SiteURL)
// Check that sending an empty config returns an error.
_, resp = th.SystemAdminClient.PatchConfig(&model.Config{})
require.NotNil(t, resp.Error)
CheckBadRequestStatus(t, resp)
assert.Equal(t, "api.config.update_config.clear_siteurl.app_error", resp.Error.Id)
})
}