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-57147] Obfuscate ReplicaLagSettings in Support Packet (#26426)

Browse Source
This commit is contained in:
Ben Schumacher 2024-04-08 11:01:13 +02:00 committed by GitHub
parent 4783950e72
commit 765593e89a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/model/config.go
View File

@ -4365,6 +4365,10 @@ func (o *Config) Sanitize() {
o.SqlSettings.DataSourceSearchReplicas[i] = FakeSetting o.SqlSettings.DataSourceSearchReplicas[i] = FakeSetting
} }
for i := range o.SqlSettings.ReplicaLagSettings {
o.SqlSettings.ReplicaLagSettings[i].DataSource = NewString(FakeSetting)
}
if o.MessageExportSettings.GlobalRelaySettings != nil && if o.MessageExportSettings.GlobalRelaySettings != nil &&
o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != nil && o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != nil &&
*o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != "" { *o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != "" {

18
server/public/model/config_test.go
View File

@ -1387,6 +1387,11 @@ func TestConfigSanitize(t *testing.T) {
*c.OpenIdSettings.Secret = "secret" *c.OpenIdSettings.Secret = "secret"
c.SqlSettings.DataSourceReplicas = []string{"stuff"} c.SqlSettings.DataSourceReplicas = []string{"stuff"}
c.SqlSettings.DataSourceSearchReplicas = []string{"stuff"} c.SqlSettings.DataSourceSearchReplicas = []string{"stuff"}
c.SqlSettings.ReplicaLagSettings = []*ReplicaLagSettings{{
DataSource: NewString("DataSource"),
QueryAbsoluteLag: NewString("QueryAbsoluteLag"),
QueryTimeLag: NewString("QueryTimeLag"),
}}
c.Sanitize() c.Sanitize()
@ -1401,6 +1406,19 @@ func TestConfigSanitize(t *testing.T) {
assert.Equal(t, FakeSetting, *c.ElasticsearchSettings.Password) assert.Equal(t, FakeSetting, *c.ElasticsearchSettings.Password)
assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceReplicas[0]) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceReplicas[0])
assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceSearchReplicas[0]) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceSearchReplicas[0])
require.Len(t, c.SqlSettings.ReplicaLagSettings, 1)
assert.Equal(t, FakeSetting, *c.SqlSettings.ReplicaLagSettings[0].DataSource)
assert.Equal(t, "QueryAbsoluteLag", *c.SqlSettings.ReplicaLagSettings[0].QueryAbsoluteLag)
assert.Equal(t, "QueryTimeLag", *c.SqlSettings.ReplicaLagSettings[0].QueryTimeLag)
t.Run("with default config", func(t *testing.T) {
c := Config{}
c.SetDefaults()
c.Sanitize()
assert.Len(t, c.SqlSettings.ReplicaLagSettings, 0)
})
} }
func TestConfigFilteredByTag(t *testing.T) { func TestConfigFilteredByTag(t *testing.T) {