From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#36233: 26.2; Tokenization error in rcirc parser Date: Sun, 16 Jun 2019 16:10:08 -0400 Message-ID: <87a7ehxpen.fsf@gmail.com> References: <884c1235-744e-43b2-b379-77b3b3b04a9f@www.fastmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="107499"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Cc: jhj@trnsz.com, 36233@debbugs.gnu.org To: "Jeff Johnson" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jun 16 22:11:35 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hcbV0-000RpX-SM for geb-bug-gnu-emacs@m.gmane.org; Sun, 16 Jun 2019 22:11:35 +0200 Original-Received: from localhost ([::1]:42654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcbUz-0000G4-Ij for geb-bug-gnu-emacs@m.gmane.org; Sun, 16 Jun 2019 16:11:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51308) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcbUa-0000Fo-3I for bug-gnu-emacs@gnu.org; Sun, 16 Jun 2019 16:11:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcbUY-0004g8-Ja for bug-gnu-emacs@gnu.org; Sun, 16 Jun 2019 16:11:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hcbUW-0004eb-8R for bug-gnu-emacs@gnu.org; Sun, 16 Jun 2019 16:11:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hcbUU-0001Tx-Am for bug-gnu-emacs@gnu.org; Sun, 16 Jun 2019 16:11:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 16 Jun 2019 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36233 X-GNU-PR-Package: emacs Original-Received: via spool by 36233-submit@debbugs.gnu.org id=B36233.15607158195631 (code B ref 36233); Sun, 16 Jun 2019 20:11:02 +0000 Original-Received: (at 36233) by debbugs.gnu.org; 16 Jun 2019 20:10:19 +0000 Original-Received: from localhost ([127.0.0.1]:41523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcbTm-0001Sf-KV for submit@debbugs.gnu.org; Sun, 16 Jun 2019 16:10:19 -0400 Original-Received: from mail-io1-f66.google.com ([209.85.166.66]:45826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcbTj-0001SD-PU; Sun, 16 Jun 2019 16:10:16 -0400 Original-Received: by mail-io1-f66.google.com with SMTP id e3so16693975ioc.12; Sun, 16 Jun 2019 13:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=MH9qmFwDvWV9umwvuT1e9mJ/1OVQ6+qeEaDgStRL71o=; b=HwvlMwPovYX0ie6AqcNzcdPAQTrnWsIqY8lW0bfQt0WgbN/qtWYs9abi8wHs78s6IM JYtkP34gi0L2K5x0X+HyLB0FG5xKyK5vy9CzrMKDBpKUUGCUibAQV6Sk6seURzW3qDwH YW3JPhIAYIyROBLPMHa0BtyjqRZ21dG9+avw1Y+9DR7MFJGtx1rZYsNaSI+rrzmn9KYd DPNnojBmfedsDSELTPb02MZa1EJbiq5iCGCsG4dR7UC6jl9oAvKr+kZNubrEcAN082du uIFJ25+l8olCRnmqoiNxsEaZMRDlLf1fxme8Fexh2Siiq3J2MmWKYcM12nMF4w2W3eJS ajbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=MH9qmFwDvWV9umwvuT1e9mJ/1OVQ6+qeEaDgStRL71o=; b=Dq1TeBY7qdnsT+Xc3RM8/NA3FLjDpz6Y4YVrTDLgSZQX3lZOxTp7Z6WQj5ZY+ORiwQ 0KRAfzo4n0rFFxAys+zbf6X3o6utnNqa5dXDVtBjZ3zwBbOHfXfEVU8w0gjml24nTUE1 Axa7XGA7dFumHJQlPlpQUSLx+r0jo5cEHWW7VaDbaUnvySWgkbY9YAZiNDOlQGy9JB9J z2XBfOZzdgNXnFNj20eAVuyRMr/UPsxslMNx58WzT0T8erMyfrV1jXQ564XgxVS71e40 jLDPB6mCchbx535cgVJYRZpxtruRplIChbQgGjQazJup3uxIfxiNwhMIBHIuD+HKdkHM 5g/g== X-Gm-Message-State: APjAAAXzpBwb8TOZY4IUsK/ySOKIvFpn6yZvfP3KURv3eQ03+NDMh+/S eJqmZTZjT2QIOf5WFCErV7kuF5hO X-Google-Smtp-Source: APXvYqxKTZ6hkKI5qZ90E63X5Jsk3qVTo8m2ekuwILNEMx6R7eTrsP/MTQ6NYkTZNeQHhVGiZ3yAHA== X-Received: by 2002:a02:c88e:: with SMTP id m14mr64394207jao.69.1560715810079; Sun, 16 Jun 2019 13:10:10 -0700 (PDT) Original-Received: from minid (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.gmail.com with ESMTPSA id u187sm17894233iod.37.2019.06.16.13.10.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Jun 2019 13:10:09 -0700 (PDT) In-Reply-To: <884c1235-744e-43b2-b379-77b3b3b04a9f@www.fastmail.com> (Jeff Johnson's message of "Sat, 15 Jun 2019 18:01:38 -0400") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:160695 Archived-At: --=-=-= Content-Type: text/plain severity 36233 minor tags 36233 + patch quit "Jeff Johnson" writes: > Example, if the server sends: > "MODE #cchan +kl a:b :999" > > That is somehow parsed by rcirc as: > "MODE +kl a b :999" Yeah, it was using [^:]* to match the middle args. Patch below. I added a test for this case in the patch, although this could probably use some more testing to make sure I haven't broken other cases. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Make-rcirc-parsing-more-RFC2812-compliant-Bug-36233.patch Content-Description: patch >From 9b0cb9e737e3c68f6553f1995983f524bdd92453 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 16 Jun 2019 13:48:56 -0400 Subject: [PATCH] Make rcirc parsing more RFC2812 compliant (Bug#36233) Do continue to allow multiple spaces between arguments, even though that is technically not allowed by the RFC. * lisp/net/rcirc.el (rcirc-process-server-response-1): Fix parsing of arguments which contain colons. * test/lisp/net/rcirc-tests.el: New test. --- lisp/net/rcirc.el | 25 ++++++++++++++------- test/lisp/net/rcirc-tests.el | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 test/lisp/net/rcirc-tests.el diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 8926772b94..d81fa939b9 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -774,22 +774,31 @@ (defun rcirc-process-server-response (process text) (rcirc-process-server-response-1 process text))) (defun rcirc-process-server-response-1 (process text) - (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\) \\(.+\\)$" text) + ;; See https://tools.ietf.org/html/rfc2812#section-2.3.1. We accept + ;; multiple spaces between args, even though the RFC doesn't allow + ;; that. + (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\)" text) (let* ((user (match-string 2 text)) (sender (rcirc-user-nick user)) (cmd (match-string 3 text)) - (args (match-string 4 text)) + (cmd-end (match-end 3)) + (args nil) (handler (intern-soft (concat "rcirc-handler-" cmd)))) - (string-match "^\\([^:]*\\):?\\(.+\\)?$" args) - (let* ((args1 (match-string 1 args)) - (args2 (match-string 2 args)) - (args (delq nil (append (split-string args1 " " t) - (list args2))))) + (cl-loop with i = cmd-end + repeat 14 + while (eql i (string-match " +\\([^: ][^ ]*\\)" text i)) + do (progn (push (match-string 1 text) args) + (setq i (match-end 0))) + finally + (progn (if (eql i (string-match " +:?" text i)) + (push (substring text (match-end 0)) args) + (cl-assert (= i (length text)))) + (cl-callf nreverse args))) (if (not (fboundp handler)) (rcirc-handler-generic process cmd sender args text) (funcall handler process sender args text)) (run-hook-with-args 'rcirc-receive-message-functions - process cmd sender args text))) + process cmd sender args text)) (message "UNHANDLED: %s" text))) (defvar rcirc-responses-no-activity '("305" "306") diff --git a/test/lisp/net/rcirc-tests.el b/test/lisp/net/rcirc-tests.el new file mode 100644 index 0000000000..128cb2e754 --- /dev/null +++ b/test/lisp/net/rcirc-tests.el @@ -0,0 +1,52 @@ +;;; rcirc-tests.el --- Tests for rcirc -*- lexical-binding:t -*- + +;; Copyright (C) 2019 Free Software Foundation, Inc. + +;; This program is free software: you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see `https://www.gnu.org/licenses/'. + +;;; Code: + +(require 'ert) +(require 'rcirc) +(require 'cl-lib) + +(defun rcirc-tests--parse-server-response (cmd text) + (cl-letf* ((received-args nil) + ((symbol-function (intern (concat "rcirc-handler-" cmd))) + (lambda (_process sender args text) + (setq received-args (list sender cmd args text)))) + (rcirc-receive-message-functions nil) + (rcirc-trap-errors-flag nil)) + (rcirc-process-server-response nil text) + received-args)) + +(defmacro rcirc-tests--server-response-parse-should-be + (text expected-sender expected-cmd expected-args) + (declare (debug t)) + (macroexp-let2* nil ((cmd expected-cmd)) + `(should (equal (rcirc-tests--parse-server-response ,cmd ,text) + (list ,expected-sender ,cmd ,expected-args ,text))))) + +(ert-deftest rcirc-process-server-response () + (rcirc-tests--server-response-parse-should-be + "MODE #cchan +kl a:b :999" + nil "MODE" '("#cchan" "+kl" "a:b" "999")) + (rcirc-tests--server-response-parse-should-be + "MODE #cchan +kl a:b 999" + nil "MODE" '("#cchan" "+kl" "a:b" "999")) + (rcirc-tests--server-response-parse-should-be + "MODE #cchan +kl :a:b" + nil "MODE" '("#cchan" "+kl" "a:b"))) + +;;; rcirc-tests.el ends here -- 2.11.0 --=-=-=--