coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #762 from phsmit/crammd5 

Crammd5
This commit is contained in:
无闻 2014-12-18 16:49:11 -05:00
parent bb267e30b6 eca42bcb44
commit d01e7b0173
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/mailer/mailer.go
View File

@ -108,16 +108,23 @@ func sendMail(settings *setting.Mailer, from string, recipients []string, msgCon
} }
} }
auth_available, _ := client.Extension("AUTH") auth_available, options := client.Extension("AUTH")
// Possible improvement: only plain authentication is now available.
// Maybe in future CRAM MD5 as well?
if auth_available && len(settings.User) > 0 { if auth_available && len(settings.User) > 0 {
auth := smtp.PlainAuth("", settings.User, settings.Passwd, host) var auth smtp.Auth
if strings.Contains(options, "CRAM-MD5") {
auth = smtp.CRAMMD5Auth(settings.User, settings.Passwd)
} else if strings.Contains(options, "PLAIN") {
auth = smtp.PlainAuth("", settings.User, settings.Passwd, host)
}
if auth != nil {
if err = client.Auth(auth); err != nil { if err = client.Auth(auth); err != nil {
return err return err
} }
} }
}
if err = client.Mail(from); err != nil { if err = client.Mail(from); err != nil {
return err return err