Re: [PATCH 2/2] emacs: Use whitelist instead of blacklist for term escaping

diff --git a/3f/94729f32cd652788af5b995716f8529a169c3a b/3f/94729f32cd652788af5b995716f8529a169c3a
new file mode 100644 (file)
index 0000000..89c72cc
--- /dev/null
+++ b/3f/94729f32cd652788af5b995716f8529a169c3a
@@ -0,0 +1,108 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1C440431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 24 Mar 2014 13:39:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id rMBLGB8lg0Uh for <notmuch@notmuchmail.org>;\r
+       Mon, 24 Mar 2014 13:39:02 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 78EA0431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 24 Mar 2014 13:39:02 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 38E191000E5;\r
+       Mon, 24 Mar 2014 22:38:51 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] emacs: Use whitelist instead of blacklist for term\r
+       escaping\r
+In-Reply-To: <1394576394-12816-2-git-send-email-amdragon@mit.edu>\r
+References: <1394576394-12816-1-git-send-email-amdragon@mit.edu>\r
+       <1394576394-12816-2-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.17+156~g1203750 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 24 Mar 2014 22:38:50 +0200\r
+Message-ID: <m2ob0vs55x.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 24 Mar 2014 20:39:10 -0000\r
+\r
+On Wed, Mar 12 2014, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Previously, the term escaper used a blacklist of characters that\r
+> needed escaping.  This blacklist turned out to be somewhat incomplete;\r
+> for example, it did not contain non-whitespace ASCII control\r
+> characters or Unicode "fancy quotes", both of which do require the\r
+> term to be escaped.\r
+>\r
+> Switch to a whitelist of characters that are definitely safe to leave\r
+> unquoted.  This fixes the broken test introduced by the previous\r
+> patch.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+>  emacs/notmuch-lib.el | 5 ++++-\r
+>  test/T310-emacs.sh   | 1 -\r
+>  2 files changed, 4 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 2fefdad..b071b2f 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -426,7 +426,10 @@ user-friendly queries."\r
+>  \r
+>    (save-match-data\r
+>      (if (or (equal term "")\r
+> -        (string-match "[ ()]\\|^\"" term))\r
+> +        ;; To be pessimistic, only pass through terms composed\r
+> +        ;; entirely of ASCII printing characters other than ", (,\r
+> +        ;; and ).\r
+> +        (string-match "[^!#-'*-~]" term))\r
+>      ;; Requires escaping\r
+>      (concat "\"" (replace-regexp-in-string "\"" "\"\"" term t t) "\"")\r
+>        term)))\r
+> diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+> index 6c18bbd..ac966e5 100755\r
+> --- a/test/T310-emacs.sh\r
+> +++ b/test/T310-emacs.sh\r
+> @@ -954,7 +954,6 @@ output=$(notmuch search --output=messages 'tag:search-global-race-tag')\r
+>  test_expect_equal "$output" "id:$gen_msg_id_1"\r
+>  \r
+>  test_begin_subtest "Term escaping"\r
+> -test_subtest_known_broken\r
+>  output=$(test_emacs "(mapcar 'notmuch-escape-boolean-term (list\r
+>      \"\"\r
+>      \"abc\`~\!@#\$%^&*-=_+123\"\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r