e0/a90be60bf0fb01e6564150a73a3c2b34af9243

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 9B673431FC4\r
   6         for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 21:58:17 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id fuKyTdpzY0gV for <notmuch@notmuchmail.org>;\r
  16         Mon, 24 Dec 2012 21:58:14 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 34CB5431FB6\r
  20         for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 21:58:14 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7fa86d000001d37-2d-50d940759f1a\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 6B.7C.07479.57049D05; Tue, 25 Dec 2012 00:58:13 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qBP5wCKE008903; \r
  27         Tue, 25 Dec 2012 00:58:12 -0500\r
  28 Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net\r
  29         [76.21.105.205]) (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBP5w7ps011706\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Tue, 25 Dec 2012 00:58:09 -0500 (EST)\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TnNWg-0001Xs-NZ; Tue, 25 Dec 2012 00:58:06 -0500\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH 3/5] dump: Disallow \n in message IDs\r
  40 Date: Tue, 25 Dec 2012 00:57:54 -0500\r
  41 Message-Id: <1356415076-5692-4-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10.4\r
  43 In-Reply-To: <1356415076-5692-1-git-send-email-amdragon@mit.edu>\r
  44 References: <1356415076-5692-1-git-send-email-amdragon@mit.edu>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsUixG6nrlvqcDPAYPlGXosbrd2MFk3TnS1W\r
  47         z+WxuH5zJrMDi8fOWXfZPW7df83u8WzVLWaPLYfeMwewRHHZpKTmZJalFunbJXBlXLp7hLXg\r
  48         oEBFx8Fu9gbGTt4uRk4OCQETiTeHrzNB2GISF+6tZ+ti5OIQEtjHKPGq8QWUs4FRYvO6t1DO\r
  49         RSaJJUffs0A4cxklGpb8AOtnE9CQ2LZ/OSOILSIgLbHz7mxWEJtZIE/i4aOt7CC2sICpxIQd\r
  50         B5lBbBYBVYlnNz+A1fMK2EvM7H/NCHGHokT3swlsIDangIPE3D8rWUBsIaCar3M3s0xg5F/A\r
  51         yLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11AvN7NELzWldBMjKOA4JXl2ML45qHSIUYCDUYmH\r
  52         t2DyjQAh1sSy4srcQ4ySHExKoryv7W4GCPEl5adUZiQWZ8QXleakFh9ilOBgVhLhNeEByvGm\r
  53         JFZWpRblw6SkOViUxHkvp9z0FxJITyxJzU5NLUgtgsnKcHAoSfD+ARkqWJSanlqRlplTgpBm\r
  54         4uAEGc4DNFzSHmR4cUFibnFmOkT+FKOilDjvT5BmAZBERmkeXC8sIbxiFAd6RZhXCKSdB5hM\r
  55         4LpfAQ1mAhocy3cDZHBJIkJKqoHRgZkne96catGvJ3eLMLDmNS1bMVlIrf/8b77iw23md59u\r
  56         stgao6USfGjn8dQVB9IE35vVKv0om3qTy4r5syzfK6sDc59Nmq9xe2XPjpjjUyet7LP8MO0a\r
  57         y86l12cFqt5r0nr56vh5Zu0SkW5vec9XQcxrTHm6bDeLSC5wLQ1i7jzy9Oeba9N+KbEUZyQa\r
  58         ajEXFScCANFaIvbjAgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Tue, 25 Dec 2012 05:58:18 -0000\r
  72 \r
  73 When we switch to using regular Xapian queries in the dump format, \n\r
  74 will cause problems, so we disallow it.  Specially, while Xapian can\r
  75 quote and parse queries containing \n without difficultly, quoted\r
  76 queries containing \n still span multiple lines, which breaks the\r
  77 line-orientedness of the dump format.  Strictly speaking, we could\r
  78 still round-trip these, but it would significantly complicate restore\r
  79 as well as scripts that deal with tag dumps.  This complexity would\r
  80 come at absolutely no benefit: because of the RFC 2822 unfolding\r
  81 rules, no amount of standards negligence can produce a message with a\r
  82 message ID containing a line break (not even Outlook can do it!).\r
  83 \r
  84 Hence, we simply disallow it.\r
  85 ---\r
  86  notmuch-dump.c       |    9 +++++++++\r
  87  test/random-corpus.c |    2 ++\r
  88  2 files changed, 11 insertions(+)\r
  89 \r
  90 diff --git a/notmuch-dump.c b/notmuch-dump.c\r
  91 index d2dad40..29d79da 100644\r
  92 --- a/notmuch-dump.c\r
  93 +++ b/notmuch-dump.c\r
  94 @@ -132,6 +132,15 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])\r
  95         if (output_format == DUMP_FORMAT_SUP) {\r
  96             fputs (")\n", output);\r
  97         } else {\r
  98 +           if (strchr (message_id, '\n')) {\r
  99 +               /* This will produce a line break in the output, which\r
 100 +                * would be difficult to handle in tools.  However,\r
 101 +                * it's also impossible to produce an email containing\r
 102 +                * a line break in a message ID because of unfolding,\r
 103 +                * so we can safely disallow it. */\r
 104 +               fprintf (stderr, "Error: cannot dump message id containing line break: %s\n", message_id);\r
 105 +               return 1;\r
 106 +           }\r
 107             if (hex_encode (notmuch, message_id,\r
 108                             &buffer, &buffer_size) != HEX_SUCCESS) {\r
 109                     fprintf (stderr, "Error: failed to hex-encode msg-id %s\n",\r
 110 diff --git a/test/random-corpus.c b/test/random-corpus.c\r
 111 index f354d4b..d0e3e8f 100644\r
 112 --- a/test/random-corpus.c\r
 113 +++ b/test/random-corpus.c\r
 114 @@ -97,6 +97,8 @@ random_utf8_string (void *ctx, size_t char_count)\r
 115         }\r
 116  \r
 117         randomchar = random_unichar ();\r
 118 +       if (randomchar == '\n')\r
 119 +           randomchar = 'x';\r
 120  \r
 121         written = g_unichar_to_utf8 (randomchar, buf + offset);\r
 122  \r
 123 -- \r
 124 1.7.10.4\r
 125 \r