Changeset 3e04c0b in mod_gnutls for test

Timestamp:

Nov 25, 2015, 4:01:02 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

a08b25e

Parents:

7225749

Message:

Test suite: Don't restrict IP addresses of virtual hosts

The IP addresses the servers started by the test suite listen on are
already restricted by the "Listen" statement in test/base_apache.conf,
so restricting individual virtual hosts only makes changes to those
addresses unnecessarily complicated.

Location:

test/tests

Files:

• 00_basic/apache.conf (modified) (1 diff)
• 01_serverwide_priorities/apache.conf (modified) (1 diff)
• 02_cache_in_vhost/apache.conf (modified) (1 diff)
• 03_cachetimeout_in_vhost/apache.conf (modified) (1 diff)
• 04_basic_nosni/apache.conf (modified) (1 diff)
• 05_mismatched-priorities/apache.conf (modified) (1 diff)
• 06_verify_sni_a/apache.conf (modified) (2 diffs)
• 07_verify_sni_b/apache.conf (modified) (2 diffs)
• 08_verify_no_sni_fallback_to_first_vhost/apache.conf (modified) (2 diffs)
• 09_verify_no_sni_fails_with_wrong_order/apache.conf (modified) (2 diffs)
• 10_basic_client_verification/apache.conf (modified) (1 diff)
• 11_basic_client_verification_fail/apache.conf (modified) (1 diff)
• 12_cgi_variables/apache.conf (modified) (1 diff)
• 13_cgi_variables_no_client_cert/apache.conf (modified) (1 diff)
• 14_basic_openpgp/apache.conf (modified) (1 diff)
• 15_basic_msva/apache.conf (modified) (1 diff)
• 16_view-status/apache.conf (modified) (1 diff)
• 17_cgi_vars_large_cert/apache.conf (modified) (1 diff)
• 18_client_verification_wrong_cert/apache.conf (modified) (1 diff)
• 19_TLS_reverse_proxy/apache.conf (modified) (1 diff)
• 19_TLS_reverse_proxy/backend.conf (modified) (1 diff)
• 20_TLS_reverse_proxy_client_auth/apache.conf (modified) (1 diff)
• 20_TLS_reverse_proxy_client_auth/backend.conf (modified) (1 diff)
• 21_TLS_reverse_proxy_wrong_cert/apache.conf (modified) (1 diff)
• 21_TLS_reverse_proxy_wrong_cert/backend.conf (modified) (1 diff)
• 22_TLS_reverse_proxy_crl_revoke/apache.conf (modified) (1 diff)
• 22_TLS_reverse_proxy_crl_revoke/backend.conf (modified) (1 diff)
• 23_TLS_reverse_proxy_mismatched_priorities/apache.conf (modified) (1 diff)
• 23_TLS_reverse_proxy_mismatched_priorities/backend.conf (modified) (1 diff)
• 24_pkcs11_cert/apache.conf (modified) (1 diff)

test/tests/00_basic/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/01_serverwide_priorities/apache.conf

@@ -5 +5 @@
 GnuTLSPriorities NORMAL
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/02_cache_in_vhost/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  # Cache configuration not allowed in here:
  GnuTLSCache dbm cache/gnutls_cache

test/tests/03_cachetimeout_in_vhost/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  # Cache configuration not allowed in here:
  GnuTLSCacheTimeout 200

test/tests/04_basic_nosni/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/05_mismatched-priorities/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/06_verify_sni_a/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-NameVirtualHost ${TEST_IP}:${TEST_PORT}
+NameVirtualHost _default_:${TEST_PORT}
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On
@@ -13 +13 @@
 </VirtualHost>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName imposter.example
  GnuTLSEnable On

test/tests/07_verify_sni_b/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-NameVirtualHost ${TEST_IP}:${TEST_PORT}
+NameVirtualHost _default_:${TEST_PORT}
 
 # trying in a different order from 06_verify_sni_a
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName imposter.example
  GnuTLSEnable On
@@ -15 +15 @@
 </VirtualHost>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/08_verify_no_sni_fallback_to_first_vhost/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-NameVirtualHost ${TEST_IP}:${TEST_PORT}
+NameVirtualHost _default_:${TEST_PORT}
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On
@@ -13 +13 @@
 </VirtualHost>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName imposter.example
  GnuTLSEnable On

test/tests/09_verify_no_sni_fails_with_wrong_order/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-NameVirtualHost ${TEST_IP}:${TEST_PORT}
+NameVirtualHost _default_:${TEST_PORT}
 
 # In this order, clients with no SNI should get the imposter's key
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName imposter.example
  GnuTLSEnable On
@@ -15 +15 @@
 </VirtualHost>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/10_basic_client_verification/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/11_basic_client_verification_fail/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/12_cgi_variables/apache.conf

@@ -8 +8 @@
 </Directory>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/13_cgi_variables_no_client_cert/apache.conf

@@ -8 +8 @@
 </Directory>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/14_basic_openpgp/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/15_basic_msva/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/16_view-status/apache.conf

@@ -9 +9 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/17_cgi_vars_large_cert/apache.conf

@@ -8 +8 @@
 </Directory>
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/18_client_verification_wrong_cert/apache.conf

@@ -3 +3 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/19_TLS_reverse_proxy/apache.conf

@@ -4 +4 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/19_TLS_reverse_proxy/backend.conf

@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${BACKEND_IP}:${BACKEND_PORT}>
+<VirtualHost _default_:${BACKEND_PORT}>
  ServerName ${BACKEND_HOST}
  GnuTLSEnable On

test/tests/20_TLS_reverse_proxy_client_auth/apache.conf

@@ -4 +4 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/20_TLS_reverse_proxy_client_auth/backend.conf

@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${BACKEND_IP}:${BACKEND_PORT}>
+<VirtualHost _default_:${BACKEND_PORT}>
  ServerName ${BACKEND_HOST}
  GnuTLSEnable On

test/tests/21_TLS_reverse_proxy_wrong_cert/apache.conf

@@ -4 +4 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/21_TLS_reverse_proxy_wrong_cert/backend.conf

@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${BACKEND_IP}:${BACKEND_PORT}>
+<VirtualHost _default_:${BACKEND_PORT}>
  ServerName ${BACKEND_HOST}
  GnuTLSEnable On

test/tests/22_TLS_reverse_proxy_crl_revoke/apache.conf

@@ -4 +4 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/22_TLS_reverse_proxy_crl_revoke/backend.conf

@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${BACKEND_IP}:${BACKEND_PORT}>
+<VirtualHost _default_:${BACKEND_PORT}>
  ServerName ${BACKEND_HOST}
  GnuTLSEnable On

test/tests/23_TLS_reverse_proxy_mismatched_priorities/apache.conf

@@ -4 +4 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On

test/tests/23_TLS_reverse_proxy_mismatched_priorities/backend.conf

@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<VirtualHost ${BACKEND_IP}:${BACKEND_PORT}>
+<VirtualHost _default_:${BACKEND_PORT}>
  ServerName ${BACKEND_HOST}
  GnuTLSEnable On

test/tests/24_pkcs11_cert/apache.conf

@@ -5 +5 @@
 GnuTLSP11Module /usr/lib/softhsm/libsofthsm.so
 
-<VirtualHost ${TEST_IP}:${TEST_PORT}>
+<VirtualHost _default_:${TEST_PORT}>
  ServerName ${TEST_HOST}
  GnuTLSEnable On