Merge the manual and script plugins (#3890)

* Start of combined manual/script plugin

* Return str from hooks.execute, not bytes

* finish manual/script rewrite

* delete old manual and script plugins

* manually specify we want chall.token

* use consistent quotes

* specify chall for uri

* s/script/hook

* fix spacing on instructions

* remove unneeded response argument

* make achall more helpful

* simplify perform

* remove old test files

* add start of manual_tests

* fix ParseTest.test_help

* stop using manual_test_mode in cli tests

* Revert "make achall more helpful"

This reverts commit 54b01cea30167065e3682834a71144b81e96c07f.

* use bad response/validation methods on achalls

* simplify perform and cleanup environment

* finish manual tests

* Add HTTP manual hook integration test

* add manual http scripts

* Add manual DNS script integration test

* remove references to the script plugin

* they're hooks, not scripts

* add --manual-public-ip-logging-ok to integration tests

* use --pref-chall for dns integration

* does dns work?

* validate hooks

* test hook validation

* Revert "does dns work?"

This reverts commit 1224cc2961b35a2b8e9e5d2ca3af7c081161b22a.

* busy wait in manual-http-auth

* remove DNS script test for now

* Fix challenge prefix and add trailing .

* Add comment about universal_newlines

* Fix typo from 0464ba2c4

* fix nits and typos

* Generalize HookCOmmandNotFound error

* Add verify_exe_exists

* Don't duplicate code in hooks.py

* Revert changes to hooks.py

* Use consistent hook error messages

5 files changed, 25 insertions, 2 deletions

diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh
index a70f13f8e..e7975454b 100755
--- a/tests/boulder-integration.sh
+++ b/tests/boulder-integration.sh
@@ -44,7 +44,12 @@ python_server_pid=$!
 common --domains le2.wtf --preferred-challenges http-01 run
 kill $python_server_pid
 
-common -a manual -d le.wtf auth --rsa-key-size 4096
+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
+
+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
diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh
index 8d01ad763..12924fe21 100755
--- a/tests/integration/_common.sh
+++ b/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 \
diff --git a/tests/manual-dns-auth.sh b/tests/manual-dns-auth.sh
new file mode 100755
index 000000000..9b9a1a5eb
--- /dev/null
+++ b/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\"}"
diff --git a/tests/manual-http-auth.sh b/tests/manual-http-auth.sh
new file mode 100755
index 000000000..c4730392b
--- /dev/null
+++ b/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
diff --git a/tests/manual-http-cleanup.sh b/tests/manual-http-cleanup.sh
new file mode 100755
index 000000000..5e437bf08
--- /dev/null
+++ b/tests/manual-http-cleanup.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+kill $CERTBOT_AUTH_OUTPUT