notmuch_show_params_t *params,
int first)
{
+ GMimeObject *decryptedpart = NULL;
int selected;
state->part_count += 1;
selected = (params->part <= 0 || state->part_count == params->part);
if (selected || state->in_zone) {
- if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
+ if (!first && (params->part <= 0 || state->in_zone))
fputs (format->part_sep, stdout);
- format->part (part, &(state->part_count));
+ if (format->part_start)
+ format->part_start (part, &(state->part_count));
}
+ /* handle PGP/MIME parts */
+ if (GMIME_IS_MULTIPART (part) && params->cryptoctx) {
+ GMimeMultipart *multipart = GMIME_MULTIPART (part);
+ GError* err = NULL;
+
+ 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. */
+ fprintf (stderr,
+ "Error: %d part(s) for a multipart/signed message (should be exactly 2)\n",
+ g_mime_multipart_get_count (multipart));
+ } else {
+ /* For some reason the GMimeSignatureValidity returned
+ * here is not a const (inconsistent with that
+ * returned by
+ * g_mime_multipart_encrypted_get_signature_validity,
+ * and therefore needs to be properly disposed of.
+ * Hopefully the API will become more consistent. */
+ GMimeSignatureValidity *sigvalidity = g_mime_multipart_signed_verify (GMIME_MULTIPART_SIGNED (part), params->cryptoctx, &err);
+ 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);
+ if (sigvalidity)
+ g_mime_signature_validity_free (sigvalidity);
+ }
+ }
+
+ if (err)
+ g_error_free (err);
+ }
+ /* end handle PGP/MIME parts */
+
+ if (selected || state->in_zone)
+ format->part_content (part);
+
if (GMIME_IS_MULTIPART (part)) {
GMimeMultipart *multipart = GMIME_MULTIPART (part);
int i;
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)