From 4057734c333f8b7e914f8029aed9230b26c406d8 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Thu, 25 Jun 2015 16:05:25 +0000
Subject: [PATCH] Add integrations tests for CSR.

---
 examples/generate-csr.sh     |  6 +++---
 tests/boulder-integration.sh | 38 +++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/examples/generate-csr.sh b/examples/generate-csr.sh
index c63f3c2d1..617319c3d 100755
--- a/examples/generate-csr.sh
+++ b/examples/generate-csr.sh
@@ -17,12 +17,12 @@ do
   domains="$domains,DNS:$x"
 done
 
-SAN="$domains" openssl req -config openssl.cnf \
+SAN="$domains" openssl req -config "${OPENSSL_CNF:-openssl.cnf}" \
   -new -nodes -subj '/' -reqexts san \
-  -out csr.der \
+  -out "${CSR_PATH:-csr.der}" \
   -keyout key.pem \
   -newkey rsa:2048 \
   -outform DER
 # 512 or 1024 too low for Boulder, 2048 is smallest for tests
 
-echo "You can now run: letsencrypt auth --csr csr.der"
+echo "You can now run: letsencrypt auth --csr ${CSR_PATH:-csr.der}"
diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh
index adb6ab528..fd4c27beb 100755
--- a/tests/boulder-integration.sh
+++ b/tests/boulder-integration.sh
@@ -6,17 +6,27 @@
 root="$(mktemp -d)"
 echo "\nRoot integration tests directory: $root"
 
-# first three flags required, rest is handy defaults
-letsencrypt \
-  --server http://localhost:4000/acme/new-reg \
-  --no-verify-ssl \
-  --dvsni-port 5001 \
-  --config-dir "$root/conf" \
-  --work-dir "$root/work" \
-  --text \
-  --agree-eula \
-  --email "" \
-  --domains le.wtf \
-  --authenticator standalone \
-  -vvvvvvv \
-  auth
+common() {
+    # first three flags required, rest is handy defaults
+    letsencrypt \
+        --server http://localhost:4000/acme/new-reg \
+        --no-verify-ssl \
+        --dvsni-port 5001 \
+        --config-dir "$root/conf" \
+        --work-dir "$root/work" \
+        --text \
+        --agree-eula \
+        --email "" \
+        --authenticator standalone \
+        -vvvvvvv "$@"
+}
+
+common --domains le.wtf auth
+
+export CSR_PATH="${root}/csr.der" OPENSSL_CNF=examples/openssl.cnf
+./examples/generate-csr.sh le.wtf
+common auth --csr "$CSR_PATH" \
+       --cert-path "${root}/csr/cert.pem" \
+       --chain-path "${root}/csr/chain.pem"
+openssl x509 -in "${root}/csr/0000_cert.pem" -text
+openssl x509 -in "${root}/csr/0000_chain.pem" -text