diff options
author | George Goldberg <george@gberg.me> | 2017-03-27 12:43:27 +0100 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2017-03-27 08:43:27 -0300 |
commit | b489a5bb017b835d453b0ab7de57a27afb65a03c (patch) | |
tree | 91be20ec170170a968147cf213a069f18693aef5 /model | |
parent | 01aaccb34080ede234602d1ca9acee8373b8560f (diff) | |
download | chat-b489a5bb017b835d453b0ab7de57a27afb65a03c.tar.gz chat-b489a5bb017b835d453b0ab7de57a27afb65a03c.tar.bz2 chat-b489a5bb017b835d453b0ab7de57a27afb65a03c.zip |
PLT-5904 (Server): Config flag for SMTP Cert Check. (#5857)
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/model/config.go b/model/config.go index 8a2a5cc47..4486b64ad 100644 --- a/model/config.go +++ b/model/config.go @@ -231,27 +231,28 @@ type FileSettings struct { } type EmailSettings struct { - EnableSignUpWithEmail bool - EnableSignInWithEmail *bool - EnableSignInWithUsername *bool - SendEmailNotifications bool - RequireEmailVerification bool - FeedbackName string - FeedbackEmail string - FeedbackOrganization *string - SMTPUsername string - SMTPPassword string - SMTPServer string - SMTPPort string - ConnectionSecurity string - InviteSalt string - PasswordResetSalt string - SendPushNotifications *bool - PushNotificationServer *string - PushNotificationContents *string - EnableEmailBatching *bool - EmailBatchingBufferSize *int - EmailBatchingInterval *int + EnableSignUpWithEmail bool + EnableSignInWithEmail *bool + EnableSignInWithUsername *bool + SendEmailNotifications bool + RequireEmailVerification bool + FeedbackName string + FeedbackEmail string + FeedbackOrganization *string + SMTPUsername string + SMTPPassword string + SMTPServer string + SMTPPort string + ConnectionSecurity string + InviteSalt string + PasswordResetSalt string + SendPushNotifications *bool + PushNotificationServer *string + PushNotificationContents *string + EnableEmailBatching *bool + EmailBatchingBufferSize *int + EmailBatchingInterval *int + SkipServerCertificateVerification *bool } type RateLimitSettings struct { @@ -680,6 +681,11 @@ func (o *Config) SetDefaults() { *o.EmailSettings.EmailBatchingInterval = EMAIL_BATCHING_INTERVAL } + if o.EmailSettings.SkipServerCertificateVerification == nil { + o.EmailSettings.SkipServerCertificateVerification = new(bool) + *o.EmailSettings.SkipServerCertificateVerification = false + } + if !IsSafeLink(o.SupportSettings.TermsOfServiceLink) { o.SupportSettings.TermsOfServiceLink = nil } |