Merge branch 'master' into save-more-hooks

tests/boulder-integration.sh

@@ -33,6 +33,23 @@ common() {
         "$@"
 }
 
+CheckHooks() {
+    EXPECTED="/tmp/expected$$"
+    echo "wtf.pre" > "$EXPECTED"
+    echo "wtf2.pre" >> "$EXPECTED"
+    echo "renew" >> "$EXPECTED"
+    echo "renew" >> "$EXPECTED"
+    echo "wtf.post" > "$EXPECTED"
+    echo "wtf2.post" >> "$EXPECTED"
+    if cmp --quiet "$EXPECTED" "$HOOK_TEST" ; then
+        echo Hooks did not run as expected\; got
+        cat "$HOOK_TEST"
+        echo Expected
+        cat "$EXPECTED"
+    fi
+    [ -f "$HOOK_TEST" ] && rm -f "$HOOK_TEST"
+}
+
 # We start a server listening on the port for the
 # unrequested challenge to prevent regressions in #3601.
 python -m SimpleHTTPServer $http_01_port &
@@ -52,26 +69,14 @@ common --domains le2.wtf --preferred-challenges http-01 run \
        --renew-hook 'echo renew >> "$HOOK_TEST"'
 kill $python_server_pid
 
-common -a manual -d le.wtf auth --rsa-key-size 4096 \
-       --pre-hook 'echo wtf2.pre >> "$HOOK_TEST"' \
-       --post-hook 'echo wtf2.post >> "$HOOK_TEST"'
+common certonly -a manual -d le.wtf --rsa-key-size 4096 \
+    --manual-auth-hook ./tests/manual-http-auth.sh \
+    --manual-cleanup-hook ./tests/manual-http-cleanup.sh
+    --pre-hook 'echo wtf2.pre >> "$HOOK_TEST"' \
+    --post-hook 'echo wtf2.post >> "$HOOK_TEST"'
 
-CheckHooks() {
-    EXPECTED="/tmp/expected$$"
-    echo "wtf.pre" > "$EXPECTED"
-    echo "wtf2.pre" >> "$EXPECTED"
-    echo "renew" >> "$EXPECTED"
-    echo "renew" >> "$EXPECTED"
-    echo "wtf.post" > "$EXPECTED"
-    echo "wtf2.post" >> "$EXPECTED"
-    if cmp --quiet "$EXPECTED" "$HOOK_TEST" ; then
-        echo Hooks did not run as expected\; got
-        cat "$HOOK_TEST"
-        echo Expected
-        cat "$EXPECTED"
-    fi
-    [ -f "$HOOK_TEST" ] && rm -f "$HOOK_TEST"
-}
+common certonly -a manual -d dns.le.wtf --preferred-challenges dns-01 \
+    --manual-auth-hook ./tests/manual-dns-auth.sh
 
 export CSR_PATH="${root}/csr.der" KEY_PATH="${root}/key.pem" \
        OPENSSL_CNF=examples/openssl.cnf

tests/display.py

@@ -18,5 +18,5 @@ def test_visual(displayer, choices):
 
 
 if __name__ == "__main__":
-    displayer = util.FileDisplay(sys.stdout):
+    displayer = util.FileDisplay(sys.stdout, False)
     test_visual(displayer, util_test.CHOICES)

tests/integration/_common.sh

@@ -25,7 +25,7 @@ certbot_test_no_force_renew () {
         --no-verify-ssl \
         --tls-sni-01-port $tls_sni_01_port \
         --http-01-port $http_01_port \
-        --manual-test-mode \
+        --manual-public-ip-logging-ok \
         $store_flags \
         --non-interactive \
         --no-redirect \

tests/manual-dns-auth.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+curl -X POST 'http://localhost:8055/set-txt' -d \
+    "{\"host\": \"_acme-challenge.$CERTBOT_DOMAIN.\", \
+     \"value\": \"$CERTBOT_VALIDATION\"}"

tests/manual-http-auth.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+uri_path=".well-known/acme-challenge/$CERTBOT_TOKEN"
+
+cd $(mktemp -d)
+mkdir -p $(dirname $uri_path)
+echo $CERTBOT_VALIDATION > $uri_path
+python -m SimpleHTTPServer $http_01_port >/dev/null 2>&1 &
+server_pid=$!
+while ! curl "http://localhost:$http_01_port/$uri_path" >/dev/null 2>&1; do
+    sleep 1s
+done
+echo $server_pid

tests/manual-http-cleanup.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+kill $CERTBOT_AUTH_OUTPUT