[PATCH v2 4/5] cli: new crypto verify flag to handle verification

diff --git a/9b/f6aaad4e498a1f83dea595d88c683afacc679c b/9b/f6aaad4e498a1f83dea595d88c683afacc679c
new file mode 100644 (file)
index 0000000..0ba8bcf
--- /dev/null
+++ b/9b/f6aaad4e498a1f83dea595d88c683afacc679c
@@ -0,0 +1,187 @@
+Return-Path: <jrollins@finestructure.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A1099431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 18 May 2012 10:32:50 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id f-m-3GdUCltF for <notmuch@notmuchmail.org>;\r
+       Fri, 18 May 2012 10:32:49 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 941ED431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 18 May 2012 10:32:46 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 5082F32807A\r
+       for <notmuch@notmuchmail.org>; Fri, 18 May 2012 10:32:44 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-98-14-81-93.nyc.res.rr.com\r
+ [98.14.81.93])        (Authenticated sender: jrollins)        by fire-doxen-submit\r
+ (Postfix) with ESMTP id DEFBF328035   for <notmuch@notmuchmail.org>; Fri, 18\r
+ May 2012 10:32:41 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 4917B624; Fri, 18 May 2012 10:32:40 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 4/5] cli: new crypto verify flag to handle verification\r
+Date: Fri, 18 May 2012 10:32:36 -0700\r
+Message-Id: <1337362357-31281-5-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337362357-31281-4-git-send-email-jrollins@finestructure.net>\r
+References: <1337362357-31281-1-git-send-email-jrollins@finestructure.net>\r
+       <1337362357-31281-2-git-send-email-jrollins@finestructure.net>\r
+       <1337362357-31281-3-git-send-email-jrollins@finestructure.net>\r
+       <1337362357-31281-4-git-send-email-jrollins@finestructure.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 18 May 2012 17:32:51 -0000\r
+\r
+Use this flag rather than depend on the existence of an initialized\r
+gpgctx, to determine whether we should verify a multipart/signed.  We\r
+will be moving to create the ctx lazily, so we don't want to depend on\r
+it being previously initialized if it's not needed.\r
+---\r
+ mime-node.c      |    5 ++---\r
+ notmuch-client.h |    8 ++++----\r
+ notmuch-reply.c  |    1 +\r
+ notmuch-show.c   |   14 +++++++++++---\r
+ 4 files changed, 18 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/mime-node.c b/mime-node.c\r
+index 3dda900..3adbe5a 100644\r
+--- a/mime-node.c\r
++++ b/mime-node.c\r
+@@ -183,8 +183,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+     }\r
+ \r
+     /* Handle PGP/MIME parts */\r
+-    if (GMIME_IS_MULTIPART_ENCRYPTED (part)\r
+-      && node->ctx->crypto->gpgctx && node->ctx->crypto->decrypt) {\r
++    if (GMIME_IS_MULTIPART_ENCRYPTED (part) && node->ctx->crypto->decrypt) {\r
+       if (node->nchildren != 2) {\r
+           /* this violates RFC 3156 section 4, so we won't bother with it. */\r
+           fprintf (stderr, "Error: %d part(s) for a multipart/encrypted "\r
+@@ -218,7 +217,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)\r
+                        (err ? err->message : "no error explanation given"));\r
+           }\r
+       }\r
+-    } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->gpgctx) {\r
++    } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify) {\r
+       if (node->nchildren != 2) {\r
+           /* this violates RFC 3156 section 5, so we won't bother with it. */\r
+           fprintf (stderr, "Error: %d part(s) for a multipart/signed message "\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 9892968..c671c13 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -80,6 +80,7 @@ typedef struct notmuch_crypto {\r
+ #else\r
+     GMimeCipherContext* gpgctx;\r
+ #endif\r
++    notmuch_bool_t verify;\r
+     notmuch_bool_t decrypt;\r
+ } notmuch_crypto_t;\r
+ \r
+@@ -345,10 +346,9 @@ struct mime_node {\r
+ };\r
+ \r
+ /* Construct a new MIME node pointing to the root message part of\r
+- * message.  If crypto->gpgctx is non-NULL, it will be used to verify\r
+- * signatures on any child parts.  If crypto->decrypt is true, then\r
+- * crypto.gpgctx will additionally be used to decrypt any encrypted\r
+- * child parts.\r
++ * message. If crypto->verify is true, signed child parts will be\r
++ * verified. If crypto->decrypt is true, encrypted child parts will be\r
++ * decrypted.\r
+  *\r
+  * Return value:\r
+  *\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 34a906e..345be76 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -674,6 +674,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+     int opt_index, ret = 0;\r
+     int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_crypto_t *crypto, notmuch_bool_t reply_all);\r
+     notmuch_crypto_t crypto = {\r
++      .verify = FALSE,\r
+       .decrypt = FALSE\r
+     };\r
+     int format = FORMAT_DEFAULT;\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 66c74e2..f4ee038 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -987,11 +987,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       .part = -1,\r
+       .omit_excluded = TRUE,\r
+       .crypto = {\r
++          .verify = FALSE,\r
+           .decrypt = FALSE\r
+       }\r
+     };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+-    notmuch_bool_t verify = FALSE;\r
+     int exclude = EXCLUDE_TRUE;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+@@ -1008,7 +1008,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },\r
+-      { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &params.crypto.verify, "verify", 'v', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -1018,6 +1018,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    /* decryption implies verification */\r
++    if (params.crypto.decrypt)\r
++      params.crypto.verify = TRUE;\r
++\r
+     if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {\r
+       /* if part was requested and format was not specified, use format=raw */\r
+       if (params.part >= 0)\r
+@@ -1052,7 +1056,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       break;\r
+     }\r
+ \r
+-    if (params.crypto.decrypt || verify) {\r
++    if (params.crypto.decrypt || params.crypto.verify) {\r
+ #ifdef GMIME_ATLEAST_26\r
+       /* TODO: GMimePasswordRequestFunc */\r
+       params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg");\r
+@@ -1063,6 +1067,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       if (params.crypto.gpgctx) {\r
+           g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE);\r
+       } else {\r
++          /* If we fail to create the gpgctx set the verify and\r
++           * decrypt flags to FALSE so we don't try to do any\r
++           * further verification or decryption */\r
++          params.crypto.verify = FALSE;\r
+           params.crypto.decrypt = FALSE;\r
+           fprintf (stderr, "Failed to construct gpg context.\n");\r
+       }\r
+-- \r
+1.7.10\r
+\r