IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "workaround for go smtp bug (#7620)" (#7866)

Browse Source 
This reverts commit 8966452d11.
This commit is contained in:
Chris
2017-11-21 13:11:04 -06:00
committed by Christopher Speller
parent 816a30397d
commit a6694058a7
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/mail.go
View File

@@ -7,13 +7,14 @@ import (
"crypto/tls"
"mime"
"net"
"net/http"
"net/mail"
"net/smtp"
"time"
"gopkg.in/gomail.v2"
"net/http"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/html2text"
"github.com/mattermost/mattermost-server/model"
@@ -47,20 +48,6 @@ func connectToSMTPServer(config *model.Config) (net.Conn, *model.AppError) {
return conn, nil
}
// TODO: Remove once this bug is fixed: https://github.com/golang/go/issues/22166
type plainAuthOverTLSConn struct {
smtp.Auth
}
func PlainAuthOverTLSConn(identity, username, password, host string) smtp.Auth {
return &plainAuthOverTLSConn{smtp.PlainAuth(identity, username, password, host)}
}
func (a *plainAuthOverTLSConn) Start(server *smtp.ServerInfo) (string, []byte, error) {
server.TLS = true
return a.Auth.Start(server)
}
func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.AppError) {
c, err := smtp.NewClient(conn, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
if err != nil {
@@ -86,12 +73,7 @@ func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.Ap
}
if *config.EmailSettings.EnableSMTPAuth {
var auth smtp.Auth
if _, ok := conn.(*tls.Conn); ok {
auth = PlainAuthOverTLSConn("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
} else {
auth = smtp.PlainAuth("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
}
auth := smtp.PlainAuth("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort)
if err = c.Auth(auth); err != nil {
return nil, model.NewAppError("SendMail", "utils.mail.new_client.auth.app_error", nil, err.Error(), http.StatusInternalServerError)