MM-16474: SMTP password should be redacted in system console. (#11350)

Fix Santize function to be the opposite of the Desanitize function for
the config file, and add a unit test for Sanitize.
Этот коммит содержится в:
George Goldberg
2019-06-25 15:36:26 +01:00
коммит произвёл Harrison Healey
родитель e9cb343ba7
Коммит 130873c2f1
2 изменённых файлов: 32 добавлений и 2 удалений

Просмотреть файл

@@ -2984,10 +2984,15 @@ func (o *Config) Sanitize() {
}
*o.FileSettings.PublicLinkSalt = FAKE_SETTING
if len(*o.FileSettings.AmazonS3SecretAccessKey) > 0 {
*o.FileSettings.AmazonS3SecretAccessKey = FAKE_SETTING
}
if o.EmailSettings.SMTPPassword != nil && len(*o.EmailSettings.SMTPPassword) > 0 {
*o.EmailSettings.SMTPPassword = FAKE_SETTING
}
if len(*o.GitLabSettings.Secret) > 0 {
*o.GitLabSettings.Secret = FAKE_SETTING
}
@@ -2995,6 +3000,8 @@ func (o *Config) Sanitize() {
*o.SqlSettings.DataSource = FAKE_SETTING
*o.SqlSettings.AtRestEncryptKey = FAKE_SETTING
*o.ElasticsearchSettings.Password = FAKE_SETTING
for i := range o.SqlSettings.DataSourceReplicas {
o.SqlSettings.DataSourceReplicas[i] = FAKE_SETTING
}
@@ -3002,6 +3009,4 @@ func (o *Config) Sanitize() {
for i := range o.SqlSettings.DataSourceSearchReplicas {
o.SqlSettings.DataSourceSearchReplicas[i] = FAKE_SETTING
}
*o.ElasticsearchSettings.Password = FAKE_SETTING
}