diff options
| author | Jirka Hlavacek <jhlavacek@avencall.com> | 2015-08-19 09:03:55 +0200 |
|---|---|---|
| committer | Jirka Hlavacek <jhlavacek@avencall.com> | 2015-08-19 09:03:55 +0200 |
| commit | 3c58e283b6cc3f87b533242b14142265edaff830 (patch) | |
| tree | 0c962465ccbd2432a34c13c641cde65b80a89151 | |
| parent | 7004a348b59d5572e8c84eb1c8138bf45cbd0d3e (diff) | |
| download | chat-3c58e283b6cc3f87b533242b14142265edaff830.tar.gz chat-3c58e283b6cc3f87b533242b14142265edaff830.tar.bz2 chat-3c58e283b6cc3f87b533242b14142265edaff830.zip | |
Add support for SMTP servers with StartTLS
| -rw-r--r-- | config/config.json | 3 | ||||
| -rw-r--r-- | docker/0.6/config_docker.json | 1 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 1 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 1 | ||||
| -rw-r--r-- | utils/config.go | 1 | ||||
| -rw-r--r-- | utils/mail.go | 6 |
6 files changed, 12 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index e7134cba5..f1f3ba22c 100644 --- a/config/config.json +++ b/config/config.json @@ -73,7 +73,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json index 128dc1274..157120b99 100644 --- a/docker/0.6/config_docker.json +++ b/docker/0.6/config_docker.json @@ -64,6 +64,7 @@ "SMTPPassword": "", "SMTPServer": "", "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index cd612c7fe..d336300ca 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -64,6 +64,7 @@ "SMTPPassword": "", "SMTPServer": "", "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index cd612c7fe..d336300ca 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -64,6 +64,7 @@ "SMTPPassword": "", "SMTPServer": "", "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/utils/config.go b/utils/config.go index a3944f670..536d0d802 100644 --- a/utils/config.go +++ b/utils/config.go @@ -85,6 +85,7 @@ type EmailSettings struct { SMTPPassword string SMTPServer string UseTLS bool + UseStartTLS bool FeedbackEmail string FeedbackName string ApplePushServer string diff --git a/utils/mail.go b/utils/mail.go index d152b2669..f02e21253 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -73,6 +73,12 @@ func newSMTPClient(conn net.Conn) (*smtp.Client, *model.AppError) { if err = c.Auth(auth); err != nil { return nil, model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error()) } + } else if Cfg.EmailSettings.UseStartTLS { + tlsconfig := &tls.Config{ + InsecureSkipVerify: true, + ServerName: host, + } + c.StartTLS(tlsconfig) } return c, nil } |