Changeset 590 in code

Timestamp:

Sep 19, 2021, 2:50:47 PM (4 years ago)

Author:

hubert

Message:

Allow CAP negotiation to happen with CAP REQ

See ​https://ircv3.net/specs/extensions/capability-negotiation

Upon receiving either a CAP LS or CAP REQ command during connection
registration, the server MUST not complete registration until the
client sends a CAP END command to indicate that capability negotiation
has ended.

This commit should prevent soju from trying to authenticate the user
prior to having received AUTHENTICATE messages, when the client eagerly
requests capabilities with CAP REQ seeing available capabilities
beforehand with CAP LS.

File:

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

trunk/downstream.go

@@ -186 +186 @@
         network     *network // can be nil
 
-        negociatingCaps bool
+        negotiatingCaps bool
         capVersion      int
         supportedCaps   map[string]string
@@ -718 +718 @@
                 return newUnknownCommandError(msg.Command)
         }
-        if dc.rawUsername != "" && dc.nick != "" && !dc.negociatingCaps {
+        if dc.rawUsername != "" && dc.nick != "" && !dc.negotiatingCaps {
                 return dc.register()
         }
@@ -771 +771 @@
 
                 if !dc.registered {
-                        dc.negociatingCaps = true
+                        dc.negotiatingCaps = true
                 }
         case "LIST":
@@ -833 +833 @@
                         Params:  []string{replyTo, reply, args[0]},
                 })
+
+                if !dc.registered {
+                        dc.negotiatingCaps = true
+                }
         case "END":
-                dc.negociatingCaps = false
+                dc.negotiatingCaps = false
         default:
                 return ircError{&irc.Message{