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-61441] Don't overwrite plugin secret settings with fake values (#29029)

Browse Source
This commit is contained in:
Ben Schumacher 2024-11-11 11:43:26 +01:00 committed by GitHub
parent 33005922c9
commit d33d7a5ec7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/config/utils.go
View File

@ -88,6 +88,14 @@ func desanitize(actual, target *model.Config) {
if *target.ServiceSettings.SplitKey == model.FakeSetting {
*target.ServiceSettings.SplitKey = *actual.ServiceSettings.SplitKey
}
for id, settings := range target.PluginSettings.Plugins {
for k, v := range settings {
if v == model.FakeSetting {
settings[k] = actual.PluginSettings.Plugins[id][k]
}
}
}
}
// fixConfig patches invalid or missing data in the configuration.

13
server/config/utils_test.go
View File

@ -35,6 +35,12 @@ func TestDesanitize(t *testing.T) {
actual.SqlSettings.DataSourceReplicas = append(actual.SqlSettings.DataSourceReplicas, "replica1")
actual.SqlSettings.DataSourceSearchReplicas = append(actual.SqlSettings.DataSourceSearchReplicas, "search_replica0")
actual.SqlSettings.DataSourceSearchReplicas = append(actual.SqlSettings.DataSourceSearchReplicas, "search_replica1")
actual.PluginSettings.Plugins = map[string]map[string]any{
"plugin1": {
"secret": "value1",
"no_secret": "value2",
},
}
target := &model.Config{}
target.SetDefaults()
@ -55,6 +61,12 @@ func TestDesanitize(t *testing.T) {
target.ElasticsearchSettings.Password = model.NewPointer(model.FakeSetting)
target.SqlSettings.DataSourceReplicas = []string{model.FakeSetting, model.FakeSetting}
target.SqlSettings.DataSourceSearchReplicas = []string{model.FakeSetting, model.FakeSetting}
target.PluginSettings.Plugins = map[string]map[string]any{
"plugin1": {
"secret": model.FakeSetting,
"no_secret": "value2",
},
}
actualClone := actual.Clone()
desanitize(actual, target)
@ -77,6 +89,7 @@ func TestDesanitize(t *testing.T) {
assert.Equal(t, actual.SqlSettings.DataSourceReplicas, target.SqlSettings.DataSourceReplicas)
assert.Equal(t, actual.SqlSettings.DataSourceSearchReplicas, target.SqlSettings.DataSourceSearchReplicas)
assert.Equal(t, actual.ServiceSettings.SplitKey, target.ServiceSettings.SplitKey)
assert.Equal(t, actual.PluginSettings.Plugins, target.PluginSettings.Plugins)
}
func TestFixInvalidLocales(t *testing.T) {