sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error message when downstream doesn't authenticate

Browse Source
This commit is contained in:
Simon Ser 2021-12-07 09:40:02 +01:00
parent b6c47a517c
commit aae0fb9f22
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
downstream.go
View File

@ -1236,11 +1236,25 @@ func (dc *downstreamConn) register(ctx context.Context) error {
password := dc.password password := dc.password
dc.password = "" dc.password = ""
if dc.user == nil { if dc.user == nil {
if password == "" {
if dc.caps["sasl"] {
return ircError{&irc.Message{
Command: "FAIL",
Params: []string{"*", "ACCOUNT_REQUIRED", "Authentication required"},
}}
} else {
return ircError{&irc.Message{
Command: irc.ERR_PASSWDMISMATCH,
Params: []string{dc.nick, "Authentication required"},
}}
}
}
if err := dc.authenticate(ctx, dc.rawUsername, password); err != nil { if err := dc.authenticate(ctx, dc.rawUsername, password); err != nil {
dc.logger.Printf("PASS authentication error for user %q: %v", dc.rawUsername, err) dc.logger.Printf("PASS authentication error for user %q: %v", dc.rawUsername, err)
return ircError{&irc.Message{ return ircError{&irc.Message{
Command: irc.ERR_PASSWDMISMATCH, Command: irc.ERR_PASSWDMISMATCH,
Params: []string{"*", authErrorReason(err)}, Params: []string{dc.nick, authErrorReason(err)},
}} }}
} }
} }