diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-05-09 15:34:30 +0200 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-09 09:34:30 -0400 |
commit | 0df61d161f98183069494cc349d18f01d8783453 (patch) | |
tree | bc98e6767c32b97cd45d860c1469a91062da2a3a /utils/mail.go | |
parent | 622998add12734a6c2b5d79918338a4d6dca7ce6 (diff) | |
download | chat-0df61d161f98183069494cc349d18f01d8783453.tar.gz chat-0df61d161f98183069494cc349d18f01d8783453.tar.bz2 chat-0df61d161f98183069494cc349d18f01d8783453.zip |
implement PLT-6469 - Send HELO request containing domain name to SMTP server (#6322)
Diffstat (limited to 'utils/mail.go')
-rw-r--r-- | utils/mail.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/utils/mail.go b/utils/mail.go index ea62fab12..bfa8f208a 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -49,6 +49,7 @@ func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.Ap l4g.Error(T("utils.mail.new_client.open.error"), err) return nil, model.NewLocAppError("SendMail", "utils.mail.connect_smtp.open_tls.app_error", nil, err.Error()) } + auth := smtp.PlainAuth("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort) if config.EmailSettings.ConnectionSecurity == model.CONN_SECURITY_TLS { if err = c.Auth(auth); err != nil { @@ -135,6 +136,15 @@ func SendMailUsingConfig(to, subject, body string, config *model.Config) *model. defer c.Quit() defer c.Close() + siteName := GetSiteName(*config.ServiceSettings.SiteURL) + if siteName != "" { + err := c.Hello(siteName) + if err != nil { + l4g.Error(T("utils.mail.new_client.helo.error"), err) + return model.NewLocAppError("SendMail", "utils.mail.connect_smtp.helo.app_error", nil, err.Error()) + } + } + if err := c.Mail(fromMail.Address); err != nil { return model.NewLocAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error()) } |