From 61ed0b43cdb3cc83af0d3429c482c2b329e1b415 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 24 Mar 2023 00:16:56 -0700 Subject: [PATCH] Split overlong outgoing messages in erc-sasl * lisp/erc/erc-sasl.el: (erc-server-AUTHENTICATE): Account for client messages exceeding 400 bytes. (Bug#62421.) * test/lisp/erc/erc-scenarios-sasl.el (erc-scenarios-sasl--plain-overlong-split, erc-scenarios-sasl--plain-overlong-aligned): Add tests. * test/lisp/erc/resources/sasl/plain-overlong-aligned.eld: New file. * test/lisp/erc/resources/sasl/plain-overlong-split.eld: New file. --- lisp/erc/erc-sasl.el | 9 ++- test/lisp/erc/erc-scenarios-sasl.el | 64 +++++++++++++++++++ .../resources/sasl/plain-overlong-aligned.eld | 39 +++++++++++ .../resources/sasl/plain-overlong-split.eld | 39 +++++++++++ 4 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 test/lisp/erc/resources/sasl/plain-overlong-aligned.eld create mode 100644 test/lisp/erc/resources/sasl/plain-overlong-split.eld diff --git a/lisp/erc/erc-sasl.el b/lisp/erc/erc-sasl.el index 9265691c2d7..bfe17285a68 100644 --- a/lisp/erc/erc-sasl.el +++ b/lisp/erc/erc-sasl.el @@ -369,9 +369,12 @@ This doesn't solicit or validate a suite of supported mechanisms." data (sasl-step-data step)) (when (string= data "") (setq data nil)) - (when data - (setq data (erc--unfun (base64-encode-string data t)))) - (erc-server-send (concat "AUTHENTICATE " (or data "+")))))) + (setq data (if data (erc--unfun (base64-encode-string data t)) "+")) + (while (not (string-empty-p data)) + (let ((end (min 400 (length data)))) + ;; For now, assume this is unlikely to block + (erc-server-send (concat "AUTHENTICATE " (substring data 0 end))) + (setq data (concat (substring data end) (and (= end 400) "+")))))))) (defun erc-sasl--destroy (proc) (run-hook-with-args 'erc-quit-hook proc) diff --git a/test/lisp/erc/erc-scenarios-sasl.el b/test/lisp/erc/erc-scenarios-sasl.el index 3878237c7d2..ab652d72dd2 100644 --- a/test/lisp/erc/erc-scenarios-sasl.el +++ b/test/lisp/erc/erc-scenarios-sasl.el @@ -51,6 +51,70 @@ ;; Regression "\0\0\0\0 ..." caused by (fillarray passphrase 0) (should (string= erc-sasl-password "password123")))))) +;; The user's unreasonably long password is apportioned into chunks on +;; the way out the door. + +(ert-deftest erc-scenarios-sasl--plain-overlong-split () + :tags '(:expensive-test) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "sasl") + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'plain-overlong-split)) + (port (process-contact dumb-server :service)) + (erc-modules (cons 'sasl erc-modules)) + (erc-sasl-password + (concat + "Est ut beatae omnis ipsam. " + "Quis fugiat deleniti totam qui. " + "Ipsum quam a dolorum tempora velit laborum odit. " + "Et saepe voluptate sed cumque vel. " + "Voluptas sint ab pariatur libero veritatis corrupti. " + "Vero iure omnis ullam. " + "Vero beatae dolores facere fugiat ipsam. " + "Ea est pariatur minima nobis sunt aut ut. " + "Dolores ut laudantium maiores temporibus voluptates. " + "Reiciendis impedit omnis et unde delectus quas ab. " + "Quae eligendi necessitatibus doloribus " + "molestias tempora magnam assumenda.")) + (expect (erc-d-t-make-expecter))) + + (ert-info ("Connect") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "emersion" + :user "emersion" + :full-name "emersion") + (funcall expect 10 "This server is in debug mode") + (erc-cmd-QUIT ""))))) + +(ert-deftest erc-scenarios-sasl--plain-overlong-aligned () + :tags '(:expensive-test) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "sasl") + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'plain-overlong-aligned)) + (port (process-contact dumb-server :service)) + (erc-modules (cons 'sasl erc-modules)) + (erc-sasl-password + (concat + "Est ut beatae omnis ipsam. " + "Quis fugiat deleniti totam qui. " + "Ipsum quam a dolorum tempora velit laborum odit. " + "Et saepe voluptate sed cumque vel. " + "Voluptas sint ab pariatur libero veritatis corrupti. " + "Vero iure omnis ullam. Vero beatae dolores facere fugiat ipsam. " + "Ea est pariatur minima nobis")) + (expect (erc-d-t-make-expecter))) + + (ert-info ("Connect") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "emersion" + :user "emersion" + :full-name "emersion") + (funcall expect 10 "This server is in debug mode") + (erc-cmd-QUIT ""))))) + (ert-deftest erc-scenarios-sasl--external () :tags '(:expensive-test) (erc-scenarios-common-with-cleanup diff --git a/test/lisp/erc/resources/sasl/plain-overlong-aligned.eld b/test/lisp/erc/resources/sasl/plain-overlong-aligned.eld new file mode 100644 index 00000000000..6ed8981be0f --- /dev/null +++ b/test/lisp/erc/resources/sasl/plain-overlong-aligned.eld @@ -0,0 +1,39 @@ +;; -*- mode: lisp-data; -*- +((cap-req 10 "CAP REQ :sasl")) +((nick 10 "NICK emersion")) +((user 10 "USER emersion 0 * :emersion") + (0.0 ":irc.example.org NOTICE * :*** Looking up your hostname...") + (0.0 ":irc.example.org NOTICE * :*** Found your hostname") + (0.0 ":irc.example.org CAP * ACK :sasl")) + +((authenticate-plain 10 "AUTHENTICATE PLAIN") + (0.0 ":irc.example.org AUTHENTICATE +")) +((authenticate-gimme-1 10 "AUTHENTICATE AGVtZXJzaW9uAEVzdCB1dCBiZWF0YWUgb21uaXMgaXBzYW0uIFF1aXMgZnVnaWF0IGRlbGVuaXRpIHRvdGFtIHF1aS4gSXBzdW0gcXVhbSBhIGRvbG9ydW0gdGVtcG9yYSB2ZWxpdCBsYWJvcnVtIG9kaXQuIEV0IHNhZXBlIHZvbHVwdGF0ZSBzZWQgY3VtcXVlIHZlbC4gVm9sdXB0YXMgc2ludCBhYiBwYXJpYXR1ciBsaWJlcm8gdmVyaXRhdGlzIGNvcnJ1cHRpLiBWZXJvIGl1cmUgb21uaXMgdWxsYW0uIFZlcm8gYmVhdGFlIGRvbG9yZXMgZmFjZXJlIGZ1Z2lhdCBpcHNhbS4gRWEgZXN0IHBhcmlhdHVyIG1pbmltYSBub2Jpcw==")) +((authenticate-gimme-2 10 "AUTHENTICATE +") + (0.0 ":irc.example.org 900 * * emersion :You are now logged in as emersion") + (0.0 ":irc.example.org 903 * :Authentication successful")) + +((cap-end 10 "CAP END") + (0.0 ":irc.example.org 001 emersion :Welcome to the ExampleOrg IRC Network emersion") + (0.0 ":irc.example.org 002 emersion :Your host is irc.example.org, running version oragono-2.6.1") + (0.0 ":irc.example.org 003 emersion :This server was created Sat, 17 Jul 2021 09:06:42 UTC") + (0.0 ":irc.example.org 004 emersion irc.example.org oragono-2.6.1 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.example.org 005 emersion AWAYLEN=200 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.0 ":irc.example.org 005 emersion MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=ExampleOrg NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY :are supported by this server") + (0.0 ":irc.example.org 005 emersion draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.example.org 251 emersion :There are 1 users and 0 invisible on 1 server(s)") + (0.0 ":irc.example.org 252 emersion 0 :IRC Operators online") + (0.0 ":irc.example.org 253 emersion 0 :unregistered connections") + (0.0 ":irc.example.org 254 emersion 0 :channels formed") + (0.0 ":irc.example.org 255 emersion :I have 1 clients and 0 servers") + (0.0 ":irc.example.org 265 emersion 1 1 :Current local users 1, max 1") + (0.0 ":irc.example.org 266 emersion 1 1 :Current global users 1, max 1") + (0.0 ":irc.example.org 422 emersion :MOTD File is missing")) + +((mode-user 10 "MODE emersion +i") + (0.0 ":irc.example.org 221 emersion +Zi") + (0.0 ":irc.example.org NOTICE emersion :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((quit 5 "QUIT :\2ERC\2") + (0 ":emersion!~u@yuvqisyu7m7qs.irc QUIT :Quit")) +((drop 1 DROP)) diff --git a/test/lisp/erc/resources/sasl/plain-overlong-split.eld b/test/lisp/erc/resources/sasl/plain-overlong-split.eld new file mode 100644 index 00000000000..3e6870790f3 --- /dev/null +++ b/test/lisp/erc/resources/sasl/plain-overlong-split.eld @@ -0,0 +1,39 @@ +;; -*- mode: lisp-data; -*- +((cap-req 10 "CAP REQ :sasl")) +((nick 10 "NICK emersion")) +((user 10 "USER emersion 0 * :emersion") + (0.0 ":irc.example.org NOTICE * :*** Looking up your hostname...") + (0.0 ":irc.example.org NOTICE * :*** Found your hostname") + (0.0 ":irc.example.org CAP * ACK :sasl")) + +((authenticate-plain 10 "AUTHENTICATE PLAIN") + (0.0 ":irc.example.org AUTHENTICATE +")) +((authenticate-gimme-1 10 "AUTHENTICATE AGVtZXJzaW9uAEVzdCB1dCBiZWF0YWUgb21uaXMgaXBzYW0uIFF1aXMgZnVnaWF0IGRlbGVuaXRpIHRvdGFtIHF1aS4gSXBzdW0gcXVhbSBhIGRvbG9ydW0gdGVtcG9yYSB2ZWxpdCBsYWJvcnVtIG9kaXQuIEV0IHNhZXBlIHZvbHVwdGF0ZSBzZWQgY3VtcXVlIHZlbC4gVm9sdXB0YXMgc2ludCBhYiBwYXJpYXR1ciBsaWJlcm8gdmVyaXRhdGlzIGNvcnJ1cHRpLiBWZXJvIGl1cmUgb21uaXMgdWxsYW0uIFZlcm8gYmVhdGFlIGRvbG9yZXMgZmFjZXJlIGZ1Z2lhdCBpcHNhbS4gRWEgZXN0IHBhcmlhdHVyIG1pbmltYSBub2JpcyBz")) +((authenticate-gimme-2 10 "AUTHENTICATE dW50IGF1dCB1dC4gRG9sb3JlcyB1dCBsYXVkYW50aXVtIG1haW9yZXMgdGVtcG9yaWJ1cyB2b2x1cHRhdGVzLiBSZWljaWVuZGlzIGltcGVkaXQgb21uaXMgZXQgdW5kZSBkZWxlY3R1cyBxdWFzIGFiLiBRdWFlIGVsaWdlbmRpIG5lY2Vzc2l0YXRpYnVzIGRvbG9yaWJ1cyBtb2xlc3RpYXMgdGVtcG9yYSBtYWduYW0gYXNzdW1lbmRhLg==") + (0.0 ":irc.example.org 900 * * emersion :You are now logged in as emersion") + (0.0 ":irc.example.org 903 * :Authentication successful")) + +((cap-end 10 "CAP END") + (0.0 ":irc.example.org 001 emersion :Welcome to the ExampleOrg IRC Network emersion") + (0.0 ":irc.example.org 002 emersion :Your host is irc.example.org, running version oragono-2.6.1") + (0.0 ":irc.example.org 003 emersion :This server was created Sat, 17 Jul 2021 09:06:42 UTC") + (0.0 ":irc.example.org 004 emersion irc.example.org oragono-2.6.1 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.example.org 005 emersion AWAYLEN=200 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.0 ":irc.example.org 005 emersion MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=ExampleOrg NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY :are supported by this server") + (0.0 ":irc.example.org 005 emersion draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.example.org 251 emersion :There are 1 users and 0 invisible on 1 server(s)") + (0.0 ":irc.example.org 252 emersion 0 :IRC Operators online") + (0.0 ":irc.example.org 253 emersion 0 :unregistered connections") + (0.0 ":irc.example.org 254 emersion 0 :channels formed") + (0.0 ":irc.example.org 255 emersion :I have 1 clients and 0 servers") + (0.0 ":irc.example.org 265 emersion 1 1 :Current local users 1, max 1") + (0.0 ":irc.example.org 266 emersion 1 1 :Current global users 1, max 1") + (0.0 ":irc.example.org 422 emersion :MOTD File is missing")) + +((mode-user 10 "MODE emersion +i") + (0.0 ":irc.example.org 221 emersion +Zi") + (0.0 ":irc.example.org NOTICE emersion :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((quit 5 "QUIT :\2ERC\2") + (0 ":emersion!~u@yuvqisyu7m7qs.irc QUIT :Quit")) +((drop 1 DROP)) -- 2.39.2