[PATCH] Sanitize "Subject:" and "Author:" fields to not contain control characters...

diff --git a/4f/432e6e153944b3b175f690937f1f40c56fdb77 b/4f/432e6e153944b3b175f690937f1f40c56fdb77
new file mode 100644 (file)
index 0000000..4284836
--- /dev/null
+++ b/4f/432e6e153944b3b175f690937f1f40c56fdb77
@@ -0,0 +1,118 @@
+Return-Path: <flo@chaoflow.net>\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 28FEC429E23\r
+       for <notmuch@notmuchmail.org>; Sun,  8 May 2011 14:15:06 -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 zSBt7oq5+r1O for <notmuch@notmuchmail.org>;\r
+       Sun,  8 May 2011 14:15:04 -0700 (PDT)\r
+Received: from tesla.chaoflow.net (tesla.chaoflow.net [188.40.54.22])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B5499429E22\r
+       for <notmuch@notmuchmail.org>; Sun,  8 May 2011 14:15:03 -0700 (PDT)\r
+Received: from eve.chaoflow.net (host-188-174-146-106.customer.m-online.net\r
+       [188.174.146.106])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       (Authenticated sender: flo@chaoflow.net)\r
+       by tesla.chaoflow.net (Postfix) with ESMTPSA id 409A3C7A2;\r
+       Sun,  8 May 2011 23:15:02 +0200 (CEST)\r
+Received: from eve.fritz.box (eve.chaoflow.net [127.0.0.1])\r
+       by eve.chaoflow.net (Postfix) with ESMTP id 082212AC; Sun,\r
+       8 May 2011 21:15:02 +0000 (Local time zone must be set--see zic manual\r
+       page)\r
+From: Florian Friesdorf <flo@chaoflow.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Sanitize "Subject:" and "Author:" fields to not contain\r
+       control characters in notmuch-search\r
+Date: Sun,  8 May 2011 23:14:33 +0200\r
+Message-Id: <1304889273-24560-2-git-send-email-flo@chaoflow.net>\r
+X-Mailer: git-send-email 1.7.5.1\r
+In-Reply-To: <1304889273-24560-1-git-send-email-flo@chaoflow.net>\r
+References: <87liyjgvyw.fsf@servo.factory.finestructure.net>\r
+       <1304889273-24560-1-git-send-email-flo@chaoflow.net>\r
+X-Virus-Scanned: clamav-milter 0.96.5 at tesla\r
+X-Virus-Status: Clean\r
+Cc: Andreas Amann <a.amann@ucc.ie>\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: Sun, 08 May 2011 21:15:06 -0000\r
+\r
+From: Andreas Amann <a.amann@ucc.ie>\r
+\r
+When a Subject field contained encoded CRLF sequences, these sequences\r
+would appear unfiltered in the output of notmuch search. This confused\r
+the notmuch emacs interface leading to "Unexpected Output"\r
+messages. This is now fixed by replacing all characters with ASCII\r
+code less than 32 with a question mark.\r
+---\r
+ notmuch-search.c |   22 ++++++++++++++++++++--\r
+ 1 files changed, 20 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 5e39511..e7fc41a 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -111,6 +111,20 @@ format_item_id_text (unused (const void *ctx),\r
+     printf ("%s%s", item_type, item_id);\r
+ }\r
+ \r
++static char *\r
++sanitize_string(const void *ctx, const char *str)\r
++{\r
++    char *out, *loop;\r
++\r
++    loop = out = talloc_strdup (ctx, str);\r
++\r
++    for(;*loop;loop++){\r
++      if ((unsigned char)(*loop) < 32)\r
++          *loop = '?';\r
++    }\r
++    return out;\r
++}\r
++\r
+ static void\r
+ format_thread_text (const void *ctx,\r
+                   const char *thread_id,\r
+@@ -120,13 +134,17 @@ format_thread_text (const void *ctx,\r
+                   const char *authors,\r
+                   const char *subject)\r
+ {\r
++    void *ctx_quote = talloc_new (ctx);\r
++\r
+     printf ("thread:%s %12s [%d/%d] %s; %s",\r
+           thread_id,\r
+           notmuch_time_relative_date (ctx, date),\r
+           matched,\r
+           total,\r
+-          authors,\r
+-          subject);\r
++          sanitize_string(ctx_quote, authors),\r
++          sanitize_string(ctx_quote, subject));\r
++\r
++    talloc_free (ctx_quote);\r
+ }\r
+ \r
+ static void\r
+-- \r
+1.7.5.1\r
+\r