debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: index the content-type of the parts of encrypted messages

Browse source 
This is a logical followup to "lib: index the content type of
signature parts", which will make it easier to record the message
structure of all messages.
This commit is contained in:
Daniel Kahn Gillmor 2017-09-16 17:59:05 +03:00 committed by David Bremner
parent 55c047ee0b
commit f4ac5ecd5c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/index.cc
View file

@ -409,7 +409,14 @@ _index_mime_part (notmuch_message_t *message,
} }
} }
if (GMIME_IS_MULTIPART_ENCRYPTED (multipart)) { if (GMIME_IS_MULTIPART_ENCRYPTED (multipart)) {
/* Don't index encrypted parts. */ /* Don't index encrypted parts, but index their content type. */
_index_content_type (message,
g_mime_multipart_get_part (multipart, i));
if ((i != GMIME_MULTIPART_ENCRYPTED_VERSION) &&
(i != GMIME_MULTIPART_ENCRYPTED_CONTENT)) {
_notmuch_database_log (_notmuch_message_database (message),
"Warning: Unexpected extra parts of multipart/encrypted.\n");
}
continue; continue;
} }
_index_mime_part (message, _index_mime_part (message,

1
test/T350-crypto.sh
View file

@ -236,7 +236,6 @@ test_expect_success \
"(mml-attach-file \"TESTATTACHMENT\") (mml-secure-message-encrypt)"' "(mml-attach-file \"TESTATTACHMENT\") (mml-secure-message-encrypt)"'
test_begin_subtest "encrypted part content-type indexing" test_begin_subtest "encrypted part content-type indexing"
test_subtest_known_broken
output=$(notmuch search mimetype:multipart/encrypted and mimetype:application/pgp-encrypted and mimetype:application/octet-stream | notmuch_search_sanitize) output=$(notmuch search mimetype:multipart/encrypted and mimetype:application/pgp-encrypted and mimetype:application/octet-stream | notmuch_search_sanitize)
test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message 001 (encrypted inbox)" test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message 001 (encrypted inbox)"