From 6ef7d2f82093d5f2cf242dd307bb5dd20a81feb9 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 16 Aug 2015 19:41:13 +0200 Subject: [PATCH] [PATCH 5/8] test: add broken S/MIME signature verification test for notmuch CLI --- a9/bb6dd66321625c38713070d7db82ff635a7ff5 | 145 ++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 a9/bb6dd66321625c38713070d7db82ff635a7ff5 diff --git a/a9/bb6dd66321625c38713070d7db82ff635a7ff5 b/a9/bb6dd66321625c38713070d7db82ff635a7ff5 new file mode 100644 index 000000000..decd8a675 --- /dev/null +++ b/a9/bb6dd66321625c38713070d7db82ff635a7ff5 @@ -0,0 +1,145 @@ +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 4D8676DE1416 + for ; Sun, 16 Aug 2015 10:42:41 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.128 +X-Spam-Level: +X-Spam-Status: No, score=0.128 tagged_above=-999 required=5 tests=[AWL=0.118, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] 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 R_t8sj54do2y for ; + Sun, 16 Aug 2015 10:42:39 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 811356DE01D3 + for ; Sun, 16 Aug 2015 10:42:39 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZR1wT-0003c7-BA; Sun, 16 Aug 2015 17:41:57 +0000 +Received: (nullmailer pid 26315 invoked by uid 1000); Sun, 16 Aug 2015 + 17:41:28 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 5/8] test: add broken S/MIME signature verification test for + notmuch CLI +Date: Sun, 16 Aug 2015 19:41:13 +0200 +Message-Id: <1439746876-23654-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.5.0 +In-Reply-To: <1439746876-23654-1-git-send-email-david@tethera.net> +References: <54CA467B.30408@gnome.org> + <1439746876-23654-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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, 16 Aug 2015 17:42:41 -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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-lib.sh | 1 + + 2 files changed, 51 insertions(+) + +diff --git a/test/T355-smime.sh b/test/T355-smime.sh +index 5f3ff12..b3cc76e 100755 +--- a/test/T355-smime.sh ++++ b/test/T355-smime.sh +@@ -3,7 +3,17 @@ + test_description='S/MIME signature verification and decryption' + . ./test-lib.sh + ++add_gpgsm_home () ++{ ++ local output ++ [ -d ${GNUPGHOME} ] && return ++ mkdir -m 0700 "$GNUPGHOME" ++ gpgsm --no-tty --import < test_suite.pem >"$GNUPGHOME"/import.log 2>&1 ++ test_debug "cat $GNUPGHOME/import.log" ++} ++ + test_require_external_prereq openssl ++test_require_external_prereq gpgsm + + test_begin_subtest "Generate CA Cert" + openssl genpkey -algorithm RSA -out ca.key -pass pass:test -des3 1024 +@@ -21,6 +31,10 @@ openssl x509 -req -in smime.csr -passin pass:test -CA ca.crt -CAkey ca.key -set_ + cat test_suite.crt smime.key > test_suite.pem + test_expect_equal "$(openssl verify -purpose smimesign -CAfile ca.crt test_suite.pem)" "test_suite.pem: OK" + ++add_gpgsm_home ++ ++FINGERPRINT=$(openssl x509 -fingerprint -in test_suite.crt -noout | sed -e 's/^.*=//' -e s/://g) ++ + test_expect_success 'emacs delivery of S/MIME signed message' \ + 'emacs_fcc_message \ + "test signed message 001" \ +@@ -41,6 +55,42 @@ Verification successful + EOF + test_expect_equal_file OUTPUT EXPECTED + ++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": 1930, ++ "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 198d2bb..dff8c7a 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -1320,4 +1320,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.5.0 + -- 2.26.2