Changeset 94430e6 in mod_gnutls
- Timestamp:
- Oct 10, 2017, 12:32:13 PM (5 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, master, proxy-ticket, upstream
- Children:
- e00d91a
- Parents:
- a09df8c
- Files:
-
- 1 added
- 8 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
ra09df8c r94430e6 292 292 AC_CONFIG_FILES([Makefile src/Makefile test/Makefile test/tests/Makefile \ 293 293 doc/Makefile doc/doxygen.conf include/mod_gnutls.h \ 294 test/proxy_backend.conf \294 test/proxy_backend.conf test/ocsp_server.conf \ 295 295 test/apache-conf/listen.conf \ 296 296 test/apache-conf/netns.conf]) -
test/.gitignore
ra09df8c r94430e6 1 1 cache 2 2 proxy_backend.conf 3 ocsp_server.conf 3 4 *~ 4 5 logs -
test/Makefile.am
ra09df8c r94430e6 194 194 apache_data = base_apache.conf cgi_module.conf data/dump.cgi data/ocsp.cgi \ 195 195 data/secret.txt data/test.txt ffdhe3072.pem mime.types \ 196 ocsp_server.confproxy_mods.conf196 proxy_mods.conf 197 197 198 198 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \ … … 204 204 # Lockfile for the proxy backend Apache process (if any) 205 205 backend_lockfile = ./backend.lock 206 # Lockfile for the OCSP server Apache process (if any) 207 ocsp_lockfile = ./ocsp.lock 206 208 207 209 # port for the main Apache server … … 245 247 export USE_TEST_NAMESPACE=1; 246 248 endif 247 # Without flock tests must not run in parallel. Otherwise set lock files. 249 # Without flock tests must not run in parallel, and PID files are used 250 # to prevent conflicts between server instances. Otherwise set lock 251 # files for flock. 248 252 if DISABLE_FLOCK 253 AM_TESTS_ENVIRONMENT += export TEST_LOCK="apache2.pid"; \ 254 export BACKEND_LOCK="backend.pid"; \ 255 export OCSP_LOCK="ocsp.pid"; 249 256 .NOTPARALLEL: 250 257 else 251 258 AM_TESTS_ENVIRONMENT += export FLOCK="@FLOCK@"; \ 252 259 export TEST_LOCK="$(test_lockfile)"; \ 253 export BACKEND_LOCK="$(backend_lockfile)"; 260 export BACKEND_LOCK="$(backend_lockfile)"; \ 261 export OCSP_LOCK="$(ocsp_lockfile)"; 254 262 endif 255 263 -
test/ocsp_server.conf.in
ra09df8c r94430e6 1 Define OCSP_PORT ${OCSP_PORT} 2 Define TEST_PORT ${OCSP_PORT} 3 4 Include ${srcdir}/base_apache.conf 5 1 6 Include ${srcdir}/cgi_module.conf 2 7 LoadModule env_module ${AP_LIBEXECDIR}/mod_env.so 3 8 LoadModule rewrite_module ${AP_LIBEXECDIR}/mod_rewrite.so 9 10 # separate log and PID file 11 CustomLog logs/${TEST_NAME}.ocsp.access.log combined 12 ErrorLog logs/${TEST_NAME}.ocsp.error.log 13 PidFile ocsp@PID_AFFIX@.pid 14 4 15 <IfDefine !OCSP_INDEX> 5 16 # Default index file, define OCSP_INDEX in the test specific -
test/proxy_backend.bash
ra09df8c r94430e6 10 10 export BACKEND_PORT="9934" 11 11 fi 12 : ${BACKEND_PID:="backend.pid"}13 12 : ${srcdir:="."} 14 13 : ${APACHE2:="apache2"} … … 21 20 conf="${2}" 22 21 action="${3}" 23 # needed only for start 22 # Needed only for start. The "lockfile" parameter is used as flock 23 # lock file or PID file to watch depending on whether FLOCK is 24 # set. 24 25 lockfile="${4}" 25 26 … … 39 40 else 40 41 echo "Locking disabled, using wait based on proxy PID file." 41 wait_pid_gone "${ BACKEND_PID}"42 wait_pid_gone "${lockfile}" 42 43 fi 43 44 ${flock_cmd} \ -
test/test-26_redirect_HTTP_to_HTTPS.bash
ra09df8c r94430e6 17 17 18 18 # "Proxy backend" functions are used to start the only instance needed 19 # here without "runtests". We have to override BACKEND_PID and 20 # BACKEND_PORT to make them match what a runtests-based test would 21 # use. 22 export BACKEND_PID="apache2.pid" 19 # here without "runtests". We have to override BACKEND_PORT to make it 20 # match what a runtests-based test would use. 23 21 export BACKEND_PORT="${TEST_PORT}" 24 22 function stop_backend -
test/test-27_OCSP_server.bash
ra09df8c r94430e6 4 4 # Skip if OCSP tests are not enabled 5 5 [ -n "${OCSP_PORT}" ] || exit 77 6 7 : ${srcdir:="."} 8 . ${srcdir}/common.bash 9 netns_reexec ${@} 10 11 . $(dirname ${0})/proxy_backend.bash 12 13 testdir="${srcdir}/tests/27_OCSP_server" 14 TEST_NAME="$(basename ${testdir})" 15 16 backend_apache "${testdir}" "ocsp.conf" start "${OCSP_LOCK}" 6 17 7 18 # trigger OCSP server test in the runtests script … … 12 23 ${srcdir}/runtests t-27 13 24 ret=${?} 25 26 backend_apache "${testdir}" "ocsp.conf" stop 14 27 15 28 echo "Checking if client actually got a stapled response." -
test/tests/27_OCSP_server/apache.conf
ra09df8c r94430e6 1 Define OCSP_PORT ${OCSP_PORT}2 3 1 Include ${srcdir}/base_apache.conf 4 Include ${srcdir}/ocsp_server.conf 5 GnuTLSCache dbm cache/gnutls_cache 2 GnuTLSCache dbm cache/gnutls_cache_${TEST_NAME} 6 3 7 4 <VirtualHost _default_:${TEST_PORT}> -
test/tests/Makefile.am
ra09df8c r94430e6 27 27 25_Disable_TLS_1.0/apache.conf 25_Disable_TLS_1.0/fail.client 25_Disable_TLS_1.0/gnutls-cli.args 25_Disable_TLS_1.0/input \ 28 28 26_redirect_HTTP_to_HTTPS/apache.conf \ 29 27_OCSP_server/apache.conf 27_OCSP_server/gnutls-cli.args 27_OCSP_server/input 27_OCSP_server/o utput29 27_OCSP_server/apache.conf 27_OCSP_server/gnutls-cli.args 27_OCSP_server/input 27_OCSP_server/ocsp.conf 27_OCSP_server/output
Note: See TracChangeset
for help on using the changeset viewer.