Changeset 0e069b6 in mod_gnutls

Timestamp:

Dec 7, 2019, 11:22:36 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

eb84747

Parents:

7054040

Message:

Support plain HTTP in the Python test framework

This makes it possible to run test 26 "redirect HTTP to HTTPS" without
an external HTTP client, the only thing still different from most
other tests is the TEST_HTTP_PORT environment variable.

Files:

• configure.ac (modified) (1 diff)
• test/mgstest/tests.py (modified) (3 diffs)
• test/test-26_redirect_HTTP_to_HTTPS.bash (modified) (1 diff)
• test/tests/26_redirect_HTTP_to_HTTPS/test.yml (added)
• test/tests/Makefile.am (modified) (1 diff)

configure.ac

@@ -217 +217 @@
 fi
 
-AC_PATH_PROGS([HTTP_CLI], [curl wget], [no])
+AC_PATH_PROGS([HTTP_CLI], [curl], [no])
 
 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${GNUTLS_FEAT_CFLAGS} ${MSVA_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES} ${STRICT_CFLAGS}"

test/mgstest/tests.py

@@ -27 +27 @@
 import yaml
 
+from enum import Enum, auto
+from http.client import HTTPConnection
 from string import Template
 
 from . import TestExpectationFailed
 from .http import HTTPSubprocessConnection
+
+class Transports(Enum):
+    GNUTLS = auto()
+    PLAIN = auto()
+
+    def __repr__(self):
+        return f'{self.__class__.__name__!s}.{self.name}'
 
 class TestConnection(yaml.YAMLObject):
@@ -50 +59 @@
         self.gnutls_params = gnutls_params
         self.actions = actions
-        self.transport = transport
+        self.transport = Transports[transport.upper()]
         if host:
             self.host = subst_env(host)
@@ -73 +82 @@
         command = command + ['-p', str(self.port), self.host]
 
-        conn = HTTPSubprocessConnection(command, self.host, self.port,
-                                        output_filter=filter_cert_log,
-                                        timeout=timeout)
+        if self.transport == Transports.GNUTLS:
+            conn = HTTPSubprocessConnection(command, self.host, self.port,
+                                            output_filter=filter_cert_log,
+                                            timeout=timeout)
+        elif self.transport == Transports.PLAIN:
+            conn = HTTPConnection(self.host, port=self.port,
+                                  timeout=timeout)
 
         try:

test/test-26_redirect_HTTP_to_HTTPS.bash

@@ -4 +4 @@
 # with "%{HTTPS}".
 
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/26_redirect_HTTP_to_HTTPS"
-TEST_NAME="$(basename ${testdir})"
-. $(dirname ${0})/apache_service.bash
-
 : ${TEST_HTTP_PORT:="9935"}
 export TEST_HTTP_PORT
 
-function stop_server
-{
-    apache_service "${testdir}" "apache.conf" stop
-}
-apache_service "${testdir}" "apache.conf" start "${TEST_LOCK}"
-trap stop_server EXIT
-
-output="outputs/${TEST_NAME}.output"
-rm -f "$output"
-
-# Send status request over HTTP. This should get redirected to HTTPS.
-URL="http://${TEST_HOST}:${TEST_HTTP_PORT}/status?auto"
-if [ "$(basename ${HTTP_CLI})" = "curl" ]; then
-    ${HTTP_CLI} --location --verbose --cacert authority/x509.pem "${URL}" \
-                >"${output}"
-elif [ "$(basename ${HTTP_CLI})" = "wget" ]; then
-    ${HTTP_CLI} --ca-certificate=authority/x509.pem -O "${output}" "${URL}"
-else
-    echo "No HTTP client (curl or wget) found, skipping." 2>&1
-    exit 77
-fi
-
-# If the request was redirected correctly, the status report lists the
-# used ciphersuite.
-grep "Current TLS session: (TLS" "${output}"
-
-stop_server
-trap - EXIT
+${srcdir}/runtests t-26

test/tests/Makefile.am

@@ -26 +26 @@
         24_pkcs11_cert/apache.conf 24_pkcs11_cert/test.yml \
         25_Disable_TLS_1.0/apache.conf 25_Disable_TLS_1.0/test.yml \
-        26_redirect_HTTP_to_HTTPS/apache.conf \
+        26_redirect_HTTP_to_HTTPS/apache.conf 26_redirect_HTTP_to_HTTPS/test.yml \
         27_OCSP_server/apache.conf 27_OCSP_server/ocsp.conf 27_OCSP_server/test.yml \
         28_HTTP2_support/apache.conf \