summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-24 15:58:22 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-24 15:58:22 -0400
commit106cff41952f209f9a4a243f1a504faf5ccc0f66 (patch)
treed8a7fa3d411aa95d23ad312e43eec05c5e4aeaca
parent29c7f61c3a5340ed893b7c2f7c517cd0e14e8a0c (diff)
parent31d1e84411aaa8d986784454057ac02850725781 (diff)
downloadchat-106cff41952f209f9a4a243f1a504faf5ccc0f66.tar.gz
chat-106cff41952f209f9a4a243f1a504faf5ccc0f66.tar.bz2
chat-106cff41952f209f9a4a243f1a504faf5ccc0f66.zip
Merge pull request #452 from CtrlZvi/starttls_auth
Add SMTP auth to STARTTLS connections
-rw-r--r--utils/mail.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/mail.go b/utils/mail.go
index f02e21253..783a2de8c 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -79,6 +79,9 @@ func newSMTPClient(conn net.Conn) (*smtp.Client, *model.AppError) {
ServerName: host,
}
c.StartTLS(tlsconfig)
+ if err = c.Auth(auth); err != nil {
+ return nil, model.NewAppError("SendMail", "Failed to authenticate on SMTP server", err.Error())
+ }
}
return c, nil
}