debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 03:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: record whether an actual decryption attempt happened

Browse source 
In our consolidation of _notmuch_crypto_decrypt, the callers lost
track a little bit of whether any actual decryption was attempted.

Now that we have the more-subtle "auto" policy, it's possible that
_notmuch_crypto_decrypt could be called without having any actual
decryption take place.

This change lets the callers be a little bit smarter about whether or
not any decryption was actually attempted.
This commit is contained in:
Daniel Kahn Gillmor 2017-12-08 01:23:58 -05:00 committed by David Bremner
parent 181d4091c4
commit d137170b23
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/index.cc
View file

@ -548,12 +548,19 @@ _index_encrypted_mime_part (notmuch_message_t *message,
} }
} }
#endif #endif
clear = _notmuch_crypto_decrypt (notmuch_indexopts_get_decrypt_policy (indexopts), bool attempted = false;
clear = _notmuch_crypto_decrypt (&attempted, notmuch_indexopts_get_decrypt_policy (indexopts),
message, crypto_ctx, encrypted_data, NULL, &err); message, crypto_ctx, encrypted_data, NULL, &err);
if (!attempted)
return;
if (err || !clear) {
if (err) { if (err) {
_notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n", _notmuch_database_log (notmuch, "Failed to decrypt during indexing. (%d:%d) [%s]\n",
err->domain, err->code, err->message); err->domain, err->code, err->message);
g_error_free(err); g_error_free(err);
} else {
_notmuch_database_log (notmuch, "Failed to decrypt during indexing. (unknown error)\n");
}
/* Indicate that we failed to decrypt during indexing */ /* Indicate that we failed to decrypt during indexing */
status = notmuch_message_add_property (message, "index.decryption", "failure"); status = notmuch_message_add_property (message, "index.decryption", "failure");
if (status) if (status)

4
mime-node.c
View file

@ -204,8 +204,8 @@ node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
if (parent->envelope_file) if (parent->envelope_file)
break; break;
node->decrypt_attempted = true; node->decrypted_child = _notmuch_crypto_decrypt (&node->decrypt_attempted,
node->decrypted_child = _notmuch_crypto_decrypt (node->ctx->crypto->decrypt, node->ctx->crypto->decrypt,
parent ? parent->envelope_file : NULL, parent ? parent->envelope_file : NULL,
cryptoctx, encrypteddata, &decrypt_result, &err); cryptoctx, encrypteddata, &decrypt_result, &err);
} }

7
util/crypto.c
View file

@ -140,7 +140,8 @@ void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto))
#endif #endif
GMimeObject * GMimeObject *
_notmuch_crypto_decrypt (notmuch_decryption_policy_t decrypt, _notmuch_crypto_decrypt (bool *attempted,
notmuch_decryption_policy_t decrypt,
notmuch_message_t *message, notmuch_message_t *message,
g_mime_3_unused(GMimeCryptoContext* crypto_ctx), g_mime_3_unused(GMimeCryptoContext* crypto_ctx),
GMimeMultipartEncrypted *part, GMimeMultipartEncrypted *part,
@ -162,6 +163,8 @@ _notmuch_crypto_decrypt (notmuch_decryption_policy_t decrypt,
g_error_free (*err); g_error_free (*err);
*err = NULL; *err = NULL;
} }
if (attempted)
*attempted = true;
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
ret = g_mime_multipart_encrypted_decrypt_session (part, ret = g_mime_multipart_encrypted_decrypt_session (part,
crypto_ctx, crypto_ctx,
@ -191,6 +194,8 @@ _notmuch_crypto_decrypt (notmuch_decryption_policy_t decrypt,
if (decrypt == NOTMUCH_DECRYPT_AUTO) if (decrypt == NOTMUCH_DECRYPT_AUTO)
return ret; return ret;
if (attempted)
*attempted = true;
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
ret = g_mime_multipart_encrypted_decrypt(part, crypto_ctx, ret = g_mime_multipart_encrypted_decrypt(part, crypto_ctx,
decrypt_result, err); decrypt_result, err);

3
util/crypto.h
View file

@ -16,7 +16,8 @@ typedef struct _notmuch_crypto {
} _notmuch_crypto_t; } _notmuch_crypto_t;
GMimeObject * GMimeObject *
_notmuch_crypto_decrypt (notmuch_decryption_policy_t decrypt, _notmuch_crypto_decrypt (bool *attempted,
notmuch_decryption_policy_t decrypt,
notmuch_message_t *message, notmuch_message_t *message,
GMimeCryptoContext* crypto_ctx, GMimeCryptoContext* crypto_ctx,
GMimeMultipartEncrypted *part, GMimeMultipartEncrypted *part,