--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 1A1D2431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 22:17:45 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 ZtnqlEfSeZH5 for <notmuch@notmuchmail.org>;\r
+ Sat, 24 Nov 2012 22:17:44 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id 152CB431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 22:17:43 -0800 (PST)\r
+X-AuditID: 1209190e-b7f756d000000904-78-50b1b8079998\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 77.1B.02308.708B1B05; Sun, 25 Nov 2012 01:17:43 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qAP6G5jY005391; \r
+ Sun, 25 Nov 2012 01:16:05 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAP6G3I1006919\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 25 Nov 2012 01:16:04 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TcVVb-0008HQ-AG; Sun, 25 Nov 2012 01:16:03 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] lib: Reject multi-message mboxes and deprecate\r
+ single-message mbox\r
+Date: Sun, 25 Nov 2012 01:16:01 -0500\r
+Message-Id: <1353824161-31717-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353824161-31717-1-git-send-email-amdragon@mit.edu>\r
+References: <1353824161-31717-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrMu+Y2OAwfr1yhY3WrsZLa7fnMns\r
+ wOTxbNUtZo8th94zBzBFcdmkpOZklqUW6dslcGV0tjWxFqyWr3i7+xRjA+MEyS5GTg4JAROJ\r
+ e41T2SBsMYkL99YD2VwcQgL7GCUubO2CcjYwSky+OZ8RwnnEJDHp7UsWCGcuo8TsW7MZQfrZ\r
+ BDQktu1fDmaLCEhL7Lw7mxXEZhawlLj6tZ0JxBYWCJfo+twDto9FQFXiQOMGsHpeAQeJz6/+\r
+ skDcoSjR/WwCWA2ngKPEwr4DYLYQUM35ycdZJjDyL2BkWMUom5JbpZubmJlTnJqsW5ycmJeX\r
+ WqRrrJebWaKXmlK6iREcTJJ8Oxi/HlQ6xCjAwajEw3sjcWOAEGtiWXFl7iFGSQ4mJVHeqZuB\r
+ QnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4D6wFyvGmJFZWpRblw6SkOViUxHmvpNz0FxJITyxJ\r
+ zU5NLUgtgsnKcHAoSfBu3wrUKFiUmp5akZaZU4KQZuLgBBnOAzR80TaQ4cUFibnFmekQ+VOM\r
+ ilLivBNBEgIgiYzSPLheWLS/YhQHekWYNwGkigeYKOC6XwENZgIa/HT2OpDBJYkIKakGRlHW\r
+ d9YM1+NaTj6OOfjshGXnk1/Bh7VLdyUsyv7zraonbsctrvzuV1/v7JrCt3yCenzVcb5Gu4NT\r
+ 3zYWpN7SZD/OyLs/c5nZ9Xfca2aocRZ+9TQuTpwWfMu54vINLctFD5ZLPhOIXyGvfuWQg7rL\r
+ grDL2ZfX6a1pera/96L+UrGqQ07tHpHM65RYijMSDbWYi4oTAREvBKTRAgAA\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, 25 Nov 2012 06:17:45 -0000\r
+\r
+Previously, we would treat multi-message mboxes as one giant email,\r
+which, besides the obvious incorrect indexing, often led to\r
+out-of-memory errors for archival mboxes. Now we explicitly reject\r
+multi-message mboxes. For historical reasons, we retain support for\r
+single-message mboxes, but official deprecate this behavior.\r
+---\r
+ lib/database.cc | 4 +++-\r
+ lib/index.cc | 28 ++++++++++++++++++++++++++++\r
+ test/new | 8 +++++---\r
+ 3 files changed, 36 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 4df3217..91d4329 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1821,7 +1821,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,\r
+ date = notmuch_message_file_get_header (message_file, "date");\r
+ _notmuch_message_set_header_values (message, date, from, subject);\r
+ \r
+- _notmuch_message_index_file (message, filename);\r
++ ret = _notmuch_message_index_file (message, filename);\r
++ if (ret)\r
++ goto DONE;\r
+ } else {\r
+ ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
+ }\r
+diff --git a/lib/index.cc b/lib/index.cc\r
+index e377732..da0e6ce 100644\r
+--- a/lib/index.cc\r
++++ b/lib/index.cc\r
+@@ -435,6 +435,9 @@ _notmuch_message_index_file (notmuch_message_t *message,\r
+ const char *from, *subject;\r
+ notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;\r
+ static int initialized = 0;\r
++ char from_buf[5];\r
++ bool is_mbox = false;\r
++ static bool mbox_warning = false;\r
+ \r
+ if (! initialized) {\r
+ g_mime_init (0);\r
+@@ -448,13 +451,38 @@ _notmuch_message_index_file (notmuch_message_t *message,\r
+ goto DONE;\r
+ }\r
+ \r
++ /* Is this mbox? */\r
++ if (fread (from_buf, sizeof (from_buf), 1, file) == 1 &&\r
++ strncmp (from_buf, "From ", 5) == 0)\r
++ is_mbox = true;\r
++ rewind (file);\r
++\r
+ /* Evil GMime steals my FILE* here so I won't fclose it. */\r
+ stream = g_mime_stream_file_new (file);\r
+ \r
+ parser = g_mime_parser_new_with_stream (stream);\r
++ g_mime_parser_set_scan_from (parser, is_mbox);\r
+ \r
+ mime_message = g_mime_parser_construct_message (parser);\r
+ \r
++ if (is_mbox) {\r
++ if (!g_mime_parser_eos (parser)) {\r
++ /* This is a multi-message mbox. */\r
++ ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;\r
++ goto DONE;\r
++ }\r
++ /* For historical reasons, we support single-message mboxes,\r
++ * but this behavior is likely to change in the future, so\r
++ * warn. */\r
++ if (!mbox_warning) {\r
++ mbox_warning = true;\r
++ fprintf (stderr, "\\r
++Warning: %s is an mbox containing a single message,\n\\r
++likely caused by misconfigured mail delivery. Support for single-message\n\\r
++mboxes is deprecated and may be removed in the future.\n", filename);\r
++ }\r
++ }\r
++\r
+ from = g_mime_message_get_sender (mime_message);\r
+ addresses = internet_address_list_parse_string (from);\r
+ \r
+diff --git a/test/new b/test/new\r
+index 29f9aff..f562cec 100755\r
+--- a/test/new\r
++++ b/test/new\r
+@@ -163,7 +163,7 @@ rm -rf "${MAIL_DIR}"/two\r
+ output=$(NOTMUCH_NEW)\r
+ test_expect_equal "$output" "No new mail. Removed 3 messages."\r
+ \r
+-test_begin_subtest "Support single-message mbox"\r
++test_begin_subtest "Support single-message mbox (deprecated)"\r
+ cat > "${MAIL_DIR}"/mbox_file1 <<EOF\r
+ From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+@@ -174,11 +174,13 @@ Body.\r
+ EOF\r
+ output=$(NOTMUCH_NEW 2>&1)\r
+ test_expect_equal "$output" \\r
+-"Added 1 new message to the database."\r
++"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message,\r
++likely caused by misconfigured mail delivery. Support for single-message\r
++mboxes is deprecated and may be removed in the future.\r
++Added 1 new message to the database."\r
+ \r
+ # This test requires that notmuch new has been run at least once.\r
+ test_begin_subtest "Skip and report non-mail files"\r
+-test_subtest_known_broken\r
+ generate_message\r
+ mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config\r
+ touch "${MAIL_DIR}"/ignored_file\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff