debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/{show,reply}: use repaired form of "Mixed Up" mangled messages

Browse source 
When showing or replying to a message that has been mangled in transit
by an MTA in the "Mixed up" way, notmuch should instead use the
repaired form of the message.

Tracking the repaired GMimeObject for the lifetime of the mime_node so
that it is cleaned up properly is probably the trickiest part of this
patch, but the choices here are based on the idea that the
mime_node_context is the memory manager for the whole mime_node tree
in the first place, so new GMimeObject tree created on-the-fly during
message parsing should be disposed of in the same place.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2019-05-28 14:46:48 -04:00
parent 4b1a8fd183
commit 23bcd00363
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mime-node.c
View file

@ -36,6 +36,9 @@ typedef struct mime_node_context {
GMimeMessage *mime_message; GMimeMessage *mime_message;
_notmuch_message_crypto_t *msg_crypto; _notmuch_message_crypto_t *msg_crypto;
/* repaired/unmangled parts that will need to be cleaned up */
GSList *repaired_parts;
/* Context provided by the caller. */ /* Context provided by the caller. */
_notmuch_crypto_t *crypto; _notmuch_crypto_t *crypto;
} mime_node_context_t; } mime_node_context_t;
@ -52,9 +55,21 @@ _mime_node_context_free (mime_node_context_t *res)
if (res->stream) if (res->stream)
g_object_unref (res->stream); g_object_unref (res->stream);
if (res->repaired_parts)
g_slist_free_full (res->repaired_parts, g_object_unref);
return 0; return 0;
} }
/* keep track of objects that need to be destroyed when the mime node
* context goes away. */
static void
_mime_node_context_track_repaired_part (mime_node_context_t *ctx, GMimeObject *part)
{
if (part)
ctx->repaired_parts = g_slist_prepend (ctx->repaired_parts, part);
}
const _notmuch_message_crypto_t * const _notmuch_message_crypto_t *
mime_node_get_message_crypto_status (mime_node_t *node) mime_node_get_message_crypto_status (mime_node_t *node)
{ {
@ -298,6 +313,13 @@ _mime_node_set_up_part (mime_node_t *node, GMimeObject *part, int numchild)
node->part = part; node->part = part;
node->nchildren = 0; node->nchildren = 0;
} else if (GMIME_IS_MULTIPART (part)) { } else if (GMIME_IS_MULTIPART (part)) {
GMimeObject *repaired_part = _notmuch_repair_mixed_up_mangled (part);
if (repaired_part) {
/* This was likely "Mixed Up" in transit! We replace it
* with the more likely-to-be-correct variant. */
_mime_node_context_track_repaired_part (node->ctx, repaired_part);
part = repaired_part;
}
node->part = part; node->part = part;
node->nchildren = g_mime_multipart_get_count (GMIME_MULTIPART (part)); node->nchildren = g_mime_multipart_get_count (GMIME_MULTIPART (part));
} else if (GMIME_IS_MESSAGE_PART (part)) { } else if (GMIME_IS_MESSAGE_PART (part)) {

2
test/T351-pgpmime-mangling.sh
View file

@ -9,13 +9,11 @@ add_email_corpus mangling
bodytext='["body"][0]["content"][1]["content"]="The password is \"abcd1234!\", please do not tell anyone.\n"' bodytext='["body"][0]["content"][1]["content"]="The password is \"abcd1234!\", please do not tell anyone.\n"'
test_begin_subtest "show 'Mixed-Up' mangled PGP/MIME message correctly" test_begin_subtest "show 'Mixed-Up' mangled PGP/MIME message correctly"
test_subtest_known_broken
output=$(notmuch show --format=json --decrypt=true id:mixed-up@mangling.notmuchmail.org) output=$(notmuch show --format=json --decrypt=true id:mixed-up@mangling.notmuchmail.org)
test_json_nodes <<<"$output" \ test_json_nodes <<<"$output" \
'body:[0][0][0]'"$bodytext" 'body:[0][0][0]'"$bodytext"
test_begin_subtest "reply to 'Mixed-Up' mangled PGP/MIME message correctly" test_begin_subtest "reply to 'Mixed-Up' mangled PGP/MIME message correctly"
test_subtest_known_broken
output=$(notmuch reply --format=json --decrypt=true id:mixed-up@mangling.notmuchmail.org) output=$(notmuch reply --format=json --decrypt=true id:mixed-up@mangling.notmuchmail.org)
test_json_nodes <<<"$output" \ test_json_nodes <<<"$output" \
'body:["original"]'"$bodytext" 'body:["original"]'"$bodytext"