When adding a message to the database, optionally try to decrypt the
message and index the cleartext.
Note that when a message is retrieved from the database, it will not
have this flag attached to it necessarily (though users can inspect
the tags that were attached during decryption/indexing)
---
lib/database.cc | 31 ++++++++++++++++++++++++++++---
lib/notmuch.h | 19 +++++++++++++++++++
2 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 13b0bad..62bc6d9 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -2429,9 +2429,10 @@ _notmuch_database_get_crypto_for_protocol
(notmuch_database_t *notmuch,
}
notmuch_status_t
-notmuch_database_add_message (notmuch_database_t *notmuch,
- const char *filename,
- notmuch_message_t **message_ret)
+_notmuch_database_add_message_with_options (notmuch_database_t *notmuch,
+ const char *filename,
+ notmuch_bool_t decrypt,
+ notmuch_message_t **message_ret)
{
notmuch_message_file_t *message_file;
notmuch_message_t *message = NULL;
@@ -2550,6 +2551,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
date = _notmuch_message_file_get_header (message_file, "date");
_notmuch_message_set_header_values (message, date, from, subject);
+ notmuch_message_set_flag (message,
NOTMUCH_MESSAGE_FLAG_INDEX_DECRYPTED, decrypt);
+
ret = _notmuch_message_index_file (message, message_file);
if (ret)
goto DONE;
@@ -2587,6 +2590,28 @@ notmuch_database_add_message (notmuch_database_t
*notmuch,
return ret;
}
+
+notmuch_status_t
+notmuch_database_add_message (notmuch_database_t *notmuch,
+ const char *filename,
+ notmuch_message_t **message_ret)
+{
+ return _notmuch_database_add_message_with_options (notmuch, filename,
+ false,
+ message_ret);
+
+}
+notmuch_status_t
+notmuch_database_add_message_try_decrypt (notmuch_database_t *notmuch,
+ const char *filename,
+ notmuch_message_t **message_ret)
+{
+ return _notmuch_database_add_message_with_options (notmuch, filename,
+ true,
+ message_ret);
+
+}
+
notmuch_status_t
notmuch_database_remove_message (notmuch_database_t *notmuch,
const char *filename)
diff --git a/lib/notmuch.h b/lib/notmuch.h
index e7085b7..809a2ea 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -570,6 +570,25 @@ notmuch_status_t
notmuch_database_add_message (notmuch_database_t *database,
const char *filename,
notmuch_message_t **message);
+/**
+ * Add a new message to the given notmuch database or associate an
+ * additional filename with an existing message.
+ *
+ * This does the same thing as notmuch_database_add_message except
+ * that it if part of the message is encrypted, it also tries to
+ * decrypt the message and index the cleartext version if it can.
+ *
+ * Be aware that the index is likely sufficient to reconstruct the
+ * cleartext of the message itself, so please ensure that the notmuch
+ * message index is adequately protected. DO NOT USE THIS FUNCTION
+ * without considering the security of your index.
+ *
+ * FIXME: document new error codes here.
+ */
+notmuch_status_t
+notmuch_database_add_message_try_decrypt (notmuch_database_t *database,
+ const char *filename,
+ notmuch_message_t **message);
/**
* Remove a message filename from the given notmuch database. If the
--
2.6.2
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
