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

mime-node: track whole-message crypto state while walking the tree

Browse source 
Deliberately populate the message's cryptographic status while walking
the MIME tree from the CLI.

Note that the additional numchild argument added to _mime_node_create
is a passthrough needed to be able to adequately populate the crypto
state object.
This commit is contained in:
Daniel Kahn Gillmor 2019-05-25 14:04:05 -04:00 committed by David Bremner
parent 2c08beb254
commit d187a6993e
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mime-node.c
View file

@ -135,6 +135,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
goto DONE; goto DONE;
} }
mctx->msg_crypto = _notmuch_message_crypto_new (mctx);
mctx->crypto = crypto; mctx->crypto = crypto;
/* Create the root node */ /* Create the root node */
@ -180,6 +182,7 @@ static void
node_verify (mime_node_t *node, GMimeObject *part) node_verify (mime_node_t *node, GMimeObject *part)
{ {
GError *err = NULL; GError *err = NULL;
notmuch_status_t status;
node->verify_attempted = true; node->verify_attempted = true;
node->sig_list = g_mime_multipart_signed_verify node->sig_list = g_mime_multipart_signed_verify
@ -193,6 +196,10 @@ node_verify (mime_node_t *node, GMimeObject *part)
if (err) if (err)
g_error_free (err); g_error_free (err);
status = _notmuch_message_crypto_potential_sig_list (node->ctx->msg_crypto, node->sig_list);
if (status) /* this is a warning, not an error */
fprintf (stderr, "Warning: failed to note signature status: %s.\n", notmuch_status_to_string (status));
} }
/* Decrypt and optionally verify an encrypted mime node */ /* Decrypt and optionally verify an encrypted mime node */
@ -201,6 +208,7 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
{ {
GError *err = NULL; GError *err = NULL;
GMimeDecryptResult *decrypt_result = NULL; GMimeDecryptResult *decrypt_result = NULL;
notmuch_status_t status;
GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
notmuch_message_t *message = NULL; notmuch_message_t *message = NULL;
@ -223,6 +231,9 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
} }
node->decrypt_success = true; node->decrypt_success = true;
status = _notmuch_message_crypto_successful_decryption (node->ctx->msg_crypto);
if (status) /* this is a warning, not an error */
fprintf (stderr, "Warning: failed to note decryption status: %s.\n", notmuch_status_to_string (status));
if (decrypt_result) { if (decrypt_result) {
/* This may be NULL if the part is not signed. */ /* This may be NULL if the part is not signed. */
@ -231,6 +242,9 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
node->verify_attempted = true; node->verify_attempted = true;
g_object_ref (node->sig_list); g_object_ref (node->sig_list);
set_signature_list_destructor (node); set_signature_list_destructor (node);
status = _notmuch_message_crypto_potential_sig_list (node->ctx->msg_crypto, node->sig_list);
if (status) /* this is a warning, not an error */
fprintf (stderr, "Warning: failed to note signature status: %s.\n", notmuch_status_to_string (status));
} }
if (node->ctx->crypto->decrypt == NOTMUCH_DECRYPT_TRUE && message) { if (node->ctx->crypto->decrypt == NOTMUCH_DECRYPT_TRUE && message) {
@ -251,9 +265,10 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part)
} }
static mime_node_t * static mime_node_t *
_mime_node_create (mime_node_t *parent, GMimeObject *part) _mime_node_create (mime_node_t *parent, GMimeObject *part, int numchild)
{ {
mime_node_t *node = talloc_zero (parent, mime_node_t); mime_node_t *node = talloc_zero (parent, mime_node_t);
notmuch_status_t status;
/* Set basic node properties */ /* Set basic node properties */
node->part = part; node->part = part;
@ -305,6 +320,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
} else { } else {
node_verify (node, part); node_verify (node, part);
} }
} else {
status = _notmuch_message_crypto_potential_payload (node->ctx->msg_crypto, part, parent ? parent->part : NULL, numchild);
if (status)
fprintf (stderr, "Warning: failed to record potential crypto payload (%s).\n", notmuch_status_to_string (status));
} }
return node; return node;
@ -332,7 +351,7 @@ mime_node_child (mime_node_t *parent, int child)
INTERNAL_ERROR ("Unexpected GMimeObject type: %s", INTERNAL_ERROR ("Unexpected GMimeObject type: %s",
g_type_name (G_OBJECT_TYPE (parent->part))); g_type_name (G_OBJECT_TYPE (parent->part)));
} }
node = _mime_node_create (parent, sub); node = _mime_node_create (parent, sub, child);
if (child == parent->next_child && parent->next_part_num != -1) { if (child == parent->next_child && parent->next_part_num != -1) {
/* We're traversing in depth-first order. Record the child's /* We're traversing in depth-first order. Record the child's