Changeset 653 in code

Timestamp:

Oct 28, 2021, 9:29:34 AM (4 years ago)

Author:

contact

Message:

Always reply ERR_SASLABORTED on SASL abort

Some clients (Hexchat) always expect AUTHENTICATE * to succeed with
ERR_SASLABORTED even if SASL hasn't been started.

File:

• trunk/downstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -602 +602 @@
 
                 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])
                         switch mech {
@@ -615 +621 @@
                                 }}
                         }
-                } 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] == "+" {
                         resp = nil