notmuch_message_t *message);
static void
-format_part_text (GMimeObject *part,
- int *part_count);
+format_part_start_text (GMimeObject *part,
+ int *part_count);
+
+static void
+format_part_content_text (GMimeObject *part);
static void
format_part_end_text (GMimeObject *part);
"",
"\fmessage{ ", format_message_text,
"\fheader{\n", format_headers_text, "\fheader}\n",
- "\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n",
+ "\fbody{\n",
+ format_part_start_text,
+ NULL,
+ NULL,
+ format_part_content_text,
+ format_part_end_text,
+ "",
+ "\fbody}\n",
"\fmessage}\n", "",
""
};
notmuch_message_t *message);
static void
-format_part_json (GMimeObject *part,
- int *part_count);
+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);
static void
format_part_end_json (GMimeObject *part);
"[",
"{", format_message_json,
", \"headers\": {", format_headers_json, "}",
- ", \"body\": [", format_part_json, format_part_end_json, ", ", "]",
+ ", \"body\": [",
+ format_part_start_json,
+ format_part_encstatus_json,
+ format_part_sigstatus_json,
+ format_part_content_json,
+ format_part_end_json,
+ ", ",
+ "]",
"}", ", ",
"]"
};
"",
"", format_message_mbox,
"", NULL, "",
- "", NULL, NULL, "", "",
+ "",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "",
+ "",
"", "",
""
};
static void
-format_part_raw (GMimeObject *part,
- unused (int *part_count));
+format_part_content_raw (GMimeObject *part);
static const notmuch_show_format_t format_raw = {
"",
"", NULL,
"", NULL, "",
- "", format_part_raw, NULL, "", "",
+ "",
+ NULL,
+ NULL,
+ NULL,
+ format_part_content_raw,
+ NULL,
+ "",
+ "",
"", "",
""
};
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_text (GMimeObject *part, int *part_count)
+format_part_start_text (GMimeObject *part, int *part_count)
{
- GMimeContentDisposition *disposition;
- GMimeContentType *content_type;
+ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
- disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{
- const char *filename = g_mime_part_get_filename (GMIME_PART (part));
- content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-
- printf ("\fattachment{ ID: %d, Content-type: %s\n",
- *part_count,
- g_mime_content_type_to_string (content_type));
- printf ("Attachment: %s (%s)\n", filename,
- g_mime_content_type_to_string (content_type));
+ printf ("\fattachment{ ID: %d", *part_count);
- if (g_mime_content_type_is_type (content_type, "text", "*") &&
- !g_mime_content_type_is_type (content_type, "text", "html"))
- {
- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
- show_part_content (part, stream_stdout);
- g_object_unref(stream_stdout);
- }
+ } else {
- return;
+ printf ("\fpart{ ID: %d", *part_count);
}
+}
- content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+static void
+format_part_content_text (GMimeObject *part)
+{
+ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
+ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
- printf ("\fpart{ ID: %d, Content-type: %s\n",
- *part_count,
- g_mime_content_type_to_string (content_type));
+ printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
+
+ if (disposition &&
+ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+ {
+ const char *filename = g_mime_part_get_filename (GMIME_PART (part));
+ printf ("Attachment: %s (%s)\n", filename,
+ g_mime_content_type_to_string (content_type));
+ }
if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html"))
{
- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
show_part_content (part, stream_stdout);
g_object_unref(stream_stdout);
}
static void
-format_part_json (GMimeObject *part, int *part_count)
+format_part_start_json (unused (GMimeObject *part), int *part_count)
{
- GMimeContentType *content_type;
- GMimeContentDisposition *disposition;
- void *ctx = talloc_new (NULL);
+ 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)
+{
+ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
GMimeStream *stream_memory = g_mime_stream_mem_new ();
+ const char *cid = g_mime_object_get_content_id (part);
+ void *ctx = talloc_new (NULL);
+ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
GByteArray *part_content;
- const char *cid;
- content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-
- printf ("{\"id\": %d, \"content-type\": %s",
- *part_count,
+ printf (", \"content-type\": %s",
json_quote_str (ctx, g_mime_content_type_to_string (content_type)));
- cid = g_mime_object_get_content_id (part);
if (cid != NULL)
- printf(", \"content-id\": %s",
- json_quote_str (ctx, cid));
+ printf(", \"content-id\": %s", json_quote_str (ctx, cid));
- disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{
}
static void
-format_part_raw (GMimeObject *part, unused (int *part_count))
+format_part_content_raw (GMimeObject *part)
{
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
fputs (format->body_start, stdout);
}
- if (format->part)
+ if (format->part_content)
show_message_body (notmuch_message_get_filename (message),
format, params);
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) {
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;
notmuch_query_destroy (query);
notmuch_database_close (notmuch);
+ if (params.cryptoctx)
+ g_object_unref(params.cryptoctx);
+
return 0;
}
projects / notmuch / blobdiff