From 92dd07def82cff9d73cbc9cb9cfa53b8d98b84a8 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Wed, 5 Apr 2017 13:56:03 +0100
Subject: PLT-5904 (WebApp): Config for skip email server cert verification.
 (#5991)

---
 webapp/components/admin_console/email_settings.jsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'webapp/components/admin_console')

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
         };
     }
@@ -274,6 +276,23 @@ export default class EmailSettings extends AdminSettings {
                     getConfigFromState={this.getConfigFromState}
                     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={
-- 
cgit v1.2.3-1-g7c22