diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-04 16:36:51 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-04 16:36:51 -0400 |
| commit | 010ec23af38c7c15f133f9327685b9813efb3e43 (patch) | |
| tree | cd86c34e7ceb9a64a900a6bb00045214d43d17f6 /model | |
| parent | fe95276ba849bc7a520087369eea0aaff6c92358 (diff) | |
| download | chat-010ec23af38c7c15f133f9327685b9813efb3e43.tar.gz chat-010ec23af38c7c15f133f9327685b9813efb3e43.tar.bz2 chat-010ec23af38c7c15f133f9327685b9813efb3e43.zip | |
Removing password reset salt (#6334)
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/model/config.go b/model/config.go index 3015b3324..706d07246 100644 --- a/model/config.go +++ b/model/config.go @@ -250,7 +250,6 @@ type EmailSettings struct { SMTPPort string ConnectionSecurity string InviteSalt string - PasswordResetSalt string SendPushNotifications *bool PushNotificationServer *string PushNotificationContents *string @@ -503,10 +502,6 @@ func (o *Config) SetDefaults() { o.EmailSettings.InviteSalt = NewRandomString(32) } - if len(o.EmailSettings.PasswordResetSalt) == 0 { - o.EmailSettings.PasswordResetSalt = NewRandomString(32) - } - if o.ServiceSettings.SiteURL == nil { o.ServiceSettings.SiteURL = new(string) *o.ServiceSettings.SiteURL = SERVICE_SETTINGS_DEFAULT_SITE_URL @@ -1288,10 +1283,6 @@ func (o *Config) IsValid() *AppError { return NewLocAppError("Config.IsValid", "model.config.is_valid.email_salt.app_error", nil, "") } - if len(o.EmailSettings.PasswordResetSalt) < 32 { - return NewLocAppError("Config.IsValid", "model.config.is_valid.email_reset_salt.app_error", nil, "") - } - if *o.EmailSettings.EmailBatchingBufferSize <= 0 { return NewLocAppError("Config.IsValid", "model.config.is_valid.email_batching_buffer_size.app_error", nil, "") } @@ -1438,7 +1429,6 @@ func (o *Config) Sanitize() { } o.EmailSettings.InviteSalt = FAKE_SETTING - o.EmailSettings.PasswordResetSalt = FAKE_SETTING if len(o.EmailSettings.SMTPPassword) > 0 { o.EmailSettings.SMTPPassword = FAKE_SETTING } |