Changeset 275 in code for trunk

Timestamp:

Apr 29, 2020, 5:34:38 PM (5 years ago)

Author:

contact

Message:

Add downstream support for cap-notify

File:

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

trunk/downstream.go

@@ -50 +50 @@
         Params:  []string{"*", "Invalid username or password"},
 }}
+
+// permanentDownstreamCaps is the list of always-supported downstream
+// capabilities.
+var permanentDownstreamCaps = map[string]string{
+        "batch": "",
+        "cap-notify": "",
+        "echo-message": "",
+        "message-tags": "",
+        "sasl": "PLAIN",
+        "server-time": "",
+}
 
 type downstreamConn struct {
@@ -69 +80 @@
         negociatingCaps bool
         capVersion      int
+        supportedCaps   map[string]string
         caps            map[string]bool
 
@@ -79 +91 @@
                 conn: *newConn(srv, netConn, logger),
                 id:   id,
+                supportedCaps: make(map[string]string),
                 caps: make(map[string]bool),
         }
@@ -84 +97 @@
         if host, _, err := net.SplitHostPort(dc.hostname); err == nil {
                 dc.hostname = host
+        }
+        for k, v := range permanentDownstreamCaps {
+                dc.supportedCaps[k] = v
         }
         return dc
@@ -440 +456 @@
                 }
 
-                caps := []string{"message-tags", "server-time", "echo-message", "batch"}
-
-                if dc.capVersion >= 302 {
-                        caps = append(caps, "sasl=PLAIN")
-                } else {
-                        caps = append(caps, "sasl")
+                caps := make([]string, 0, len(dc.supportedCaps))
+                for k, v := range dc.supportedCaps {
+                        if dc.capVersion >= 302 && v != "" {
+                                caps = append(caps, k + "=" + v)
+                        } else {
+                                caps = append(caps, k)
+                        }
                 }
 
@@ -454 +471 @@
                         Params:  []string{replyTo, "LS", strings.Join(caps, " ")},
                 })
+
+                if dc.capVersion >= 302 {
+                        // CAP version 302 implicitly enables cap-notify
+                        dc.caps["cap-notify"] = true
+                }
 
                 if !dc.registered {
@@ -478 +500 @@
                 }
 
+                // TODO: atomically ack/nak the whole capability set
                 caps := strings.Fields(args[0])
                 ack := true
@@ -487 +510 @@
                         }
 
-                        enabled := dc.caps[name]
-                        if enable == enabled {
+                        if enable == dc.caps[name] {
                                 continue
                         }
 
-                        switch name {
-                        case "sasl", "message-tags", "server-time", "echo-message", "batch":
-                                dc.caps[name] = enable
-                        default:
+                        _, ok := dc.supportedCaps[name]
+                        if !ok {
                                 ack = false
-                        }
+                                break
+                        }
+
+                        if name == "cap-notify" && dc.capVersion >= 302 && !enable {
+                                // cap-notify cannot be disabled with CAP version 302
+                                ack = false
+                                break
+                        }
+
+                        dc.caps[name] = enable
                 }
 
@@ -518 +547 @@
         }
         return nil
+}
+
+func (dc *downstreamConn) setSupportedCap(name, value string) {
+        prevValue, hasPrev := dc.supportedCaps[name]
+        changed := !hasPrev || prevValue != value
+        dc.supportedCaps[name] = value
+
+        if !dc.caps["cap-notify"] || !changed {
+                return
+        }
+
+        replyTo := dc.nick
+        if !dc.registered {
+                replyTo = "*"
+        }
+
+        cap := name
+        if value != "" && dc.capVersion >= 302 {
+                cap = name + "=" + value
+        }
+
+        dc.SendMessage(&irc.Message{
+                Prefix:  dc.srv.prefix(),
+                Command: "CAP",
+                Params:  []string{replyTo, "NEW", cap},
+        })
+}
+
+func (dc *downstreamConn) unsetSupportedCap(name string) {
+        _, hasPrev := dc.supportedCaps[name]
+        delete(dc.supportedCaps, name)
+        delete(dc.caps, name)
+
+        if !dc.caps["cap-notify"] || !hasPrev {
+                return
+        }
+
+        replyTo := dc.nick
+        if !dc.registered {
+                replyTo = "*"
+        }
+
+        dc.SendMessage(&irc.Message{
+                Prefix:  dc.srv.prefix(),
+                Command: "CAP",
+                Params:  []string{replyTo, "DEL", name},
+        })
 }