Changeset 282 in code for trunk

Timestamp:

Apr 30, 2020, 2:10:39 PM (5 years ago)

Author:

contact

Message:

Introduce permanentUpstreamCaps

File:

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

trunk/upstream.go

@@ -15 +15 @@
         "gopkg.in/irc.v3"
 )
+
+// permanentUpstreamCaps is the static list of upstream capabilities always
+// requested when supported.
+var permanentUpstreamCaps = map[string]bool{
+        "away-notify":      true,
+        "batch":            true,
+        "labeled-response": true,
+        "message-tags":     true,
+        "server-time":      true,
+}
 
 type upstreamChannel struct {
@@ -1210 +1220 @@
 func (uc *upstreamConn) requestCaps() {
         var requestCaps []string
-        for _, c := range []string{"message-tags", "batch", "labeled-response", "server-time", "away-notify"} {
+        for c := range permanentUpstreamCaps {
                 if _, ok := uc.supportedCaps[c]; ok && !uc.caps[c] {
                         requestCaps = append(requestCaps, c)
@@ -1220 +1230 @@
         }
 
-        if len(requestCaps) > 0 {
+        if len(requestCaps) == 0 {
+                return
+        }
+
+        uc.SendMessage(&irc.Message{
+                Command: "CAP",
+                Params:  []string{"REQ", strings.Join(requestCaps, " ")},
+        })
+}
+
+func (uc *upstreamConn) requestSASL() bool {
+        if uc.network.SASL.Mechanism == "" {
+                return false
+        }
+
+        v, ok := uc.supportedCaps["sasl"]
+        if !ok {
+                return false
+        }
+        if v != "" {
+                mechanisms := strings.Split(v, ",")
+                found := false
+                for _, mech := range mechanisms {
+                        if strings.EqualFold(mech, uc.network.SASL.Mechanism) {
+                                found = true
+                                break
+                        }
+                }
+                if !found {
+                        return false
+                }
+        }
+
+        return true
+}
+
+func (uc *upstreamConn) handleCapAck(name string, ok bool) error {
+        uc.caps[name] = ok
+
+        switch name {
+        case "sasl":
+                if !ok {
+                        uc.logger.Printf("server refused to acknowledge the SASL capability")
+                        return nil
+                }
+
+                auth := &uc.network.SASL
+                switch auth.Mechanism {
+                case "PLAIN":
+                        uc.logger.Printf("starting SASL PLAIN authentication with username %q", auth.Plain.Username)
+                        uc.saslClient = sasl.NewPlainClient("", auth.Plain.Username, auth.Plain.Password)
+                default:
+                        return fmt.Errorf("unsupported SASL mechanism %q", name)
+                }
+
                 uc.SendMessage(&irc.Message{
-                        Command: "CAP",
-                        Params:  []string{"REQ", strings.Join(requestCaps, " ")},
-                })
-        }
+                        Command: "AUTHENTICATE",
+                        Params:  []string{auth.Mechanism},
+                })
+        default:
+                if permanentUpstreamCaps[name] {
+                        break
+                }
+                uc.logger.Printf("received CAP ACK/NAK for a cap we don't support: %v", name)
+        }
+        return nil
 }
 
@@ -1291 +1361 @@
 }
 
-func (uc *upstreamConn) requestSASL() bool {
-        if uc.network.SASL.Mechanism == "" {
-                return false
-        }
-
-        v, ok := uc.supportedCaps["sasl"]
-        if !ok {
-                return false
-        }
-        if v != "" {
-                mechanisms := strings.Split(v, ",")
-                found := false
-                for _, mech := range mechanisms {
-                        if strings.EqualFold(mech, uc.network.SASL.Mechanism) {
-                                found = true
-                                break
-                        }
-                }
-                if !found {
-                        return false
-                }
-        }
-
-        return true
-}
-
-func (uc *upstreamConn) handleCapAck(name string, ok bool) error {
-        uc.caps[name] = ok
-
-        switch name {
-        case "sasl":
-                if !ok {
-                        uc.logger.Printf("server refused to acknowledge the SASL capability")
-                        return nil
-                }
-
-                auth := &uc.network.SASL
-                switch auth.Mechanism {
-                case "PLAIN":
-                        uc.logger.Printf("starting SASL PLAIN authentication with username %q", auth.Plain.Username)
-                        uc.saslClient = sasl.NewPlainClient("", auth.Plain.Username, auth.Plain.Password)
-                default:
-                        return fmt.Errorf("unsupported SASL mechanism %q", name)
-                }
-
-                uc.SendMessage(&irc.Message{
-                        Command: "AUTHENTICATE",
-                        Params:  []string{auth.Mechanism},
-                })
-        case "message-tags", "labeled-response", "away-notify", "batch", "server-time":
-                // Nothing to do
-        default:
-                uc.logger.Printf("received CAP ACK/NAK for a cap we don't support: %v", name)
-        }
-        return nil
-}
-
 func (uc *upstreamConn) readMessages(ch chan<- event) error {
         for {