From f127bae9cd50c5c92e14e7611d2a034c4feee40c Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 25 Jan 2016 12:21:16 +2000 Subject: [PATCH] [Patch v4 2/5] test: add broken S/MIME signature verification test for notmuch CLI --- 96/ec71a7c9e8469f3a9ed8511669ab6f375ffa22 | 142 ++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 96/ec71a7c9e8469f3a9ed8511669ab6f375ffa22 diff --git a/96/ec71a7c9e8469f3a9ed8511669ab6f375ffa22 b/96/ec71a7c9e8469f3a9ed8511669ab6f375ffa22 new file mode 100644 index 000000000..5dc2ef77c --- /dev/null +++ b/96/ec71a7c9e8469f3a9ed8511669ab6f375ffa22 @@ -0,0 +1,142 @@ +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 62B356DE025F + for ; Sun, 24 Jan 2016 08:21:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.309 +X-Spam-Level: +X-Spam-Status: No, score=-0.309 tagged_above=-999 required=5 tests=[AWL=0.242, + RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 Qeg4Q8ow3x4h for ; + Sun, 24 Jan 2016 08:21:29 -0800 (PST) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id 49C966DE02DA + for ; Sun, 24 Jan 2016 08:21:28 -0800 (PST) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84) + (envelope-from ) + id 1aNNPF-0002N6-28; Sun, 24 Jan 2016 11:20:49 -0500 +Received: (nullmailer pid 16068 invoked by uid 1000); + Sun, 24 Jan 2016 16:21:25 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v4 2/5] test: add broken S/MIME signature verification test + for notmuch CLI +Date: Sun, 24 Jan 2016 12:21:16 -0400 +Message-Id: <1453652479-15968-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.6.4 +In-Reply-To: <1453652479-15968-1-git-send-email-david@tethera.net> +References: <1453652479-15968-1-git-send-email-david@tethera.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, 24 Jan 2016 16:21:31 -0000 + +The test is pretty much cut and paste from the PGP/MIME version, with +obvious updates taken from notmuch output. This also requires setting +up gpgsm infrastucture. +--- + test/T355-smime.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-lib.sh | 1 + + 2 files changed, 50 insertions(+) + +diff --git a/test/T355-smime.sh b/test/T355-smime.sh +index a1b7c09..a059fac 100755 +--- a/test/T355-smime.sh ++++ b/test/T355-smime.sh +@@ -3,6 +3,17 @@ + test_description='S/MIME signature verification and decryption' + . ./test-lib.sh || exit 1 + ++add_gpgsm_home () ++{ ++ local fpr ++ [ -d ${GNUPGHOME} ] && return ++ mkdir -m 0700 "$GNUPGHOME" ++ gpgsm --no-tty --no-common-certs-import --disable-dirmngr --import < $TEST_DIRECTORY/smime/test.crt >"$GNUPGHOME"/import.log 2>&1 ++ fpr=$(gpgsm --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p') ++ echo "$fpr S relax" >> $GNUPGHOME/trustlist.txt ++ test_debug "cat $GNUPGHOME/import.log" ++} ++ + test_require_external_prereq openssl + test_require_external_prereq gpgsm + +@@ -10,6 +21,8 @@ cp $TEST_DIRECTORY/smime/key+cert.pem test_suite.pem + + FINGERPRINT=$(openssl x509 -fingerprint -in test_suite.pem -noout | sed -e 's/^.*=//' -e s/://g) + ++add_gpgsm_home ++ + test_expect_success 'emacs delivery of S/MIME signed message' \ + 'emacs_fcc_message \ + "test signed message 001" \ +@@ -30,6 +43,42 @@ Verification successful + EOF + test_expect_equal_file EXPECTED OUTPUT + ++test_begin_subtest "signature verification (notmuch CLI)" ++test_subtest_known_broken ++output=$(notmuch show --format=json --verify subject:"test signed message 001" \ ++ | notmuch_json_show_sanitize \ ++ | sed -e 's|"created": [-1234567890]*|"created": 946728000|' \ ++ -e 's|"expires": [-1234567890]*|"expires": 424242424|' ) ++expected='[[[{"id": "XXXXX", ++ "match": true, ++ "excluded": false, ++ "filename": "YYYYY", ++ "timestamp": 946728000, ++ "date_relative": "2000-01-01", ++ "tags": ["inbox","signed"], ++ "headers": {"Subject": "test signed message 001", ++ "From": "Notmuch Test Suite ", ++ "To": "test_suite@notmuchmail.org", ++ "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, ++ "body": [{"id": 1, ++ "sigstatus": [{"status": "good", ++ "fingerprint": "'$FINGERPRINT'", ++ "expires": 424242424, ++ "created": 946728000}], ++ "content-type": "multipart/signed", ++ "content": [{"id": 2, ++ "content-type": "text/plain", ++ "content": "This is a test signed message.\n"}, ++ {"id": 3, ++ "content-length": 1922, ++ "content-transfer-encoding": "base64", ++ "content-type": "application/x-pkcs7-signature", ++ "filename": "smime.p7s"}]}]}, ++ []]]]' ++test_expect_equal_json \ ++ "$output" \ ++ "$expected" ++ + test_begin_subtest "Decryption and signature verification (openssl)" + notmuch show --format=raw subject:"test encrypted message 001" |\ + openssl smime -decrypt -recip test_suite.pem |\ +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 41710e7..6b7854a 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -1329,4 +1329,5 @@ test_declare_external_prereq ${TEST_EMACSCLIENT} + test_declare_external_prereq gdb + test_declare_external_prereq gpg + test_declare_external_prereq openssl ++test_declare_external_prereq gpgsm + test_declare_external_prereq ${NOTMUCH_PYTHON} +-- +2.6.4 + -- 2.26.2