Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-28 04:36:11 +01:00

#2152 fix SMTP authentication makes invalid assumption on protocol

This commit is contained in:
Unknwon 2015-12-11 18:57:45 -05:00
parent 477b4d3b50
commit 76bdbcc969

View file

@ -10,6 +10,7 @@ import (
"errors"
"fmt"
"net/smtp"
"net/textproto"
"strings"
"time"
@ -371,7 +372,11 @@ func LoginUserSMTPSource(u *User, name, passwd string, sourceID int64, cfg *SMTP
}
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, err