From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 13/18] cli/new, insert, reindex: change index.try_decrypt to "auto" by default
Date: Wed, 25 Oct 2017 02:51:58 -0400 [thread overview]
Message-ID: <20171025065203.24403-14-dkg@fifthhorseman.net> (raw)
In-Reply-To: <20171025065203.24403-1-dkg@fifthhorseman.net>
The new "auto" decryption policy is not only good for "notmuch show"
and "notmuch reindex". It's also useful for indexing messages --
there's no good reason to not try to go ahead and index the cleartext
of a message that we have a stashed session key for.
This change updates the defaults and tunes the test suite to make sure
that they have taken effect.
---
doc/man1/notmuch-config.rst | 2 +-
lib/indexopts.c | 8 +++++---
test/T357-index-decryption.sh | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst
index 14642062..ae7586f3 100644
--- a/doc/man1/notmuch-config.rst
+++ b/doc/man1/notmuch-config.rst
@@ -154,7 +154,7 @@ The available configuration items are described below.
DO NOT USE ``index.try_decrypt=true`` without considering the
security of your index.
- Default: ``false``.
+ Default: ``auto``.
**built_with.<name>**
diff --git a/lib/indexopts.c b/lib/indexopts.c
index 93a2c9eb..a61d6420 100644
--- a/lib/indexopts.c
+++ b/lib/indexopts.c
@@ -26,7 +26,7 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
notmuch_indexopts_t *ret = talloc_zero (db, notmuch_indexopts_t);
if (!ret)
return ret;
- ret->crypto.decrypt = NOTMUCH_DECRYPT_FALSE;
+ ret->crypto.decrypt = NOTMUCH_DECRYPT_AUTO;
char * try_decrypt;
notmuch_status_t err = notmuch_database_get_config (db, "index.try_decrypt", &try_decrypt);
@@ -38,8 +38,10 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
(!(strcasecmp(try_decrypt, "yes"))) ||
(!(strcasecmp(try_decrypt, "1"))))
notmuch_indexopts_set_try_decrypt (ret, NOTMUCH_DECRYPT_TRUE);
- else if (!strcasecmp(try_decrypt, "auto"))
- notmuch_indexopts_set_try_decrypt (ret, NOTMUCH_DECRYPT_AUTO);
+ else if ((!(strcasecmp(try_decrypt, "false"))) ||
+ (!(strcasecmp(try_decrypt, "no"))) ||
+ (!(strcasecmp(try_decrypt, "0"))))
+ notmuch_indexopts_set_try_decrypt (ret, NOTMUCH_DECRYPT_FALSE);
}
free (try_decrypt);
diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh
index 30bdf704..7fc59f1e 100755
--- a/test/T357-index-decryption.sh
+++ b/test/T357-index-decryption.sh
@@ -142,7 +142,7 @@ test_expect_equal \
# ensure no session keys are present:
test_begin_subtest 'reindex using only session keys'
-test_expect_success 'notmuch reindex --try-decrypt=auto tag:encrypted and property:index.decryption=success'
+test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success'
test_begin_subtest "reindexed encrypted messages, decrypting only with session keys"
output=$(notmuch search wumpus)
expected=''
@@ -190,7 +190,7 @@ notmuch restore <<EOF
#notmuch-dump batch-tag:3 config,properties,tags
#= simple-encrypted@crypto.notmuchmail.org session-key=9%3AFC09987F5F927CC0CC0EE80A96E4C5BBF4A499818FB591207705DFDDD6112CF9
EOF
-notmuch reindex --try-decrypt=auto id:simple-encrypted@crypto.notmuchmail.org
+notmuch reindex id:simple-encrypted@crypto.notmuchmail.org
output=$(notmuch search sekrit)
expected='thread:0000000000000001 2016-12-22 [1/1] Daniel Kahn Gillmor; encrypted message (encrypted inbox unread)'
test_expect_equal \
--
2.14.2
next prev parent reply other threads:[~2017-10-25 6:52 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 6:51 Stashed session keys Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 01/18] mime-node: handle decrypt_result more safely Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 02/18] crypto: add _notmuch_crypto_decrypt wrapper function Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 03/18] crypto: use stashed session-key properties for decryption, if available Daniel Kahn Gillmor
2017-10-26 19:00 ` Daniel Kahn Gillmor
2017-11-14 13:02 ` David Bremner
2017-11-14 13:54 ` Daniel Kahn Gillmor
2017-11-15 12:59 ` David Bremner
2017-10-25 6:51 ` [PATCH 04/18] test/corpora: add an encrypted message for index decryption tests Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 05/18] crypto: Test restore of cleartext index from stashed session keys Daniel Kahn Gillmor
2017-11-14 13:13 ` David Bremner
2017-11-14 13:58 ` Daniel Kahn Gillmor
2017-11-14 14:27 ` David Bremner
2017-10-25 6:51 ` [PATCH 06/18] lib: convert notmuch decryption policy to an enum Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 07/18] crypto: new decryption policy "auto" Daniel Kahn Gillmor
2017-11-11 23:14 ` Jameson Graef Rollins
2017-11-12 3:39 ` Daniel Kahn Gillmor
2017-11-12 15:26 ` Jameson Graef Rollins
2017-11-14 13:21 ` David Bremner
2017-10-25 6:51 ` [PATCH 08/18] cli/reply: use decryption policy "auto" by default Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 09/18] cli/show: " Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 10/18] cli/show, reply: document use of stashed session keys in notmuch-properties Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 11/18] cli/new, insert, reindex: update documentation for --try-decrypt=auto Daniel Kahn Gillmor
2017-11-15 20:02 ` David Bremner
2017-10-25 6:51 ` [PATCH 12/18] crypto: record whether an actual decryption attempt happened Daniel Kahn Gillmor
2017-10-25 6:51 ` Daniel Kahn Gillmor [this message]
2017-11-16 12:40 ` [PATCH 13/18] cli/new, insert, reindex: change index.try_decrypt to "auto" by default David Bremner
2017-11-30 6:16 ` Daniel Kahn Gillmor
2017-10-25 6:51 ` [PATCH 14/18] cli/reindex: destroy stashed session keys when --try-decrypt=false Daniel Kahn Gillmor
2017-10-25 6:52 ` [PATCH 15/18] crypto: actually stash session keys when try-decrypt=true Daniel Kahn Gillmor
2017-11-16 12:53 ` David Bremner
2017-11-30 15:57 ` Daniel Kahn Gillmor
2017-12-02 1:56 ` David Bremner
2017-10-25 6:52 ` [PATCH 16/18] crypto: add --try-decrypt=nostash to avoid stashing session keys Daniel Kahn Gillmor
2017-10-25 14:46 ` Daniel Kahn Gillmor
2017-11-16 13:02 ` David Bremner
2017-10-25 6:52 ` [PATCH 17/18] docs: clean up documentation about decryption policies Daniel Kahn Gillmor
2017-10-25 6:52 ` [PATCH 18/18] python: add try_decrypt argument to Database.index_file() Daniel Kahn Gillmor
2017-11-16 13:06 ` David Bremner
2017-11-30 15:58 ` Daniel Kahn Gillmor
2017-11-11 7:56 ` Stashed session keys Daniel Kahn Gillmor
2017-11-11 23:31 ` Jameson Graef Rollins
2017-11-12 3:51 ` Daniel Kahn Gillmor
2017-11-12 15:15 ` Jameson Graef Rollins
2017-11-12 18:51 ` Daniel Kahn Gillmor
2017-11-15 22:41 ` meskio
2017-11-16 16:03 ` Daniel Kahn Gillmor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171025065203.24403-14-dkg@fifthhorseman.net \
--to=dkg@fifthhorseman.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).