Changeset 05984a0 in mod_gnutls

Timestamp:

Dec 26, 2019, 3:47:10 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

0909c92

Parents:

006f91a

git-author:

Fiona Klute <fiona.klute@…> (12/26/19 03:38:34)

git-committer:

Fiona Klute <fiona.klute@…> (12/26/19 03:47:10)

Message:

Replace "runtests" with "runtest.py"

This is the next step from handling HTTP requests and responses in
Python. In particular error handling is a lot easier to do in Python
than using Bash trap functions.

Location:

test

Files:

• Makefile.am (modified) (5 diffs)
• mgstest/services.py (added)
• netns_py.bash (added)
• newtest (modified) (1 diff)
• runtest.py (added)
• runtests (deleted)
• test-00_basic.bash (modified) (1 diff)
• test-01_serverwide_priorities.bash (modified) (1 diff)
• test-02_cache_in_vhost.bash (modified) (1 diff)
• test-03_cachetimeout_in_vhost.bash (modified) (1 diff)
• test-04_basic_nosni.bash (modified) (1 diff)
• test-05_mismatched-priorities.bash (modified) (1 diff)
• test-06_verify_sni_a.bash (modified) (1 diff)
• test-07_verify_sni_b.bash (modified) (1 diff)
• test-08_verify_no_sni_fallback_to_first_vhost.bash (modified) (1 diff)
• test-09_verify_no_sni_fails_with_wrong_order.bash (modified) (1 diff)
• test-10_basic_client_verification.bash (modified) (1 diff)
• test-11_basic_client_verification_fail.bash (modified) (1 diff)
• test-12_cgi_variables.bash (modified) (1 diff)
• test-13_cgi_variables_no_client_cert.bash (modified) (1 diff)
• test-14_resume_session.bash (modified) (1 diff)
• test-15_basic_msva.bash (modified) (1 diff)
• test-16_view-status.bash (modified) (1 diff)
• test-17_cgi_vars_large_cert.bash (modified) (1 diff)
• test-18_client_verification_wrong_cert.bash (modified) (1 diff)
• test-19_TLS_reverse_proxy.bash (modified) (1 diff)
• test-20_TLS_reverse_proxy_client_auth.bash (modified) (1 diff)
• test-21_TLS_reverse_proxy_wrong_cert.bash (modified) (1 diff)
• test-22_TLS_reverse_proxy_crl_revoke.bash (modified) (1 diff)
• test-23_TLS_reverse_proxy_mismatched_priorities.bash (modified) (1 diff)
• test-24_pkcs11_cert.bash (modified) (1 diff)
• test-25_Disable_TLS_1.0.bash (modified) (1 diff)
• test-26_redirect_HTTP_to_HTTPS.bash (modified) (1 diff)
• test-27_OCSP_server.bash (modified) (1 diff)
• test-29_force_handshake_vhost.bash (modified) (1 diff)
• test-30_ip_based_vhosts.bash (modified) (1 diff)
• test-31_vhost_SNI_serveralias_match.bash (modified) (1 diff)
• test-32_vhost_SNI_serveralias_mismatch.bash (modified) (1 diff)
• test-33_vhost_SNI_serveralias_missinghost.bash (modified) (1 diff)
• test-34_TLS_reverse_proxy_h2.bash (modified) (1 diff)

test/Makefile.am

@@ -1 +1 @@
 SUBDIRS = tests
 
-dist_check_SCRIPTS = test-00_basic.bash \
+test_scripts = test-00_basic.bash \
         test-01_serverwide_priorities.bash \
         test-02_cache_in_vhost.bash \
@@ -17 +17 @@
         test-14_resume_session.bash
 if USE_MSVA
-dist_check_SCRIPTS += test-15_basic_msva.bash
-endif
-dist_check_SCRIPTS += test-16_view-status.bash \
+test_scripts += test-15_basic_msva.bash
+endif
+test_scripts += test-16_view-status.bash \
         test-17_cgi_vars_large_cert.bash \
         test-18_client_verification_wrong_cert.bash \
@@ -40 +40 @@
 
 TEST_EXTENSIONS = .bash
-TESTS = $(dist_check_SCRIPTS)
+TESTS = $(test_scripts)
+
+dist_check_SCRIPTS = netns_py.bash $(test_scripts)
 
 check_PROGRAMS = pgpcrc
@@ -56 +58 @@
 # Python tools for tests
 noinst_PYTHON = https-test-client.py mgstest/http.py mgstest/__init__.py \
-        mgstest/tests.py
+        mgstest/services.py mgstest/tests.py runtest.py
 
 # Identities in the miniature CA, server, and client environment for
@@ -252 +254 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
-        apache_service.bash common.bash runtests authority/server/crl.template \
+        apache_service.bash common.bash authority/server/crl.template \
         softhsm.bash
 

test/newtest

@@ -25 +25 @@
 # create run script for make check
 newscript="test-${newname}.bash"
-echo '#!/bin/bash' >"${newscript}"
-echo "\${srcdir}/runtests t-${newnum}" >>"${newscript}"
+cat - >"${newscript}" <<EOF
+#!/bin/bash
+. \${srcdir}/netns_py.bash \${srcdir}/runtest.py --test-number ${newnum}
+EOF
 chmod a+x "${newscript}"
 

test/test-00_basic.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-0
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 0

test/test-01_serverwide_priorities.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-1
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 1

test/test-02_cache_in_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-2
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 2

test/test-03_cachetimeout_in_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-3
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 3

test/test-04_basic_nosni.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-4
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 4

test/test-05_mismatched-priorities.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-5
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 5

test/test-06_verify_sni_a.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-6
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 6

test/test-07_verify_sni_b.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-7
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 7

test/test-08_verify_no_sni_fallback_to_first_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-8
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 8

test/test-09_verify_no_sni_fails_with_wrong_order.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-9
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 9

test/test-10_basic_client_verification.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-10
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 10

test/test-11_basic_client_verification_fail.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-11
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 11

test/test-12_cgi_variables.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-12
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 12

test/test-13_cgi_variables_no_client_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-13
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 13

test/test-14_resume_session.bash

@@ -1 +1 @@
 #!/bin/bash
 set -e
-${srcdir}/runtests t-14
+log="outputs/14_resume_session.log"
 
-t="$(basename ${0} .bash)"
-output="outputs/${t#test-}.output"
+${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 14 \
+        --log-connection "${log}"
+
 echo "Checking if the session was resumed successfully..."
 # NOTE: The "Resume Handshake was completed" message appears after the
 # second handshake is complete, whether the session has been resumed
 # or not. The following message is required!
-grep "This is a resumed session" "${output}"
+grep "This is a resumed session" "${log}"

test/test-15_basic_msva.bash

@@ -1 +1 @@
 #!/bin/bash
-USE_MSVA="yes" ${srcdir}/runtests t-15
+export USE_MSVA="yes"
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 15

test/test-16_view-status.bash

@@ -1 +1 @@
 #!/bin/bash
 set -e
-${srcdir}/runtests t-16
 
-# expected output file
+# expected output files
+log="outputs/16_view-status.log"
 output="outputs/16_view-status.output"
+
+${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 16 \
+         --log-connection "${log}" --log-responses "${output}"
+
 # get the cipher suite reported by gnutls-cli
-cli_suite="$(grep -o -P '(?<=^-\sDescription:\s).*$' "${output}")" || true
+cli_suite="$(grep -o -P '(?<=^-\sDescription:\s).*$' "${log}")" || true
 # extract cipher suite from the server status output
 status_suite="$(grep -o -P '(?<=^Current TLS session:\s).*$' "${output}")" \

test/test-17_cgi_vars_large_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-17
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 17

test/test-18_client_verification_wrong_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-18
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 18

test/test-19_TLS_reverse_proxy.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-19
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 19

test/test-20_TLS_reverse_proxy_client_auth.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-20
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 20

test/test-21_TLS_reverse_proxy_wrong_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-21
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 21

test/test-22_TLS_reverse_proxy_crl_revoke.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-22
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 22

test/test-23_TLS_reverse_proxy_mismatched_priorities.bash

@@ -5 +5 @@
 # back end server is configured not to use TLS 1.2. The proxy request
 # must fail and the client must receive an error message to pass.
-${srcdir}/runtests t-23
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 23

test/test-24_pkcs11_cert.bash

@@ -34 +34 @@
 set -e
 
-${srcdir}/runtests t-24
+${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 24
 
 cleanup_tmpconf

test/test-25_Disable_TLS_1.0.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-25
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 25

test/test-26_redirect_HTTP_to_HTTPS.bash

@@ -7 +7 @@
 export TEST_HTTP_PORT
 
-${srcdir}/runtests t-26
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 26

test/test-27_OCSP_server.bash

@@ -5 +5 @@
 [ -n "${OCSP_PORT}" ] || exit 77
 
-${srcdir}/runtests t-27
+log="outputs/27_OCSP_server.log"
+${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 27 \
+         --log-connection "${log}"
 ret=${?}
 
 echo "Checking if client actually got a stapled response."
-if grep -P "^- Options: .*OCSP status request," outputs/27_*.output; then
+if grep -P "^- Options: .*OCSP status request," "${log}"; then
     echo "OK"
 else

test/test-29_force_handshake_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-${srcdir}/runtests t-29
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 29

test/test-30_ip_based_vhosts.bash

@@ -21 +21 @@
 export TARGET_IP
 
-${srcdir}/runtests t-30
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 30

test/test-31_vhost_SNI_serveralias_match.bash

@@ -5 +5 @@
 
 require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
-${srcdir}/runtests t-31
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 31

test/test-32_vhost_SNI_serveralias_mismatch.bash

@@ -5 +5 @@
 
 require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
-${srcdir}/runtests t-32
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 32

test/test-33_vhost_SNI_serveralias_missinghost.bash

@@ -5 +5 @@
 
 require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
-${srcdir}/runtests t-33
+
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 33

test/test-34_TLS_reverse_proxy_h2.bash

@@ -6 +6 @@
     fi
 done
-${srcdir}/runtests t-34
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 34