Merge pull request #7084 from colin-campbell/develop

[FIX] Add option to ignore TLS in SMTP server settings
RocketChat · May 31, 2017 · 27da645 · 27da645
2 parents d695d10 + 00cf79c
commit 27da645
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
@@ -467,7 +467,7 @@ RocketChat.settings.addGroup('General', function() {
 
 RocketChat.settings.addGroup('Email', function() {
 	this.section('Header_and_Footer', function() {
-		this.add('Email_Header', '<html><table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#f3f3f3" style="color:#4a4a4a;font-family: Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;border-collapse:callapse;border-spacing:0;margin:0 auto"><tr><td style="padding:1em"><table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" style="width:100%;margin:0 auto;max-width:800px"><tr><td bgcolor="#ffffff" style="background-color:#ffffff; border: 1px solid #DDD; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;"><table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td style="background-color: #04436a;"><h1 style="font-family: Helvetica,Arial,sans-serif; padding: 0 1em; margin: 0; line-height: 70px; color: #FFF;">[Site_Name]</h1></td></tr><tr><td style="padding: 1em; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;">', {
+		this.add('Email_Header', '<html><table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#f3f3f3" style="color:#4a4a4a;font-family: Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;border-collapse:collapse;border-spacing:0;margin:0 auto"><tr><td style="padding:1em"><table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" style="width:100%;margin:0 auto;max-width:800px"><tr><td bgcolor="#ffffff" style="background-color:#ffffff; border: 1px solid #DDD; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;"><table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td style="background-color: #04436a;"><h1 style="font-family: Helvetica,Arial,sans-serif; padding: 0 1em; margin: 0; line-height: 70px; color: #FFF;">[Site_Name]</h1></td></tr><tr><td style="padding: 1em; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;">', {
 			type: 'code',
 			code: 'text/html',
 			multiline: true,
@@ -505,6 +505,15 @@ RocketChat.settings.addGroup('Email', function() {
 			env: true,
 			i18nLabel: 'Port'
 		});
+		this.add('SMTP_IgnoreTLS', false, {
+			type: 'boolean',
+			env: true,
+			i18nLabel: 'IgnoreTLS',
+			enableQuery: {
+				_id: 'SMTP_Protocol',
+				value: 'smtp'
+			}
+		});
 		this.add('SMTP_Pool', true, {
 			type: 'boolean',
 			env: true,

diff --git a/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js b/packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
@@ -16,6 +16,10 @@ const buildMailURL = _.debounce(function() {
 
 		process.env.MAIL_URL += `?pool=${ RocketChat.settings.get('SMTP_Pool') }`;
 
+		if (RocketChat.settings.get('SMTP_Protocol') === 'smtp' && RocketChat.settings.get('SMTP_IgnoreTLS')) {
+			process.env.MAIL_URL += '&secure=false&ignoreTLS=true';
+		}
+
 		return process.env.MAIL_URL;
 	}
 }, 500);
@@ -50,6 +54,10 @@ RocketChat.settings.onload('SMTP_Pool', function() {
 	return buildMailURL();
 });
 
+RocketChat.settings.onload('SMTP_IgnoreTLS', function() {
+	return buildMailURL();
+});
+
 Meteor.startup(function() {
 	return buildMailURL();
 });