X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=mime-node.c;h=e33336bbb32e8ed11cdc58f88369e675652bd250;hp=24d73afa84589f9ee49c50b9a82225fd9b76865b;hb=6682b4e686b7972883626c9b0f941ae4bf02dedb;hpb=09fa51303c6ba5adfd2431d87663523aa799288b diff --git a/mime-node.c b/mime-node.c index 24d73afa..e33336bb 100644 --- a/mime-node.c +++ b/mime-node.c @@ -21,19 +21,22 @@ * Austin Clements */ +#include +#include +#include + #include "notmuch-client.h" /* Context that gets inherited from the root node. */ typedef struct mime_node_context { /* Per-message resources. These are allocated internally and must * be destroyed. */ - FILE *file; GMimeStream *stream; GMimeParser *parser; GMimeMessage *mime_message; /* Context provided by the caller. */ - notmuch_crypto_t *crypto; + _notmuch_crypto_t *crypto; } mime_node_context_t; static int @@ -48,20 +51,18 @@ _mime_node_context_free (mime_node_context_t *res) if (res->stream) g_object_unref (res->stream); - if (res->file) - fclose (res->file); - return 0; } notmuch_status_t mime_node_open (const void *ctx, notmuch_message_t *message, - notmuch_crypto_t *crypto, mime_node_t **root_out) + _notmuch_crypto_t *crypto, mime_node_t **root_out) { const char *filename = notmuch_message_get_filename (message); mime_node_context_t *mctx; mime_node_t *root; notmuch_status_t status; + int fd; root = talloc_zero (ctx, mime_node_t); if (root == NULL) { @@ -80,8 +81,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message, talloc_set_destructor (mctx, _mime_node_context_free); /* Fast path */ - mctx->file = fopen (filename, "r"); - if (! mctx->file) { + fd = open (filename, O_RDONLY); + if (fd == -1) { /* Slow path - for some reason the first file in the list is * not available anymore. This is clearly a problem in the * database, but we are not going to let this problem be a @@ -92,13 +93,13 @@ mime_node_open (const void *ctx, notmuch_message_t *message, notmuch_filenames_move_to_next (filenames)) { filename = notmuch_filenames_get (filenames); - mctx->file = fopen (filename, "r"); - if (mctx->file) + fd = open (filename, O_RDONLY); + if (fd != -1) break; } talloc_free (filenames); - if (! mctx->file) { + if (fd == -1) { /* Give up */ fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno)); status = NOTMUCH_STATUS_FILE_ERROR; @@ -106,13 +107,12 @@ mime_node_open (const void *ctx, notmuch_message_t *message, } } - mctx->stream = g_mime_stream_file_new (mctx->file); + mctx->stream = g_mime_stream_gzfile_new (fd); if (!mctx->stream) { fprintf (stderr, "Out of memory.\n"); status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; } - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (mctx->stream), FALSE); mctx->parser = g_mime_parser_new_with_stream (mctx->stream); if (!mctx->parser) { @@ -121,7 +121,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message, goto DONE; } - mctx->mime_message = g_mime_parser_construct_message (mctx->parser); + mctx->mime_message = g_mime_parser_construct_message (mctx->parser, NULL); if (!mctx->mime_message) { fprintf (stderr, "Failed to parse %s\n", filename); status = NOTMUCH_STATUS_FILE_ERROR; @@ -149,7 +149,7 @@ DONE: return status; } -/* Signature list destructor (GMime 2.6) */ +/* Signature list destructor */ static int _signature_list_free (GMimeSignatureList **proxy) { @@ -157,7 +157,7 @@ _signature_list_free (GMimeSignatureList **proxy) return 0; } -/* Set up signature list destructor (GMime 2.6) */ +/* Set up signature list destructor */ static void set_signature_list_destructor (mime_node_t *node) { @@ -168,16 +168,15 @@ set_signature_list_destructor (mime_node_t *node) } } -/* Verify a signed mime node (GMime 2.6) */ +/* Verify a signed mime node */ static void -node_verify (mime_node_t *node, GMimeObject *part, - g_mime_3_unused(notmuch_crypto_context_t *cryptoctx)) +node_verify (mime_node_t *node, GMimeObject *part) { GError *err = NULL; - node->verify_attempted = TRUE; + node->verify_attempted = true; node->sig_list = g_mime_multipart_signed_verify - (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err); + (GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err); if (node->sig_list) set_signature_list_destructor (node); @@ -189,34 +188,55 @@ node_verify (mime_node_t *node, GMimeObject *part, g_error_free (err); } -/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */ +/* Decrypt and optionally verify an encrypted mime node */ static void -node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, - g_mime_3_unused(notmuch_crypto_context_t *cryptoctx)) +node_decrypt_and_verify (mime_node_t *node, GMimeObject *part) { GError *err = NULL; GMimeDecryptResult *decrypt_result = NULL; GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); + notmuch_message_t *message = NULL; - node->decrypt_attempted = TRUE; - node->decrypted_child = g_mime_multipart_encrypted_decrypt - (encrypteddata, cryptoctx, &decrypt_result, &err); + if (! node->decrypted_child) { + for (mime_node_t *parent = node; parent; parent = parent->parent) + if (parent->envelope_file) { + message = parent->envelope_file; + break; + } + + node->decrypted_child = _notmuch_crypto_decrypt (&node->decrypt_attempted, + node->ctx->crypto->decrypt, + message, + encrypteddata, &decrypt_result, &err); + } if (! node->decrypted_child) { fprintf (stderr, "Failed to decrypt part: %s\n", err ? err->message : "no error explanation given"); goto DONE; } - node->decrypt_success = TRUE; - node->verify_attempted = TRUE; + node->decrypt_success = true; - /* This may be NULL if the part is not signed. */ - node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result); - if (node->sig_list) { - g_object_ref (node->sig_list); - set_signature_list_destructor (node); + if (decrypt_result) { + /* This may be NULL if the part is not signed. */ + node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result); + if (node->sig_list) { + node->verify_attempted = true; + g_object_ref (node->sig_list); + set_signature_list_destructor (node); + } + + if (node->ctx->crypto->decrypt == NOTMUCH_DECRYPT_TRUE && message) { + notmuch_database_t *db = notmuch_message_get_database (message); + const char *session_key = g_mime_decrypt_result_get_session_key (decrypt_result); + if (db && session_key) + print_status_message ("Failed to stash session key in the database", + message, + notmuch_message_add_property (message, "session-key", + session_key)); + } + g_object_unref (decrypt_result); } - g_object_unref (decrypt_result); DONE: if (err) @@ -227,7 +247,6 @@ static mime_node_t * _mime_node_create (mime_node_t *parent, GMimeObject *part) { mime_node_t *node = talloc_zero (parent, mime_node_t); - notmuch_crypto_context_t *cryptoctx = NULL; /* Set basic node properties */ node->part = part; @@ -260,26 +279,15 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) return NULL; } -#if (GMIME_MAJOR_VERSION < 3) - if ((GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto->decrypt) - || (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"); - cryptoctx = notmuch_crypto_get_context (node->ctx->crypto, protocol); - if (!cryptoctx) - return NULL; - } -#endif - /* Handle PGP/MIME parts */ - if (GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto->decrypt) { + if (GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) { if (node->nchildren != 2) { /* this violates RFC 3156 section 4, so we won't bother with it. */ fprintf (stderr, "Error: %d part(s) for a multipart/encrypted " "message (must be exactly 2)\n", node->nchildren); } else { - node_decrypt_and_verify (node, part, cryptoctx); + node_decrypt_and_verify (node, part); } } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify) { if (node->nchildren != 2) { @@ -288,7 +296,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) "(must be exactly 2)\n", node->nchildren); } else { - node_verify (node, part, cryptoctx); + node_verify (node, part); } }