Changeset 725 in code for trunk

Timestamp:

Nov 21, 2021, 3:28:38 PM (4 years ago)

Author:

contact

Message:

Remove sasl cap after registration if network doesn't support it

This will stop clients from trying to issue AUTHENTICATE requests
after connection registration.

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• upstream.go (modified) (1 diff)

trunk/downstream.go

@@ -191 +191 @@
         "invite-notify": "",
         "message-tags":  "",
-        "sasl":          "PLAIN",
         "server-time":   "",
         "setname":       "",
@@ -300 +299 @@
                 dc.supportedCaps[k] = v
         }
+        dc.supportedCaps["sasl"] = "PLAIN"
         // TODO: this is racy, we should only enable chathistory after
         // authentication and then check that user.msgStore implements
@@ -1037 +1037 @@
                         dc.unsetSupportedCap(cap)
                 }
+        }
+
+        if uc := dc.upstream(); uc != nil && uc.supportsSASL("PLAIN") {
+                dc.setSupportedCap("sasl", "PLAIN")
+        } else if dc.network != nil {
+                dc.unsetSupportedCap("sasl")
         }
 

trunk/upstream.go

@@ -1732 +1732 @@
 }
 
+func (uc *upstreamConn) supportsSASL(mech string) bool {
+        v, ok := uc.supportedCaps["sasl"]
+        if !ok {
+                return false
+        }
+
+        if v == "" {
+                return true
+        }
+
+        mechanisms := strings.Split(v, ",")
+        for _, mech := range mechanisms {
+                if strings.EqualFold(mech, mech) {
+                        return true
+                }
+        }
+        return false
+}
+
 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
+        return uc.supportsSASL(uc.network.SASL.Mechanism)
 }