debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: Reject multi-message mboxes and deprecate single-message mbox

Browse source 
Previously, we would treat multi-message mboxes as one giant email,
which, besides the obvious incorrect indexing, often led to
out-of-memory errors for archival mboxes.  Now we explicitly reject
multi-message mboxes.  For historical reasons, we retain support for
single-message mboxes, but official deprecate this behavior.
This commit is contained in:
Austin Clements 2012-11-25 01:16:01 -05:00 committed by David Bremner
parent 079f5a138b
commit 610f0e0992
3 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/database.cc
View file

@ -1821,7 +1821,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
date = notmuch_message_file_get_header (message_file, "date"); date = notmuch_message_file_get_header (message_file, "date");
_notmuch_message_set_header_values (message, date, from, subject); _notmuch_message_set_header_values (message, date, from, subject);
_notmuch_message_index_file (message, filename); ret = _notmuch_message_index_file (message, filename);
if (ret)
goto DONE;
} else { } else {
ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
} }

28
lib/index.cc
View file

@ -435,6 +435,9 @@ _notmuch_message_index_file (notmuch_message_t *message,
const char *from, *subject; const char *from, *subject;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
static int initialized = 0; static int initialized = 0;
char from_buf[5];
bool is_mbox = false;
static bool mbox_warning = false;
if (! initialized) { if (! initialized) {
g_mime_init (0); g_mime_init (0);
@ -448,13 +451,38 @@ _notmuch_message_index_file (notmuch_message_t *message,
goto DONE; goto DONE;
} }
/* Is this mbox? */
if (fread (from_buf, sizeof (from_buf), 1, file) == 1 &&
strncmp (from_buf, "From ", 5) == 0)
is_mbox = true;
rewind (file);
/* Evil GMime steals my FILE* here so I won't fclose it. */ /* Evil GMime steals my FILE* here so I won't fclose it. */
stream = g_mime_stream_file_new (file); stream = g_mime_stream_file_new (file);
parser = g_mime_parser_new_with_stream (stream); parser = g_mime_parser_new_with_stream (stream);
g_mime_parser_set_scan_from (parser, is_mbox);
mime_message = g_mime_parser_construct_message (parser); mime_message = g_mime_parser_construct_message (parser);
if (is_mbox) {
if (!g_mime_parser_eos (parser)) {
/* This is a multi-message mbox. */
ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
goto DONE;
}
/* For historical reasons, we support single-message mboxes,
* but this behavior is likely to change in the future, so
* warn. */
if (!mbox_warning) {
mbox_warning = true;
fprintf (stderr, "\
Warning: %s is an mbox containing a single message,\n\
likely caused by misconfigured mail delivery. Support for single-message\n\
mboxes is deprecated and may be removed in the future.\n", filename);
}
}
from = g_mime_message_get_sender (mime_message); from = g_mime_message_get_sender (mime_message);
addresses = internet_address_list_parse_string (from); addresses = internet_address_list_parse_string (from);

8
test/new
View file

@ -163,7 +163,7 @@ rm -rf "${MAIL_DIR}"/two
output=$(NOTMUCH_NEW) output=$(NOTMUCH_NEW)
test_expect_equal "$output" "No new mail. Removed 3 messages." test_expect_equal "$output" "No new mail. Removed 3 messages."
test_begin_subtest "Support single-message mbox" test_begin_subtest "Support single-message mbox (deprecated)"
cat > "${MAIL_DIR}"/mbox_file1 <<EOF cat > "${MAIL_DIR}"/mbox_file1 <<EOF
From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001 From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001
From: Notmuch Test Suite <test_suite@notmuchmail.org> From: Notmuch Test Suite <test_suite@notmuchmail.org>
@ -174,11 +174,13 @@ Body.
EOF EOF
output=$(NOTMUCH_NEW 2>&1) output=$(NOTMUCH_NEW 2>&1)
test_expect_equal "$output" \ test_expect_equal "$output" \
"Added 1 new message to the database." "Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message,
likely caused by misconfigured mail delivery. Support for single-message
mboxes is deprecated and may be removed in the future.
Added 1 new message to the database."
# This test requires that notmuch new has been run at least once. # This test requires that notmuch new has been run at least once.
test_begin_subtest "Skip and report non-mail files" test_begin_subtest "Skip and report non-mail files"
test_subtest_known_broken
generate_message generate_message
mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config
touch "${MAIL_DIR}"/ignored_file touch "${MAIL_DIR}"/ignored_file