Changeset 849b87e in mod_gnutls

Timestamp:

Oct 30, 2018, 3:35:21 PM (3 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

0062ede

Parents:

04753db8

Message:

Test suite: Add support for IP-based virtual hosts

• Pass TEST_IP to the tests
• Add IP addresses to the server certificate
• Allow tests to access the server via an IP address instead of TEST_HOST

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/runtests (modified) (2 diffs)
• test/server.template.in (modified) (1 diff)
• test/test_ca.mk (modified) (1 diff)

configure.ac

@@ -252 +252 @@
                       "[::1] 127.0.0.1". Note that IPv6 addresses must be \
                       enclosed in square brackets.])
-AM_SUBST_NOTMAKE(TEST_IP)
 
 : ${TEST_LOCK_WAIT:="30"}

test/Makefile.am

@@ -253 +253 @@
         export AP_LIBEXECDIR=@AP_LIBEXECDIR@; \
         export TEST_LOCK_WAIT="@TEST_LOCK_WAIT@"; \
+        export TEST_IP="@TEST_IP@"; \
         export TEST_HOST="@TEST_HOST@"; \
         export TEST_PORT="$(TEST_PORT)"; \

test/runtests

@@ -217 +217 @@
 fi
 
+if [ -n "${TARGET_IP}" ]; then
+    TARGET="${TARGET_IP}"
+else
+    TARGET="${TEST_HOST}"
+fi
+
 # PID file for sleep command (explanation below)
 sleep_pidfile="$(mktemp mod_gnutls_test-XXXXXX.pid)"
@@ -232 +238 @@
 if (sed -r "s/__HOSTNAME__/${TEST_HOST}/;s/\r?$/\r/" <${testdir}/input && \
            run_with_pidfile "${sleep_pidfile}" sleep "${TEST_QUERY_TIMEOUT}" &) | \
-       gnutls-cli -p "${TEST_PORT}" $(cat ${testdir}/gnutls-cli.args) "${TEST_HOST}" \
+       gnutls-cli -p "${TEST_PORT}" $(cat ${testdir}/gnutls-cli.args) "${TARGET}" \
        | tee "$output" && test "${PIPESTATUS[1]}" -eq 0;
 then

test/server.template.in

@@ -6 +6 @@
 dns_name="__HOSTNAME__"
 ### ocsp_uri=http://__HOSTNAME__:__OCSP_PORT__/ocsp/
+__IP_ADDRESSES__

test/test_ca.mk

@@ -13 +13 @@
                         -e s/__OCSP_PORT__/$(OCSP_PORT)/ $@; \
         fi
+        for i in $$(echo $(TEST_IP)); do \
+                i="$${i%\]}"; \
+                IP_ADDRS="$${IP_ADDRS}\nip_address = $${i#\[}"; \
+        done; \
+        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS}," $@
 
 %.uid: $(srcdir)/%.uid.in