pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

#2152 fix SMTP authentication makes invalid assumption on protocol

Browse source
This commit is contained in:
Unknwon 2015-12-11 18:57:45 -05:00
parent 477b4d3b50
commit 76bdbcc969
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
models/login.go
View file

@ -10,6 +10,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/smtp" "net/smtp"
"net/textproto"
"strings" "strings"
"time" "time"
@ -371,7 +372,11 @@ func LoginUserSMTPSource(u *User, name, passwd string, sourceID int64, cfg *SMTP
} }
if err := SMTPAuth(auth, cfg); err != nil { if err := SMTPAuth(auth, cfg); err != nil {
if strings.Contains(err.Error(), "Username and Password not accepted") { // Check standard error format first,
// then fallback to worse case.
tperr, ok := err.(*textproto.Error)
if (ok && tperr.Code == 535) ||
strings.Contains(err.Error(), "Username and Password not accepted") {
return nil, ErrUserNotExist{0, name} return nil, ErrUserNotExist{0, name}
} }
return nil, err return nil, err