diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/mail.go | 10 | ||||
-rw-r--r-- | utils/utils.go | 9 |
2 files changed, 19 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()) } diff --git a/utils/utils.go b/utils/utils.go index f34c82f24..038f6ab61 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -6,6 +6,7 @@ package utils import ( "net" "net/http" + "net/url" "os" "github.com/mattermost/platform/model" @@ -66,3 +67,11 @@ func GetIpAddress(r *http.Request) string { return address } + +func GetSiteName(siteURL string) string { + u, err := url.Parse(siteURL) + if err != nil { + return "" + } + return u.Host +} |