Changeset ff039b1 in mod_gnutls

Timestamp:

Jan 9, 2020, 3:03:14 PM (10 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

478767a

Parents:

60ed7d1

Message:

Test suite: Replace softhsm.bash with Python code

With this all test scripts only call runtest.py.

Location:

test

Files:

• Makefile.am (modified) (2 diffs)
• mgstest/softhsm.py (added)
• softhsm-init.py (added)
• softhsm.bash (deleted)
• test-24_pkcs11_cert.bash (modified) (1 diff)
• test_ca.mk (modified) (1 diff)
• tests/24_pkcs11_cert/hooks.py (added)
• tests/Makefile.am (modified) (1 diff)

test/Makefile.am

@@ -60 +60 @@
 # Python tools for tests
 noinst_PYTHON = https-test-client.py mgstest/http.py mgstest/__init__.py \
-        mgstest/hooks.py mgstest/services.py mgstest/tests.py runtest.py \
-        doctest-mgstest.py
+        mgstest/hooks.py mgstest/services.py mgstest/softhsm.py \
+        mgstest/tests.py runtest.py softhsm-init.py doctest-mgstest.py
 
 # Identities in the miniature CA, server, and client environment for
@@ -249 +249 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
-        authority/server/crl.template softhsm.bash $(test_doc)
+        authority/server/crl.template $(test_doc)
 
 # Lockfile for the main Apache process

test/test-24_pkcs11_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-
-testdir="$(dirname ${0})/tests/24_pkcs11_cert"
-
-# The Apache/SoftHSM configuration mixes up directories, so generate
-# config files with absolute paths to the token database from a
-# template. Generating them on every run avoids problems if the source
-# tree was moved.
-tmp_softhsm_conf="$(mktemp mod_gnutls_test-XXXXXX.conf)"
-function cleanup_tmpconf
-{
-    rm "${tmp_softhsm_conf}"
-}
-trap cleanup_tmpconf EXIT
-
-cat - >"${tmp_softhsm_conf}" <<EOF
-objectstore.backend = file
-directories.tokendir = $(realpath $(pwd))/authority/server/softhsm2.db
-EOF
-export SOFTHSM2_CONF="${tmp_softhsm_conf}"
-
-echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"
-cat "${tmp_softhsm_conf}"
-
-. $(dirname ${0})/softhsm.bash
-
-set -e
-
-${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 24
-
-cleanup_tmpconf
-trap - EXIT
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number 24

test/test_ca.mk

@@ -85 +85 @@
         $(cert_rule)
 
-%/softhsm2.conf: %/secret.key
-        echo "objectstore.backend = file" > $@
-        echo "directories.tokendir = $(dir $@)softhsm2.db" >> $@
-
-%/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf
-        rm -rf $@
-        mkdir -p $@
+%/softhsm2.db: %/x509.pem %/secret.key
         SOFTHSM="$(SOFTHSM)" \
-        SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \
-        $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+        $(PYTHON) $(srcdir)/softhsm-init.py --token-dir $@ --privkey $(dir $@)secret.key --certificate $(dir $@)x509.pem
 
 # Generate CRL revoking a certain certificate. Currently used to

test/tests/Makefile.am

@@ -24 +24 @@
         22_TLS_reverse_proxy_crl_revoke/apache.conf 22_TLS_reverse_proxy_crl_revoke/backend.conf 22_TLS_reverse_proxy_crl_revoke/test.yml \
         23_TLS_reverse_proxy_mismatched_priorities/apache.conf 23_TLS_reverse_proxy_mismatched_priorities/backend.conf 23_TLS_reverse_proxy_mismatched_priorities/test.yml \
-        24_pkcs11_cert/apache.conf 24_pkcs11_cert/test.yml \
+        24_pkcs11_cert/apache.conf 24_pkcs11_cert/hooks.py 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/test.yml \