Changeset 760 in code

Timestamp:

Dec 9, 2021, 10:21:08 PM (3 years ago)

Author:

contact

Message:

Add support for downstream multi-line AUTHENTICATE commands

Useful for long passwords.

File:

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

trunk/downstream.go

@@ -2 +2 @@
 
 import (
+        "bytes"
         "context"
         "crypto/tls"
@@ -276 +277 @@
         server                       sasl.Server
         plainUsername, plainPassword string
+        pendingResp                  bytes.Buffer
 }
 
@@ -967 +969 @@
                 dc.sasl = &downstreamSASL{server: server}
         } else {
-                // TODO: multi-line messages
-                if msg.Params[0] == "+" {
-                        resp = nil
-                } else if resp, err = base64.StdEncoding.DecodeString(msg.Params[0]); err != nil {
+                chunk := msg.Params[0]
+                if chunk == "+" {
+                        chunk = ""
+                }
+
+                if dc.sasl.pendingResp.Len()+len(chunk) > 10*1024 {
+                        return nil, ircError{&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.ERR_SASLFAIL,
+                                Params:  []string{dc.nick, "Response too long"},
+                        }}
+                }
+
+                dc.sasl.pendingResp.WriteString(chunk)
+
+                if len(chunk) == 400 {
+                        return nil, nil // Multi-line response, wait for the next command
+                }
+
+                resp, err = base64.StdEncoding.DecodeString(dc.sasl.pendingResp.String())
+                if err != nil {
                         return nil, ircError{&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -977 +996 @@
                         }}
                 }
+
+                dc.sasl.pendingResp.Reset()
         }