diff options
author | George Goldberg <george@gberg.me> | 2017-04-05 13:56:03 +0100 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-05 08:56:03 -0400 |
commit | 92dd07def82cff9d73cbc9cb9cfa53b8d98b84a8 (patch) | |
tree | 2f3348283b678874b1465d266d325274d00106a2 /webapp/components | |
parent | 22005f876f455c50c131f6c0660d50b6974598a5 (diff) | |
download | chat-92dd07def82cff9d73cbc9cb9cfa53b8d98b84a8.tar.gz chat-92dd07def82cff9d73cbc9cb9cfa53b8d98b84a8.tar.bz2 chat-92dd07def82cff9d73cbc9cb9cfa53b8d98b84a8.zip |
PLT-5904 (WebApp): Config for skip email server cert verification. (#5991)
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index 6cf09f653..d54ab3906 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -34,6 +34,7 @@ export default class EmailSettings extends AdminSettings { config.EmailSettings.ConnectionSecurity = this.state.connectionSecurity; config.EmailSettings.EnableEmailBatching = this.state.enableEmailBatching; config.ServiceSettings.EnableSecurityFixAlert = this.state.enableSecurityFixAlert; + config.EmailSettings.SkipServerCertificateVerification = this.state.skipServerCertificateVerification; return config; } @@ -50,6 +51,7 @@ export default class EmailSettings extends AdminSettings { smtpPort: config.EmailSettings.SMTPPort, connectionSecurity: config.EmailSettings.ConnectionSecurity, enableEmailBatching: config.EmailSettings.EnableEmailBatching, + skipServerCertificateVerification: config.EmailSettings.SkipServerCertificateVerification, enableSecurityFixAlert: config.ServiceSettings.EnableSecurityFixAlert }; } @@ -275,6 +277,23 @@ export default class EmailSettings extends AdminSettings { disabled={!this.state.sendEmailNotifications} /> <BooleanSetting + id='skipServerCertificateVerification' + label={ + <FormattedMessage + id='admin.email.skipServerCertificateVerification.title' + defaultMessage='Skip Server Certificate Verification: ' + /> + } + helpText={ + <FormattedMessage + id='admin.email.skipServerCertificateVerification.description' + defaultMessage='When true, Mattermost will not verify the email server certificate.' + /> + } + value={this.state.skipServerCertificateVerification} + onChange={this.handleChange} + /> + <BooleanSetting id='enableSecurityFixAlert' label={ <FormattedMessage |