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

cli: include wrapped part of PKCS#7 SignedData in the MIME tree

Browse source 
Unwrap a PKCS#7 SignedData part unconditionally when the cli is
traversing the MIME tree, and return it as a "child" of what would
otherwise be a leaf in the tree.

Unfortunately, this also breaks the JSON output.  We will fix that
next.

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

23
mime-node.c
View file

@ -220,8 +220,17 @@ node_verify (mime_node_t *node, GMimeObject *part)
notmuch_status_t status; notmuch_status_t status;
node->verify_attempted = true; node->verify_attempted = true;
node->sig_list = g_mime_multipart_signed_verify ( if (GMIME_IS_APPLICATION_PKCS7_MIME (part))
GMIME_MULTIPART_SIGNED (part), GMIME_VERIFY_NONE, &err); node->sig_list = g_mime_application_pkcs7_mime_verify (
GMIME_APPLICATION_PKCS7_MIME (part), GMIME_VERIFY_NONE, &node->unwrapped_child, &err);
else
node->sig_list = g_mime_multipart_signed_verify (
GMIME_MULTIPART_SIGNED (part), GMIME_VERIFY_NONE, &err);
if (node->unwrapped_child) {
node->nchildren = 1;
set_unwrapped_child_destructor (node);
}
if (node->sig_list) if (node->sig_list)
set_signature_list_destructor (node); set_signature_list_destructor (node);
@ -376,6 +385,12 @@ _mime_node_set_up_part (mime_node_t *node, GMimeObject *part, int numchild)
} else { } else {
node_verify (node, part); node_verify (node, part);
} }
} else if (GMIME_IS_APPLICATION_PKCS7_MIME (part) &&
GMIME_SECURE_MIME_TYPE_SIGNED_DATA == g_mime_application_pkcs7_mime_get_smime_type (GMIME_APPLICATION_PKCS7_MIME (part))) {
/* If node->ctx->crypto->verify is false, it would be better
* to just unwrap (instead of verifying), but
* https://github.com/jstedfast/gmime/issues/67 */
node_verify (node, part);
} else { } else {
if (_notmuch_message_crypto_potential_payload (node->ctx->msg_crypto, part, node->parent ? node->parent->part : NULL, numchild) && if (_notmuch_message_crypto_potential_payload (node->ctx->msg_crypto, part, node->parent ? node->parent->part : NULL, numchild) &&
node->ctx->msg_crypto->decryption_status == NOTMUCH_MESSAGE_DECRYPTED_FULL) { node->ctx->msg_crypto->decryption_status == NOTMUCH_MESSAGE_DECRYPTED_FULL) {
@ -409,6 +424,10 @@ mime_node_child (mime_node_t *parent, int child)
GMIME_MULTIPART (parent->part), child); GMIME_MULTIPART (parent->part), child);
} else if (GMIME_IS_MESSAGE (parent->part)) { } else if (GMIME_IS_MESSAGE (parent->part)) {
sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part)); sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part));
} else if (GMIME_IS_APPLICATION_PKCS7_MIME (parent->part) &&
parent->unwrapped_child &&
child == 0) {
sub = parent->unwrapped_child;
} else { } else {
/* This should have been caught by _mime_node_set_up_part */ /* This should have been caught by _mime_node_set_up_part */
INTERNAL_ERROR ("Unexpected GMimeObject type: %s", INTERNAL_ERROR ("Unexpected GMimeObject type: %s",

2
test/T355-smime.sh
View file

@ -142,7 +142,6 @@ expected='#notmuch-dump batch-tag:3 config,properties,tags
test_expect_equal "$expected" "$output" test_expect_equal "$expected" "$output"
test_begin_subtest "show contents of PKCS#7 SignedData message" test_begin_subtest "show contents of PKCS#7 SignedData message"
test_subtest_known_broken
output=$(notmuch show --format=raw --part=2 id:smime-onepart-signed@protected-headers.example) output=$(notmuch show --format=raw --part=2 id:smime-onepart-signed@protected-headers.example)
whitespace=' ' whitespace=' '
expected="Bob, we need to cancel this contract. expected="Bob, we need to cancel this contract.
@ -178,6 +177,7 @@ On Tue, 26 Nov 2019 20:11:29 -0400, Alice Lovelace <alice@smime.example> wrote:
test_expect_equal "$expected" "$output" test_expect_equal "$expected" "$output"
test_begin_subtest "show PKCS#7 SignedData outputs valid JSON" test_begin_subtest "show PKCS#7 SignedData outputs valid JSON"
test_subtest_known_broken
output=$(notmuch show --format=json id:smime-onepart-signed@protected-headers.example) output=$(notmuch show --format=json id:smime-onepart-signed@protected-headers.example)
test_valid_json "$output" test_valid_json "$output"