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

Always reply ERR_SASLABORTED on SASL abort

Browse Source 
Some clients (Hexchat) always expect AUTHENTICATE * to succeed with
ERR_SASLABORTED even if SASL hasn't been started.
This commit is contained in:
Simon Ser 2021-10-28 11:29:34 +02:00
parent 9ec1f1a5b0
commit de38d93085
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
downstream.go
View File

@ -601,7 +601,13 @@ func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
} }
var resp []byte var resp []byte
if dc.saslServer == nil { if msg.Params[0] == "*" {
dc.saslServer = nil
return ircError{&irc.Message{
Command: irc.ERR_SASLABORTED,
Params: []string{"*", "SASL authentication aborted"},
}}
} else if dc.saslServer == nil {
mech := strings.ToUpper(msg.Params[0]) mech := strings.ToUpper(msg.Params[0])
switch mech { switch mech {
case "PLAIN": case "PLAIN":
@ -614,12 +620,6 @@ func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
Params: []string{"*", fmt.Sprintf("Unsupported SASL mechanism %q", mech)}, Params: []string{"*", fmt.Sprintf("Unsupported SASL mechanism %q", mech)},
}} }}
} }
} else if msg.Params[0] == "*" {
dc.saslServer = nil
return ircError{&irc.Message{
Command: irc.ERR_SASLABORTED,
Params: []string{"*", "SASL authentication aborted"},
}}
} else if msg.Params[0] == "+" { } else if msg.Params[0] == "+" {
resp = nil resp = nil
} else { } else {