unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: Jameson Graef Rollins <jrollins@finestructure.net>,
	Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 3/4] test: add S/MIME signature verification test for notmuch CLI
Date: Sat, 17 Jan 2015 11:51:45 +0100	[thread overview]
Message-ID: <1421491906-14542-4-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1421491906-14542-1-git-send-email-david@tethera.net>

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 01f6ecd..fbcf323 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" \
@@ -38,4 +52,39 @@ This is a test signed message.
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
+test_begin_subtest "signature verification (notmuch CLI)"
+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 <test_suite@notmuchmail.org>",
+ "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_done
diff --git a/test/test-lib.sh b/test/test-lib.sh
index a5428bb..98a5f54 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1303,3 +1303,4 @@ test_declare_external_prereq gpg
 test_declare_external_prereq python
 test_declare_external_prereq python2
 test_declare_external_prereq openssl
+test_declare_external_prereq gpgsm
-- 
2.1.4

  parent reply	other threads:[~2015-01-17 10:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-29 18:38 S/MIME support Jameson Graef Rollins
2012-06-29 18:38 ` [PATCH 1/2] cli: S/MIME verification/decryption support Jameson Graef Rollins
2012-06-29 18:38   ` [PATCH 2/2] debian: Recommend gpgsm for S/MIME support Jameson Graef Rollins
2012-07-09 18:33 ` Bryant, Daniel B.
2012-07-10  7:40   ` Jameson Graef Rollins
2012-08-31 19:50     ` David Bremner
2014-03-17  4:52 ` S/MIME support, rebased Jameson Graef Rollins
2014-03-17  4:52   ` [PATCH 1/2] cli: S/MIME verification/decryption support Jameson Graef Rollins
2014-03-17  4:52     ` [PATCH 2/2] debian: Recommend gpgsm for S/MIME support Jameson Graef Rollins
2014-07-01 10:55     ` [PATCH 1/2] cli: S/MIME verification/decryption support David Bremner
2014-07-06 17:36       ` Jameson Graef Rollins
2014-07-06 18:18         ` David Bremner
2015-01-17 10:51   ` SMIME patches v3, with some tests David Bremner
2015-01-17 10:51     ` [PATCH 1/4] test: initial tests for smime David Bremner
2015-01-17 10:51     ` [PATCH 2/4] cli: S/MIME verification/decryption support David Bremner
2015-01-17 10:51     ` David Bremner [this message]
2015-01-17 10:51     ` [PATCH 4/4] debian: Recommend gpgsm for S/MIME support David Bremner
2015-01-17 20:07     ` SMIME patches v3, with some tests Jameson Graef Rollins
2015-01-17 21:38       ` [PATCH] test: initial tests for smime David Bremner
2015-01-17 21:59         ` Jameson Graef Rollins
2015-01-17 22:29           ` David Bremner
2015-01-17 22:54             ` Jameson Graef Rollins

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=1421491906-14542-4-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=jrollins@finestructure.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).