From 9ba42bf2d73ceb19a867f5f0ef9704ad69d2d339 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 17 May 2012 14:55:59 +1700 Subject: [PATCH] [PATCH 6/6] cli: lazily create the crypto gpg context only when needed --- a5/50d75a0d49e662546f4ebe245d51eff86ac48b | 172 ++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 a5/50d75a0d49e662546f4ebe245d51eff86ac48b diff --git a/a5/50d75a0d49e662546f4ebe245d51eff86ac48b b/a5/50d75a0d49e662546f4ebe245d51eff86ac48b new file mode 100644 index 000000000..e0416590f --- /dev/null +++ b/a5/50d75a0d49e662546f4ebe245d51eff86ac48b @@ -0,0 +1,172 @@ +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 2EF00431FD2 + for ; Wed, 16 May 2012 14:56:35 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 bD5+-yg4zxJg for ; + Wed, 16 May 2012 14:56:33 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id B4E7B431FBD + for ; Wed, 16 May 2012 14:56:15 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id 7EFDB328056 + for ; Wed, 16 May 2012 14:56:15 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new +Received: from finestructure.net (rrcs-184-74-199-219.nyc.biz.rr.com + [184.74.199.219]) (Authenticated sender: jrollins) + by fire-doxen-submit (Postfix) with ESMTP id C553F2E50AE0 + for ; Wed, 16 May 2012 14:56:12 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 23A8461B; Wed, 16 May 2012 14:56:02 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH 6/6] cli: lazily create the crypto gpg context only when + needed +Date: Wed, 16 May 2012 14:55:59 -0700 +Message-Id: <1337205359-2444-7-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337205359-2444-6-git-send-email-jrollins@finestructure.net> +References: <1337205359-2444-1-git-send-email-jrollins@finestructure.net> + <1337205359-2444-2-git-send-email-jrollins@finestructure.net> + <1337205359-2444-3-git-send-email-jrollins@finestructure.net> + <1337205359-2444-4-git-send-email-jrollins@finestructure.net> + <1337205359-2444-5-git-send-email-jrollins@finestructure.net> + <1337205359-2444-6-git-send-email-jrollins@finestructure.net> +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: Wed, 16 May 2012 21:56:35 -0000 + +Move the creation of the crypto ctx into mime-node.c and create it +only when needed. This removes code duplication from notmuch-show and +notmuch-reply, and should speed up these functions considerably if the +crypto flags are provided but the messages don't have any +cryptographic parts. +--- + mime-node.c | 25 +++++++++++++++++++++++++ + notmuch-reply.c | 19 ------------------- + notmuch-show.c | 23 ----------------------- + 3 files changed, 25 insertions(+), 42 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index 8cdabc8..7278c74 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -182,6 +182,31 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) + return NULL; + } + ++ /* Lazily create the gpgctx if it's needed and hasn't been initialized yet */ ++ if ((GMIME_IS_MULTIPART_ENCRYPTED (part) || GMIME_IS_MULTIPART_SIGNED (part)) ++ && (node->ctx->crypto.verify || node->ctx->crypto.decrypt)) { ++ if (!node->ctx->crypto.gpgctx) { ++#ifdef GMIME_ATLEAST_26 ++ /* TODO: GMimePasswordRequestFunc */ ++ node->ctx->crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg"); ++#else ++ GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); ++ node->ctx->crypto.gpgctx = g_mime_gpg_context_new (session, "gpg"); ++ g_object_unref (session); ++#endif ++ if (node->ctx->crypto.gpgctx) { ++ g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) node->ctx->crypto.gpgctx, FALSE); ++ } else { ++ /* If we fail to create the gpgctx set the verify and ++ * decrypt flags to FALSE so we don't try to do any ++ * further verification or decryption */ ++ node->ctx->crypto.verify = FALSE; ++ node->ctx->crypto.decrypt = FALSE; ++ fprintf (stderr, "Failed to construct gpg context.\n"); ++ } ++ } ++ } ++ + /* Handle PGP/MIME parts */ + if (GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto.decrypt) { + if (node->nchildren != 2) { +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 997fdd1..a56cf9f 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -708,25 +708,6 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + else + reply_format_func = notmuch_reply_format_default; + +- if (crypto.decrypt) { +-#ifdef GMIME_ATLEAST_26 +- /* TODO: GMimePasswordRequestFunc */ +- crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg"); +-#else +- GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); +- crypto.gpgctx = g_mime_gpg_context_new (session, "gpg"); +-#endif +- if (crypto.gpgctx) { +- g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) crypto.gpgctx, FALSE); +- } else { +- crypto.decrypt = FALSE; +- fprintf (stderr, "Failed to construct gpg context.\n"); +- } +-#ifndef GMIME_ATLEAST_26 +- g_object_unref (session); +-#endif +- } +- + config = notmuch_config_open (ctx, NULL, NULL); + if (config == NULL) + return 1; +diff --git a/notmuch-show.c b/notmuch-show.c +index 99a10bd..0616f68 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1058,29 +1058,6 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + break; + } + +- if (params.crypto.decrypt || params.crypto.verify) { +-#ifdef GMIME_ATLEAST_26 +- /* TODO: GMimePasswordRequestFunc */ +- params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg"); +-#else +- GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); +- params.crypto.gpgctx = g_mime_gpg_context_new (session, "gpg"); +-#endif +- if (params.crypto.gpgctx) { +- g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE); +- } else { +- /* If we fail to create the gpgctx set the verify and +- * decrypt flags to FALSE so we don't try to do any +- * further verification or decryption */ +- params.crypto.verify = FALSE; +- params.crypto.decrypt = FALSE; +- fprintf (stderr, "Failed to construct gpg context.\n"); +- } +-#ifndef GMIME_ATLEAST_26 +- g_object_unref (session); +-#endif +- } +- + config = notmuch_config_open (ctx, NULL, NULL); + if (config == NULL) + return 1; +-- +1.7.10 + -- 2.26.2