Add decryption of PGP/MIME-encrypted parts with --decrypt.

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 363cdbfed7760207d30516e89cc1e8d158c043a1..e90f07e30b4c60715cdc38ac89bf77a71219683d 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -44,6 +44,8 @@ static const notmuch_show_format_t format_text = {
            "\fheader{\n", format_headers_text, "\fheader}\n",
            "\fbody{\n",
                format_part_start_text,
+               NULL,
+               NULL,
                format_part_content_text,
                format_part_end_text,
                "",
@@ -64,6 +66,12 @@ static void
 format_part_start_json (unused (GMimeObject *part),
                        int *part_count);
 
+static void
+format_part_encstatus_json (int status);
+
+static void
+format_part_sigstatus_json (const GMimeSignatureValidity* validity);
+
 static void
 format_part_content_json (GMimeObject *part);
 
@@ -76,6 +84,8 @@ static const notmuch_show_format_t format_json = {
            ", \"headers\": {", format_headers_json, "}",
            ", \"body\": [",
                format_part_start_json,
+               format_part_encstatus_json,
+               format_part_sigstatus_json,
                format_part_content_json,
                format_part_end_json,
                ", ",
@@ -94,6 +104,8 @@ static const notmuch_show_format_t format_mbox = {
         "", format_message_mbox,
             "", NULL, "",
             "",
+                NULL,
+                NULL,
                 NULL,
                 NULL,
                 NULL,
@@ -111,6 +123,8 @@ static const notmuch_show_format_t format_raw = {
        "", NULL,
            "", NULL, "",
             "",
+                NULL,
+                NULL,
                 NULL,
                 format_part_content_raw,
                 NULL,
@@ -396,6 +410,22 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out)
        g_object_unref(stream_filter);
 }
 
+static const char*
+signerstatustostring (GMimeSignerStatus x)
+{
+    switch (x) {
+    case GMIME_SIGNER_STATUS_NONE:
+       return "none";
+    case GMIME_SIGNER_STATUS_GOOD:
+       return "good";
+    case GMIME_SIGNER_STATUS_BAD:
+       return "bad";
+    case GMIME_SIGNER_STATUS_ERROR:
+       return "error";
+    }
+    return "unknown";
+}
+
 static void
 format_part_start_text (GMimeObject *part, int *part_count)
 {
@@ -472,6 +502,77 @@ format_part_start_json (unused (GMimeObject *part), int *part_count)
     printf ("{\"id\": %d", *part_count);
 }
 
+static void
+format_part_encstatus_json (int status)
+{
+    printf (", \"encstatus\": [{\"status\": ");
+    if (status) {
+       printf ("\"good\"");
+    } else {
+       printf ("\"bad\"");
+    }
+    printf ("}]");
+}
+
+static void
+format_part_sigstatus_json (const GMimeSignatureValidity* validity)
+{
+    printf (", \"sigstatus\": [");
+
+    if (!validity) {
+       printf ("]");
+       return;
+    }
+
+    const GMimeSigner *signer = g_mime_signature_validity_get_signers (validity);
+    int first = 1;
+    void *ctx_quote = talloc_new (NULL);
+
+    while (signer) {
+       if (first)
+           first = 0;
+       else
+           printf (", ");
+
+       printf ("{");
+
+       /* status */
+       printf ("\"status\": %s", json_quote_str (ctx_quote, signerstatustostring(signer->status)));
+
+       if (signer->status == GMIME_SIGNER_STATUS_GOOD)
+       {
+           if (signer->fingerprint)
+               printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, signer->fingerprint));
+           /* these dates are seconds since the epoch; should we
+            * provide a more human-readable format string? */
+           if (signer->created)
+               printf (", \"created\": %d", (int) signer->created);
+           if (signer->expires)
+               printf (", \"expires\": %d", (int) signer->expires);
+           /* output user id only if validity is FULL or ULTIMATE. */
+           /* note that gmime is using the term "trust" here, which
+            * is WRONG.  It's actually user id "validity". */
+           if ((signer->name) && (signer->trust)) {
+               if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE))
+                   printf (", \"userid\": %s", json_quote_str (ctx_quote, signer->name));
+           }
+       } else {
+           if (signer->keyid)
+               printf (", \"keyid\": %s", json_quote_str (ctx_quote, signer->keyid));
+       }
+       if (signer->errors != GMIME_SIGNER_ERROR_NONE) {
+           printf (", \"errors\": %x", signer->errors);
+       }
+
+       printf ("}");
+       signer = signer->next;
+    }
+
+    printf ("]");
+
+    talloc_free (ctx_quote);
+}
+
 static void
 format_part_content_json (GMimeObject *part)
 {
@@ -739,6 +840,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     params.entire_thread = 0;
     params.raw = 0;
     params.part = -1;
+    params.cryptoctx = NULL;
+    params.decrypt = 0;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
@@ -767,6 +870,19 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
            params.part = atoi(argv[i] + sizeof ("--part=") - 1);
        } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {
            params.entire_thread = 1;
+       } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
+                  (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
+           if (params.cryptoctx == NULL) {
+               GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL);
+               if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
+                   fprintf (stderr, "Failed to construct gpg context.\n");
+               else
+                   g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE);
+               g_object_unref (session);
+               session = NULL;
+           }
+           if (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)
+               params.decrypt = 1;
        } else {
            fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
            return 1;
@@ -824,5 +940,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);
 
+    if (params.cryptoctx)
+       g_object_unref(params.cryptoctx);
+
     return 0;
 }