From: Jani Nikula Date: Sat, 30 Mar 2013 13:53:16 +0000 (+0200) Subject: [PATCH v2 2/3] cli: mime node: abstract decryption and signature verification X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3169975f2c96ae0058260f78953b5a762cb6809b;p=notmuch-archives.git [PATCH v2 2/3] cli: mime node: abstract decryption and signature verification --- diff --git a/c4/531d8dfc5ff3cd0de75e05757f50ddc9831f82 b/c4/531d8dfc5ff3cd0de75e05757f50ddc9831f82 new file mode 100644 index 000000000..a1e08f165 --- /dev/null +++ b/c4/531d8dfc5ff3cd0de75e05757f50ddc9831f82 @@ -0,0 +1,346 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 58989431FCB + for ; Sat, 30 Mar 2013 06:53:33 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id uIn4lGgVcPUN for ; + Sat, 30 Mar 2013 06:53:30 -0700 (PDT) +Received: from mail-la0-f54.google.com (mail-la0-f54.google.com + [209.85.215.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 81119431FC2 + for ; Sat, 30 Mar 2013 06:53:27 -0700 (PDT) +Received: by mail-la0-f54.google.com with SMTP id gw10so1125519lab.27 + for ; Sat, 30 Mar 2013 06:53:26 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references:in-reply-to:references:x-gm-message-state; + bh=lN0nHh42XFn6MB7XkotrqdVJTtwL602UONRhOgUTqFE=; + b=gUQ5S1hoxmvOcCR9/AH+Zs83nBvlqc6OqwBApvY4Bccm2JH84Lk1tzHsRaxsikUJvu + 242SMh3kNLPFKKZF0DqjxxWG/MYXIfYf14nKzPWJTHGp4V7q+jwR8ICe5R/BpuW+ACd0 + VySBOTbabZ1dSP2DECNLSB08pf8s9uzbO5eYStoAsPD9cyVe8BUow9d2evocJmXW4Fhj + G5LSq1dLMwIHzE5xD0CrEyGbUCM3dVjpsKZXKYEQHJ7nBtZP5wCGR4K7efpLwVyKdTGf + FOmEqVk0RN12C0M8Pi2tNL/Om9vJQYQ77tqZcKmc4XS1Lzrm6b1XGgOIgyES3hOhUykH + +mwQ== +X-Received: by 10.152.145.134 with SMTP id su6mr2780505lab.35.1364651605963; + Sat, 30 Mar 2013 06:53:25 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id i3sm2658459lbn.0.2013.03.30.06.53.24 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 30 Mar 2013 06:53:25 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/3] cli: mime node: abstract decryption and signature + verification +Date: Sat, 30 Mar 2013 15:53:16 +0200 +Message-Id: + +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQkZMAN5at7jRHEtWVm36X3z+n4cfouAvFo1R1ZPW1v1S91dnIHZNA/IqPcSmrGaiDwxAFt0 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Sat, 30 Mar 2013 13:53:33 -0000 + +The code filled with #ifdef GMIME_ATLEAST_26 is difficult to +read. Abstract the decryption and signature verification into +functions, with separate implementations for GMime 2.4 and 2.6, to +clarify the code. + +There should be no functional changes. +--- + mime-node.c | 218 ++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 142 insertions(+), 76 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index 839737a..851f963 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -130,26 +130,163 @@ DONE: + } + + #ifdef GMIME_ATLEAST_26 ++ ++/* Signature list destructor (GMime 2.6) */ + static int + _signature_list_free (GMimeSignatureList **proxy) + { + g_object_unref (*proxy); + return 0; + } +-#else ++ ++/* Set up signature list destructor (GMime 2.6) */ ++static void ++set_signature_list_destructor (mime_node_t *node) ++{ ++ GMimeSignatureList **proxy = talloc (node, GMimeSignatureList *); ++ if (proxy) { ++ *proxy = node->sig_list; ++ talloc_set_destructor (proxy, _signature_list_free); ++ } ++} ++ ++/* Verify a signed mime node (GMime 2.6) */ ++static void ++node_verify (mime_node_t *node, GMimeObject *part, ++ notmuch_crypto_context_t *cryptoctx) ++{ ++ GError *err = NULL; ++ ++ node->verify_attempted = TRUE; ++ node->sig_list = g_mime_multipart_signed_verify ++ (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err); ++ ++ if (node->sig_list) ++ set_signature_list_destructor (node); ++ else ++ fprintf (stderr, "Failed to verify signed part: %s\n", ++ err ? err->message : "no error explanation given"); ++ ++ if (err) ++ g_error_free (err); ++} ++ ++/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */ ++static void ++node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, ++ notmuch_crypto_context_t *cryptoctx) ++{ ++ GError *err = NULL; ++ GMimeDecryptResult *decrypt_result = NULL; ++ GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); ++ ++ node->decrypt_attempted = TRUE; ++ node->decrypted_child = g_mime_multipart_encrypted_decrypt ++ (encrypteddata, cryptoctx, &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; ++ ++ /* 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); ++ } ++ g_object_unref (decrypt_result); ++ ++ DONE: ++ if (err) ++ g_error_free (err); ++} ++ ++#else /* GMIME_ATLEAST_26 */ ++ ++/* Signature validity destructor (GMime 2.4) */ + static int + _signature_validity_free (GMimeSignatureValidity **proxy) + { + g_mime_signature_validity_free (*proxy); + return 0; + } +-#endif ++ ++/* Set up signature validity destructor (GMime 2.4) */ ++static void ++set_signature_validity_destructor (mime_node_t *node) ++{ ++ GMimeSignatureValidity **proxy = talloc (node, GMimeSignatureValidity *); ++ if (proxy) { ++ *proxy = node->sig_validity; ++ talloc_set_destructor (proxy, _signature_validity_free); ++ } ++} ++ ++/* Verify a signed mime node (GMime 2.4) */ ++static void ++node_verify (mime_node_t *node, GMimeObject *part, ++ notmuch_crypto_context_t *cryptoctx) ++{ ++ GError *err = NULL; ++ ++ node->verify_attempted = TRUE; ++ node->sig_validity = g_mime_multipart_signed_verify ++ (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err); ++ if (node->sig_validity) { ++ set_signature_validity_destructor (node); ++ } else { ++ fprintf (stderr, "Failed to verify signed part: %s\n", ++ err ? err->message : "no error explanation given"); ++ } ++ ++ if (err) ++ g_error_free (err); ++} ++ ++/* Decrypt and optionally verify an encrypted mime node (GMime 2.4) */ ++static void ++node_decrypt_and_verify (mime_node_t *node, GMimeObject *part, ++ notmuch_crypto_context_t *cryptoctx) ++{ ++ GError *err = NULL; ++ GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part); ++ ++ node->decrypt_attempted = TRUE; ++ node->decrypted_child = g_mime_multipart_encrypted_decrypt ++ (encrypteddata, cryptoctx, &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; ++ ++ /* The GMimeSignatureValidity returned here is a const, unlike the ++ * one returned by g_mime_multipart_signed_verify() in ++ * node_verify() above, so the destructor is not needed. ++ */ ++ node->sig_validity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata); ++ if (! node->sig_validity) ++ fprintf (stderr, "Failed to verify encrypted signed part: %s\n", ++ err ? err->message : "no error explanation given"); ++ ++ DONE: ++ if (err) ++ g_error_free (err); ++} ++ ++#endif /* GMIME_ATLEAST_26 */ + + static mime_node_t * + _mime_node_create (mime_node_t *parent, GMimeObject *part) + { + mime_node_t *node = talloc_zero (parent, mime_node_t); +- GError *err = NULL; + notmuch_crypto_context_t *cryptoctx = NULL; + + /* Set basic node properties */ +@@ -198,32 +335,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) + "message (must be exactly 2)\n", + node->nchildren); + } else { +- GMimeMultipartEncrypted *encrypteddata = +- GMIME_MULTIPART_ENCRYPTED (part); +- node->decrypt_attempted = TRUE; +-#ifdef GMIME_ATLEAST_26 +- GMimeDecryptResult *decrypt_result = NULL; +- node->decrypted_child = g_mime_multipart_encrypted_decrypt +- (encrypteddata, cryptoctx, &decrypt_result, &err); +-#else +- node->decrypted_child = g_mime_multipart_encrypted_decrypt +- (encrypteddata, cryptoctx, &err); +-#endif +- if (node->decrypted_child) { +- node->decrypt_success = node->verify_attempted = TRUE; +-#ifdef GMIME_ATLEAST_26 +- /* 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); +- g_object_unref (decrypt_result); +-#else +- node->sig_validity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata); +-#endif +- } else { +- fprintf (stderr, "Failed to decrypt part: %s\n", +- (err ? err->message : "no error explanation given")); +- } ++ node_decrypt_and_verify (node, part, cryptoctx); + } + } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify && cryptoctx) { + if (node->nchildren != 2) { +@@ -232,56 +344,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) + "(must be exactly 2)\n", + node->nchildren); + } else { +-#ifdef GMIME_ATLEAST_26 +- node->sig_list = g_mime_multipart_signed_verify +- (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err); +- node->verify_attempted = TRUE; +- +- if (!node->sig_list) +- fprintf (stderr, "Failed to verify signed part: %s\n", +- (err ? err->message : "no error explanation given")); +-#else +- /* For some reason the GMimeSignatureValidity returned +- * here is not a const (inconsistent with that +- * returned by +- * g_mime_multipart_encrypted_get_signature_validity, +- * and therefore needs to be properly disposed of. +- * +- * In GMime 2.6, they're both non-const, so we'll be able +- * to clean up this asymmetry. */ +- GMimeSignatureValidity *sig_validity = g_mime_multipart_signed_verify +- (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err); +- node->verify_attempted = TRUE; +- node->sig_validity = sig_validity; +- if (sig_validity) { +- GMimeSignatureValidity **proxy = +- talloc (node, GMimeSignatureValidity *); +- *proxy = sig_validity; +- talloc_set_destructor (proxy, _signature_validity_free); +- } +-#endif ++ node_verify (node, part, cryptoctx); + } + } + +-#ifdef GMIME_ATLEAST_26 +- /* sig_list may be created in both above cases, so we need to +- * cleanly handle it here. */ +- if (node->sig_list) { +- GMimeSignatureList **proxy = talloc (node, GMimeSignatureList *); +- *proxy = node->sig_list; +- talloc_set_destructor (proxy, _signature_list_free); +- } +-#endif +- +-#ifndef GMIME_ATLEAST_26 +- if (node->verify_attempted && !node->sig_validity) +- fprintf (stderr, "Failed to verify signed part: %s\n", +- (err ? err->message : "no error explanation given")); +-#endif +- +- if (err) +- g_error_free (err); +- + return node; + } + +-- +1.7.10.4 +