From 44d67e914639637490704d17b8d332440628267d Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 1 Feb 2016 15:39:59 +1900 Subject: [PATCH] [PATCH v3 14/16] test indexing cleartext version of delivered messages. --- 6d/954c42a740e11d820752c26b2571b52aa55ab7 | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 6d/954c42a740e11d820752c26b2571b52aa55ab7 diff --git a/6d/954c42a740e11d820752c26b2571b52aa55ab7 b/6d/954c42a740e11d820752c26b2571b52aa55ab7 new file mode 100644 index 000000000..b936dff0f --- /dev/null +++ b/6d/954c42a740e11d820752c26b2571b52aa55ab7 @@ -0,0 +1,191 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 438816DE1B8B + for ; Sun, 31 Jan 2016 12:40:21 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ua34pvW6G1oy for ; + Sun, 31 Jan 2016 12:40:19 -0800 (PST) +Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108]) + by arlo.cworth.org (Postfix) with ESMTP id 9A62B6DE1ACD + for ; Sun, 31 Jan 2016 12:40:09 -0800 (PST) +Received: from fifthhorseman.net (ip-64-134-185-108.public.wayport.net + [64.134.185.108]) + by che.mayfirst.org (Postfix) with ESMTPSA id E9615F9A4 + for ; Sun, 31 Jan 2016 15:40:06 -0500 (EST) +Received: by fifthhorseman.net (Postfix, from userid 1000) + id 6198E211A2; Sun, 31 Jan 2016 15:40:06 -0500 (EST) +From: Daniel Kahn Gillmor +To: Notmuch Mail +Subject: [PATCH v3 14/16] test indexing cleartext version of delivered + messages. +Date: Sun, 31 Jan 2016 15:39:59 -0500 +Message-Id: <1454272801-23623-15-git-send-email-dkg@fifthhorseman.net> +X-Mailer: git-send-email 2.7.0.rc3 +In-Reply-To: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net> +References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 31 Jan 2016 20:40:21 -0000 + +This requires a bit of reorganization: + + * add_gnupg_home gets moved to test-lib.sh, and + + * we allow passing --long-arguments to "notmuch new" via + emacs_fcc_message +--- + test/T350-crypto.sh | 15 --------------- + test/T357-index-decryption.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ + test/test-lib.sh | 26 +++++++++++++++++++++++++- + 3 files changed, 67 insertions(+), 16 deletions(-) + create mode 100755 test/T357-index-decryption.sh + +diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh +index 4bc15bc..50cc526 100755 +--- a/test/T350-crypto.sh ++++ b/test/T350-crypto.sh +@@ -7,21 +7,6 @@ + test_description='PGP/MIME signature verification and decryption' + . ./test-lib.sh || exit 1 + +-add_gnupg_home () +-{ +- local output +- [ -d ${GNUPGHOME} ] && return +- mkdir -m 0700 "$GNUPGHOME" +- $GPG --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 +- test_debug "cat $GNUPGHOME/import.log" +- if ($GPG --quick-random --version >/dev/null 2>&1) ; then +- echo quick-random >> "$GNUPGHOME"/gpg.conf +- elif ($GPG --debug-quick-random --version >/dev/null 2>&1) ; then +- echo debug-quick-random >> "$GNUPGHOME"/gpg.conf +- fi +- echo no-emit-version >> "$GNUPGHOME"/gpg.conf +-} +- + ################################################## + + add_gnupg_home +diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh +new file mode 100755 +index 0000000..03e49cc +--- /dev/null ++++ b/test/T357-index-decryption.sh +@@ -0,0 +1,42 @@ ++#!/usr/bin/env bash ++ ++# TODO: test index-decryption-failed ++ ++test_description='indexing decrypted mail' ++. ./test-lib.sh || exit 1 ++ ++################################################## ++ ++add_gnupg_home ++# get key fingerprint ++FINGERPRINT=$($GPG --no-tty --list-secret-keys --with-colons --fingerprint | grep '^fpr:' | cut -d: -f10) ++ ++# create a test encrypted message ++test_expect_success 'emacs delivery of encrypted message' \ ++'emacs_fcc_message \ ++ "test encrypted message for cleartext index 001" \ ++ "This is a test encrypted message with a wumpus.\n" \ ++ "(mml-secure-message-encrypt)"' ++ ++test_begin_subtest "search for unindexed cleartext" ++output=$(notmuch search wumpus) ++expected='' ++test_expect_equal \ ++ "$output" \ ++ "$expected" ++ ++# create a test encrypted message that is indexed in the clear ++test_expect_success 'emacs delivery of encrypted message' \ ++'emacs_fcc_message --try-decrypt \ ++ "test encrypted message for cleartext index 002" \ ++ "This is a test encrypted message with a wumpus.\n" \ ++ "(mml-secure-message-encrypt)"' ++ ++test_begin_subtest "emacs delivery of encrypted message, indexed cleartext" ++output=$(notmuch search wumpus) ++expected='thread:0000000000000002 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox index-decrypted)' ++test_expect_equal \ ++ "$output" \ ++ "$expected" ++ ++test_done +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 8c1f3c6..1fea6c7 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -92,6 +92,21 @@ else + GPG=gpg + fi + ++add_gnupg_home () ++{ ++ local output ++ [ -d ${GNUPGHOME} ] && return ++ mkdir -m 0700 "$GNUPGHOME" ++ $GPG --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 ++ test_debug "cat $GNUPGHOME/import.log" ++ if ($GPG --quick-random --version >/dev/null 2>&1) ; then ++ echo quick-random >> "$GNUPGHOME"/gpg.conf ++ elif ($GPG --debug-quick-random --version >/dev/null 2>&1) ; then ++ echo debug-quick-random >> "$GNUPGHOME"/gpg.conf ++ fi ++ echo no-emit-version >> "$GNUPGHOME"/gpg.conf ++} ++ + # Convenience + # + # A regexp to match 5 and 40 hexdigits +@@ -514,8 +529,17 @@ emacs_deliver_message () + # Accepts arbitrary extra emacs/elisp functions to modify the message + # before sending, which is useful to doing things like attaching files + # to the message and encrypting/signing. ++# ++# If any GNU-style long-arguments (like --quiet or --try-decrypt) are ++# at the head of the argument list, they are sent directly to "notmuch ++# new" after message delivery + emacs_fcc_message () + { ++ local nmn_args='' ++ while [[ "$1" =~ ^-- ]]; do ++ nmn_args="$nmn_args $1" ++ shift ++ done + local subject="$1" + local body="$2" + shift 2 +@@ -534,7 +558,7 @@ emacs_fcc_message () + (insert \"${body}\") + $@ + (notmuch-mua-send-and-exit))" || return 1 +- notmuch new >/dev/null ++ notmuch new $nmn_args >/dev/null + } + + # Generate a corpus of email and add it to the database. +-- +2.7.0.rc3 + -- 2.26.2