From c6b20ab133416762ab222e402d1dfb021f77cea2 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Mon, 31 Aug 2020 02:18:39 -0400 Subject: [PATCH] MM-27525: Sanitizes gifycat's and Oauth secrets. (#15348) --- config/utils.go | 12 ++++++++++++ model/config.go | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/config/utils.go b/config/utils.go index a1a552579d..117c06d02e 100644 --- a/config/utils.go +++ b/config/utils.go @@ -33,6 +33,14 @@ func desanitize(actual, target *model.Config) { target.GitLabSettings.Secret = actual.GitLabSettings.Secret } + if target.GoogleSettings.Secret != nil && *target.GoogleSettings.Secret == model.FAKE_SETTING { + target.GoogleSettings.Secret = actual.GoogleSettings.Secret + } + + if target.Office365Settings.Secret != nil && *target.Office365Settings.Secret == model.FAKE_SETTING { + target.Office365Settings.Secret = actual.Office365Settings.Secret + } + if *target.SqlSettings.DataSource == model.FAKE_SETTING { *target.SqlSettings.DataSource = *actual.SqlSettings.DataSource } @@ -57,6 +65,10 @@ func desanitize(actual, target *model.Config) { if *target.MessageExportSettings.GlobalRelaySettings.SmtpPassword == model.FAKE_SETTING { *target.MessageExportSettings.GlobalRelaySettings.SmtpPassword = *actual.MessageExportSettings.GlobalRelaySettings.SmtpPassword } + + if target.ServiceSettings.GfycatApiSecret != nil && *target.ServiceSettings.GfycatApiSecret == model.FAKE_SETTING { + *target.ServiceSettings.GfycatApiSecret = *actual.ServiceSettings.GfycatApiSecret + } } // fixConfig patches invalid or missing data in the configuration, returning true if changed. diff --git a/model/config.go b/model/config.go index 1a2b698e5a..c8615dcc44 100644 --- a/model/config.go +++ b/model/config.go @@ -3504,6 +3504,14 @@ func (o *Config) Sanitize() { *o.GitLabSettings.Secret = FAKE_SETTING } + if o.GoogleSettings.Secret != nil && len(*o.GoogleSettings.Secret) > 0 { + *o.GoogleSettings.Secret = FAKE_SETTING + } + + if o.Office365Settings.Secret != nil && len(*o.Office365Settings.Secret) > 0 { + *o.Office365Settings.Secret = FAKE_SETTING + } + *o.SqlSettings.DataSource = FAKE_SETTING *o.SqlSettings.AtRestEncryptKey = FAKE_SETTING @@ -3520,4 +3528,8 @@ func (o *Config) Sanitize() { if o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil && len(*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword) > 0 { *o.MessageExportSettings.GlobalRelaySettings.SmtpPassword = FAKE_SETTING } + + if o.ServiceSettings.GfycatApiSecret != nil && len(*o.ServiceSettings.GfycatApiSecret) > 0 { + *o.ServiceSettings.GfycatApiSecret = FAKE_SETTING + } }