Merge pull request #2083 from mattermost/plt-1879

PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…

1 files changed, 27 insertions, 21 deletions

diff --git a/model/config.go b/model/config.go
index acb525abf..aa3dd3586 100644
--- a/model/config.go
+++ b/model/config.go
@@ -24,26 +24,27 @@ const (
 )
 
 type ServiceSettings struct {
-	ListenAddress               string
-	MaximumLoginAttempts        int
-	SegmentDeveloperKey         string
-	GoogleDeveloperKey          string
-	EnableOAuthServiceProvider  bool
-	EnableIncomingWebhooks      bool
-	EnableOutgoingWebhooks      bool
-	EnableCommands              *bool
-	EnableOnlyAdminIntegrations *bool
-	EnablePostUsernameOverride  bool
-	EnablePostIconOverride      bool
-	EnableTesting               bool
-	EnableDeveloper             *bool
-	EnableSecurityFixAlert      *bool
-	SessionLengthWebInDays      *int
-	SessionLengthMobileInDays   *int
-	SessionLengthSSOInDays      *int
-	SessionCacheInMinutes       *int
-	WebsocketSecurePort         *int
-	WebsocketPort               *int
+	ListenAddress                     string
+	MaximumLoginAttempts              int
+	SegmentDeveloperKey               string
+	GoogleDeveloperKey                string
+	EnableOAuthServiceProvider        bool
+	EnableIncomingWebhooks            bool
+	EnableOutgoingWebhooks            bool
+	EnableCommands                    *bool
+	EnableOnlyAdminIntegrations       *bool
+	EnablePostUsernameOverride        bool
+	EnablePostIconOverride            bool
+	EnableTesting                     bool
+	EnableDeveloper                   *bool
+	EnableSecurityFixAlert            *bool
+	EnableInsecureOutgoingConnections *bool
+	SessionLengthWebInDays            *int
+	SessionLengthMobileInDays         *int
+	SessionLengthSSOInDays            *int
+	SessionCacheInMinutes             *int
+	WebsocketSecurePort               *int
+	WebsocketPort                     *int
 }
 
 type SSOSettings struct {
@@ -164,7 +165,7 @@ type LdapSettings struct {
 	UsernameAttribute  *string
 	IdAttribute        *string
 
-	// Advansed
+	// Advanced
 	QueryTimeout *int
 }
 
@@ -252,6 +253,11 @@ func (o *Config) SetDefaults() {
 		*o.ServiceSettings.EnableSecurityFixAlert = true
 	}
 
+	if o.ServiceSettings.EnableInsecureOutgoingConnections == nil {
+		o.ServiceSettings.EnableInsecureOutgoingConnections = new(bool)
+		*o.ServiceSettings.EnableInsecureOutgoingConnections = false
+	}
+
 	if o.TeamSettings.RestrictTeamNames == nil {
 		o.TeamSettings.RestrictTeamNames = new(bool)
 		*o.TeamSettings.RestrictTeamNames = true