Changeset 761 in code

Timestamp:

Dec 10, 2021, 9:46:41 AM (3 years ago)

Author:

contact

Message:

Handle upstream multi-line SASL

References: ​https://todo.sr.ht/~emersion/soju/173

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• irc.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/downstream.go

@@ -984 +984 @@
                 dc.sasl.pendingResp.WriteString(chunk)
 
-                if len(chunk) == 400 {
+                if len(chunk) == maxSASLLength {
                         return nil, nil // Multi-line response, wait for the next command
                 }

trunk/irc.go

@@ -26 +26 @@
         maxMessageLength = 512
         maxMessageParams = 15
+        maxSASLLength    = 400
 )
 

trunk/upstream.go

@@ -620 +620 @@
                 }
 
-                // TODO: send response in multiple chunks if >= 400 bytes
-                var respStr = "+"
-                if len(resp) != 0 {
-                        respStr = base64.StdEncoding.EncodeToString(resp)
-                }
-
-                uc.SendMessage(ctx, &irc.Message{
-                        Command: "AUTHENTICATE",
-                        Params:  []string{respStr},
-                })
+                // <= instead of < because we need to send a final empty response if
+                // the last chunk is exactly 400 bytes long
+                for i := 0; i <= len(resp); i += maxSASLLength {
+                        j := i + maxSASLLength
+                        if j > len(resp) {
+                                j = len(resp)
+                        }
+
+                        chunk := resp[i:j]
+
+                        var respStr = "+"
+                        if len(chunk) != 0 {
+                                respStr = base64.StdEncoding.EncodeToString(chunk)
+                        }
+
+                        uc.SendMessage(ctx, &irc.Message{
+                                Command: "AUTHENTICATE",
+                                Params:  []string{respStr},
+                        })
+                }
         case irc.RPL_LOGGEDIN:
                 if err := parseMessageParams(msg, nil, nil, &uc.account); err != nil {