From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 539706DE0C5F for ; Thu, 10 May 2018 22:56:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.019 X-Spam-Level: X-Spam-Status: No, score=-0.019 tagged_above=-999 required=5 tests=[AWL=-0.019, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F-nu8SBYuDJI for ; Thu, 10 May 2018 22:56:13 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 33FD96DE0361 for ; Thu, 10 May 2018 22:56:03 -0700 (PDT) Received: from fifthhorseman.net (unknown [38.109.115.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 1FB49F9AB for ; Fri, 11 May 2018 01:55:59 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id D3BCB2104B; Fri, 11 May 2018 01:55:52 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 06/20] mime-node: track whole-message crypto state while walking the tree Date: Fri, 11 May 2018 01:55:30 -0400 Message-Id: <20180511055544.13676-7-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511055544.13676-1-dkg@fifthhorseman.net> References: <20180511055544.13676-1-dkg@fifthhorseman.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 May 2018 05:56:14 -0000 Deliberately populate the message's cryptographic status while walking the MIME tree from the CLI. --- mime-node.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/mime-node.c b/mime-node.c index cbff95d1..6ecd121d 100644 --- a/mime-node.c +++ b/mime-node.c @@ -49,6 +49,9 @@ _mime_node_context_free (mime_node_context_t *res) if (res->stream) g_object_unref (res->stream); + if (res->msg_crypto) + _notmuch_message_crypto_cleanup (res->msg_crypto); + if (res->file) fclose (res->file); @@ -135,6 +138,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message, goto DONE; } + mctx->msg_crypto = _notmuch_message_crypto_new (mctx); + mctx->crypto = crypto; /* Create the root node */ @@ -181,6 +186,7 @@ node_verify (mime_node_t *node, GMimeObject *part, g_mime_3_unused(GMimeCryptoContext *cryptoctx)) { GError *err = NULL; + notmuch_status_t status; node->verify_attempted = true; node->sig_list = g_mime_multipart_signed_verify @@ -194,6 +200,10 @@ node_verify (mime_node_t *node, GMimeObject *part, if (err) g_error_free (err); + + status = _notmuch_message_crypto_set_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 (GMime 2.6) */ @@ -203,6 +213,7 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, { GError *err = NULL; GMimeDecryptResult *decrypt_result = NULL; + notmuch_status_t status; GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); if (! node->decrypted_child) { @@ -223,6 +234,9 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, } 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) { /* This may be NULL if the part is not signed. */ @@ -231,6 +245,9 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, node->verify_attempted = true; g_object_ref (node->sig_list); set_signature_list_destructor (node); + status = _notmuch_message_crypto_set_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)); } g_object_unref (decrypt_result); } @@ -241,10 +258,11 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, } 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); GMimeCryptoContext *cryptoctx = NULL; + notmuch_status_t status; /* Set basic node properties */ node->part = part; @@ -282,7 +300,6 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) || (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify)) { GMimeContentType *content_type = g_mime_object_get_content_type (part); const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol"); - notmuch_status_t status; status = _notmuch_crypto_get_gmime_ctx_for_protocol (node->ctx->crypto, protocol, &cryptoctx); if (status) /* this is a warning, not an error */ @@ -312,6 +329,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) } else { node_verify (node, part, cryptoctx); } + } 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; @@ -339,7 +360,7 @@ mime_node_child (mime_node_t *parent, int child) INTERNAL_ERROR ("Unexpected GMimeObject type: %s", 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) { /* We're traversing in depth-first order. Record the child's -- 2.17.0