From 504fb96fdd98caa36ce0937baba1a2fbcc09818f Mon Sep 17 00:00:00 2001 From: Rajat Dabade Date: Fri, 27 Mar 2026 01:56:06 +0530 Subject: [PATCH] Added FakeSetting for keys generation for support package (#35346) Co-authored-by: Mattermost Build --- server/public/model/config.go | 16 ++++++++++++++++ server/public/model/config_test.go | 8 ++++++++ 2 files changed, 24 insertions(+) diff --git a/server/public/model/config.go b/server/public/model/config.go index 53894d4c6be..97f80ae24b2 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -5028,6 +5028,10 @@ func (o *Config) Sanitize(pluginManifests []*Manifest, opts *SanitizeOptions) { *o.FileSettings.AmazonS3SecretAccessKey = FakeSetting } + if o.FileSettings.ExportAmazonS3SecretAccessKey != nil && *o.FileSettings.ExportAmazonS3SecretAccessKey != "" { + *o.FileSettings.ExportAmazonS3SecretAccessKey = FakeSetting + } + if o.EmailSettings.SMTPPassword != nil && *o.EmailSettings.SMTPPassword != "" { *o.EmailSettings.SMTPPassword = FakeSetting } @@ -5060,6 +5064,10 @@ func (o *Config) Sanitize(pluginManifests []*Manifest, opts *SanitizeOptions) { *o.ElasticsearchSettings.Password = FakeSetting } + if o.ElasticsearchSettings.ClientKey != nil && *o.ElasticsearchSettings.ClientKey != "" { + *o.ElasticsearchSettings.ClientKey = FakeSetting + } + for i := range o.SqlSettings.DataSourceReplicas { o.SqlSettings.DataSourceReplicas[i] = sanitizeDataSourceField(o.SqlSettings.DataSourceReplicas[i], "SqlSettings.DataSourceReplicas") } @@ -5085,6 +5093,14 @@ func (o *Config) Sanitize(pluginManifests []*Manifest, opts *SanitizeOptions) { *o.ServiceSettings.SplitKey = FakeSetting } + if o.ServiceSettings.GoogleDeveloperKey != nil && *o.ServiceSettings.GoogleDeveloperKey != "" { + *o.ServiceSettings.GoogleDeveloperKey = FakeSetting + } + + if o.ServiceSettings.GiphySdkKey != nil && *o.ServiceSettings.GiphySdkKey != "" { + *o.ServiceSettings.GiphySdkKey = FakeSetting + } + if o.CacheSettings.RedisPassword != nil { *o.CacheSettings.RedisPassword = FakeSetting } diff --git a/server/public/model/config_test.go b/server/public/model/config_test.go index 0991f8a214a..14e52d0159c 100644 --- a/server/public/model/config_test.go +++ b/server/public/model/config_test.go @@ -1581,9 +1581,13 @@ func TestConfigSanitize(t *testing.T) { *c.LdapSettings.BindPassword = "foo" *c.FileSettings.AmazonS3SecretAccessKey = "bar" + *c.FileSettings.ExportAmazonS3SecretAccessKey = "export-secret" *c.EmailSettings.SMTPPassword = "baz" *c.GitLabSettings.Secret = "bingo" *c.OpenIdSettings.Secret = "secret" + *c.ServiceSettings.GoogleDeveloperKey = "google-api-key" + *c.ServiceSettings.GiphySdkKey = "giphy-sdk-key" + *c.ElasticsearchSettings.ClientKey = "/path/to/client-key.pem" *c.AutoTranslationSettings.LibreTranslate.APIKey = "libre-api-key" c.SqlSettings.DataSourceReplicas = []string{"stuff"} c.SqlSettings.DataSourceSearchReplicas = []string{"stuff"} @@ -1598,6 +1602,7 @@ func TestConfigSanitize(t *testing.T) { assert.Equal(t, FakeSetting, *c.LdapSettings.BindPassword) assert.Equal(t, FakeSetting, *c.FileSettings.PublicLinkSalt) assert.Equal(t, FakeSetting, *c.FileSettings.AmazonS3SecretAccessKey) + assert.Equal(t, FakeSetting, *c.FileSettings.ExportAmazonS3SecretAccessKey) assert.Equal(t, FakeSetting, *c.EmailSettings.SMTPPassword) assert.Equal(t, FakeSetting, *c.GitLabSettings.Secret) assert.Equal(t, FakeSetting, *c.OpenIdSettings.Secret) @@ -1605,6 +1610,9 @@ func TestConfigSanitize(t *testing.T) { assert.Equal(t, FakeSetting, *c.SqlSettings.DataSource) assert.Equal(t, FakeSetting, *c.SqlSettings.AtRestEncryptKey) assert.Equal(t, FakeSetting, *c.ElasticsearchSettings.Password) + assert.Equal(t, FakeSetting, *c.ElasticsearchSettings.ClientKey) + assert.Equal(t, FakeSetting, *c.ServiceSettings.GoogleDeveloperKey) + assert.Equal(t, FakeSetting, *c.ServiceSettings.GiphySdkKey) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceReplicas[0]) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceSearchReplicas[0])