notmuch_show_params_t *params,
int first)
{
+ GMimeObject *decryptedpart = NULL;
int selected;
state->part_count += 1;
GMimeMultipart *multipart = GMIME_MULTIPART (part);
GError* err = NULL;
- if (GMIME_IS_MULTIPART_SIGNED (part))
+ if (GMIME_IS_MULTIPART_ENCRYPTED (part) && params->decrypt)
+ {
+ if ( g_mime_multipart_get_count (multipart) != 2 ) {
+ /* this violates RFC 3156 section 4, so we won't bother with it. */
+ fprintf (stderr,
+ "Error: %d part(s) for a multipart/encrypted message (should be exactly 2)\n",
+ g_mime_multipart_get_count (multipart));
+ } else {
+ GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
+ decryptedpart = g_mime_multipart_encrypted_decrypt (encrypteddata, params->cryptoctx, &err);
+ if (decryptedpart) {
+ if ((selected || state->in_zone) && format->part_encstatus)
+ format->part_encstatus (1);
+ const GMimeSignatureValidity *sigvalidity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata);
+ if (!sigvalidity)
+ fprintf (stderr, "Failed to verify signed part: %s\n", (err ? err->message : "no error explanation given"));
+ if ((selected || state->in_zone) && format->part_sigstatus)
+ format->part_sigstatus (sigvalidity);
+ } else {
+ fprintf (stderr, "Failed to decrypt part: %s\n", (err ? err->message : "no error explanation given"));
+ if ((selected || state->in_zone) && format->part_encstatus)
+ format->part_encstatus (0);
+ }
+ }
+ }
+ else if (GMIME_IS_MULTIPART_SIGNED (part))
{
if ( g_mime_multipart_get_count (multipart) != 2 ) {
/* this violates RFC 3156 section 5, so we won't bother with it. */
}
if ((selected || state->in_zone) && format->part_sigstatus)
format->part_sigstatus (sigvalidity);
- /* extract only data part, and ignore signature part */
- part = g_mime_multipart_get_part (multipart, 0);
if (sigvalidity)
g_mime_signature_validity_free (sigvalidity);
}
if (selected)
state->in_zone = 1;
- for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
- show_message_part (g_mime_multipart_get_part (multipart, i),
- state, format, params, i == 0);
+ if (decryptedpart) {
+ /* We emit the useless application/pgp-encrypted version
+ * part here only to keep the emitted output as consistent
+ * as possible between decrypted output and the
+ * unprocessed multipart/mime. For some strange reason,
+ * the actual encrypted data is the second part of the
+ * multipart. */
+ show_message_part (g_mime_multipart_get_part (multipart, 0), state, format, params, TRUE);
+ show_message_part (decryptedpart, state, format, params, FALSE);
+ } else {
+ for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+ show_message_part (g_mime_multipart_get_part (multipart, i),
+ state, format, params, i == 0);
+ }
}
if (selected)
if (selected)
state->in_zone = 1;
+ if (selected || (!selected && state->in_zone)) {
+ fputs (format->header_start, stdout);
+ if (format->header_message_part)
+ format->header_message_part (mime_message);
+ fputs (format->header_end, stdout);
+
+ fputs (format->body_start, stdout);
+ }
+
show_message_part (g_mime_message_get_mime_part (mime_message),
state, format, params, TRUE);
+ if (selected || (!selected && state->in_zone))
+ fputs (format->body_end, stdout);
+
if (selected)
state->in_zone = 0;
}
}
notmuch_status_t
-show_message_body (const char *filename,
+show_message_body (notmuch_message_t *message,
const notmuch_show_format_t *format,
notmuch_show_params_t *params)
{
GMimeParser *parser = NULL;
GMimeMessage *mime_message = NULL;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+ const char *filename = notmuch_message_get_filename (message);
FILE *file = NULL;
show_message_state_t state;