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/reply: Ignore PKCS#7 wrapper parts when replying

Browse source 
When composing a reply, no one wants to see this line in the proposed
message:

    Non-text part: application/pkcs7-mime

So we hide it, the same way we hide PGP/MIME cruft.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2020-05-12 18:29:35 -04:00 committed by David Bremner
parent f12fb4d819
commit 1b9f4a9863
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
notmuch-reply.c
View file

@ -65,8 +65,9 @@ format_part_reply (GMimeStream *stream, mime_node_t *node)
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part); GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part);
if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") || if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") ||
g_mime_content_type_is_type (content_type, "application", "pgp-signature")) { g_mime_content_type_is_type (content_type, "application", "pgp-signature") ||
/* Ignore PGP/MIME cruft parts */ g_mime_content_type_is_type (content_type, "application", "pkcs7-mime")) {
/* Ignore PGP/MIME and S/MIME cruft parts */
} else if (g_mime_content_type_is_type (content_type, "text", "*") && } else if (g_mime_content_type_is_type (content_type, "text", "*") &&
! g_mime_content_type_is_type (content_type, "text", "html")) { ! g_mime_content_type_is_type (content_type, "text", "html")) {
show_text_part_content (node->part, stream, NOTMUCH_SHOW_TEXT_PART_REPLY); show_text_part_content (node->part, stream, NOTMUCH_SHOW_TEXT_PART_REPLY);

1
test/T355-smime.sh
View file

@ -156,7 +156,6 @@ OpenPGP Example Corp"
test_expect_equal "$expected" "$output" test_expect_equal "$expected" "$output"
test_begin_subtest "reply to PKCS#7 SignedData message with proper quoting and attribution" test_begin_subtest "reply to PKCS#7 SignedData message with proper quoting and attribution"
test_subtest_known_broken
output=$(notmuch reply id:smime-onepart-signed@protected-headers.example) output=$(notmuch reply id:smime-onepart-signed@protected-headers.example)
expected="From: Notmuch Test Suite <test_suite@notmuchmail.org> expected="From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: The FooCorp contract Subject: Re: The FooCorp contract