Merge pull request #11 from mattermost/mm-1228

MM-1228 - Ability to use local mail config.

3 files changed, 21 insertions, 8 deletions

diff --git a/config/config.json b/config/config.json
index a6c79efac..c75f2f15a 100644
--- a/config/config.json
+++ b/config/config.json
@@ -57,6 +57,7 @@
         "SMTPUsername": "",
         "SMTPPassword": "",
         "SMTPServer": "",
+		"UseTLS": true,
         "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
         "FeedbackName": "",
         "ApplePushServer": "",
diff --git a/utils/config.go b/utils/config.go
index 1060c7550..76e6060be 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -79,6 +79,7 @@ type EmailSettings struct {
 	SMTPUsername         string
 	SMTPPassword         string
 	SMTPServer           string
+	UseTLS               bool
 	FeedbackEmail        string
 	FeedbackName         string
 	ApplePushServer      string
diff --git a/utils/mail.go b/utils/mail.go
index b8c2f4f9b..645dcae24 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -40,16 +40,23 @@ func SendMail(to, subject, body string) *model.AppError {
 
 	auth := smtp.PlainAuth("", Cfg.EmailSettings.SMTPUsername, Cfg.EmailSettings.SMTPPassword, host)
 
-	tlsconfig := &tls.Config{
-		InsecureSkipVerify: true,
-		ServerName:         host,
+	if Cfg.EmailSettings.UseTLS {
+		tlsconfig := &tls.Config{
+			InsecureSkipVerify: true,
+			ServerName:         host,
+		}
+
+		conn, err := tls.Dial("tcp", Cfg.EmailSettings.SMTPServer, tlsconfig)
+		if err != nil {
+			return model.NewAppError("SendMail", "Failed to open TLS connection", err.Error())
+		}
+		defer conn.Close()
 	}
 
-	conn, err := tls.Dial("tcp", Cfg.EmailSettings.SMTPServer, tlsconfig)
+	conn, err := net.Dial("tcp", Cfg.EmailSettings.SMTPServer)
 	if err != nil {
-		return model.NewAppError("SendMail", "Failed to open TLS connection", err.Error())
+		return model.NewAppError("SendMail", "Failed to open connection", err.Error())
 	}
-	defer conn.Close()
 
 	c, err := smtp.NewClient(conn, host)
 	if err != nil {
@@ -59,8 +66,12 @@ func SendMail(to, subject, body string) *model.AppError {
 	defer c.Quit()
 	defer c.Close()
 
-	if err = c.Auth(auth); err != nil {
-		return model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error())
+	// GO does not support plain auth over a non encrypted connection.
+	// so if not tls then no auth
+	if Cfg.EmailSettings.UseTLS {
+		if err = c.Auth(auth); err != nil {
+			return model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error())
+		}
 	}
 
 	if err = c.Mail(fromMail.Address); err != nil {