From d49d3f22536d5486e3ec73bbb9733f08d3ec9d46 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 27 Jan 2016 11:56:45 +0100 Subject: [PATCH] tests: fixed test-sighup-key-change to be able to cope with diffent build dir --- tests/Makefile.am | 2 +- tests/test-sighup-key-change | 15 ++- tests/test-sighup-key-change.config | 184 ++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 9 deletions(-) create mode 100644 tests/test-sighup-key-change.config diff --git a/tests/Makefile.am b/tests/Makefile.am index a3521933..f1f1bb08 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = ca-key.pem ca.pem common.sh server-cert.pem server-key.pem test1.co test-cookie-invalidation.config test-enc-key2.config test-enc-key.config \ server-key-ossl.pem server-key-p8.pem proxyproto-unix-test user-cn.pem \ user-cert-testuser.pem test-stress test-user-config.config user-config/testuser \ - test-cookie-rotation.config + test-cookie-rotation.config test-sighup-key-change.config SUBDIRS = docker-ocserv docker-kerberos diff --git a/tests/test-sighup-key-change b/tests/test-sighup-key-change index 13c7aab9..bf8a782d 100755 --- a/tests/test-sighup-key-change +++ b/tests/test-sighup-key-change @@ -39,22 +39,21 @@ encryption_key tls_www_server _EOF_ -update_config test-sighup.config +update_config test-sighup-key-change.config # changing server cert sed -i 's/server-cert.pem/'"${SERVER_CERT}"'/' "${CONFIG}" sed -i 's/server-key.pem/'"${SERVER_KEY}"'/' "${CONFIG}" -sed -i 's/4441/'$PORT'/' "${CONFIG}" -cp server-cert.pem "${SERVER_CERT}" -cp server-key.pem "${SERVER_KEY}" +cp "${srcdir}/server-cert.pem" "${SERVER_CERT}" +cp "${srcdir}/server-key.pem" "${SERVER_KEY}" -launch_simple_sr_server -d 1 -f -c ${CONFIG} +launch_simple_sr_server -d 1 -f -c "${CONFIG}" PID=$! wait_server $PID echo -n "Connecting to obtain cookie (with certificate)... " -( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey ${srcdir}/user-key.pem -c ${srcdir}/user-cert.pem --servercert="sha1:a82547f68f44d6351bef6cacd1d7b96e84f9dfa3" --cookieonly /dev/null 2>&1 ) || +( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey "${srcdir}/user-key.pem" -c "${srcdir}/user-cert.pem" --servercert="sha1:a82547f68f44d6351bef6cacd1d7b96e84f9dfa3" --cookieonly /dev/null 2>&1 ) || fail $PID "Could not connect with certificate!" echo ok @@ -68,7 +67,7 @@ kill -HUP $PID sleep 5 echo -n "Connecting to obtain cookie (with certificate)... " -( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey ${srcdir}/user-key.pem -c ${srcdir}/user-cert.pem --servercert="sha1:a82547f68f44d6351bef6cacd1d7b96e84f9dfa3" --cookieonly /dev/null 2>&1 ) || +( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey "${srcdir}/user-key.pem" -c "${srcdir}/user-cert.pem" --servercert="sha1:a82547f68f44d6351bef6cacd1d7b96e84f9dfa3" --cookieonly /dev/null 2>&1 ) || fail $PID "Could not connect with certificate!" echo ok @@ -83,7 +82,7 @@ kill -HUP $PID sleep 5 echo -n "Connecting to obtain cookie (with certificate)... " -( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey ${srcdir}/user-key.pem -c ${srcdir}/user-cert.pem --no-cert-check --cookieonly /dev/null 2>&1 ) || +( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey "${srcdir}/user-key.pem" -c "${srcdir}/user-cert.pem" --no-cert-check --cookieonly /dev/null 2>&1 ) || fail $PID "Could not connect with certificate!" echo ok diff --git a/tests/test-sighup-key-change.config b/tests/test-sighup-key-change.config new file mode 100644 index 00000000..d1269bdd --- /dev/null +++ b/tests/test-sighup-key-change.config @@ -0,0 +1,184 @@ +# User authentication method. Could be set multiple times and in that case +# all should succeed. +# Options: certificate, pam. +auth = "certificate" +#auth = "plain[@SRCDIR@/test1.passwd]" +#auth = "pam" + +# A banner to be displayed on clients +#banner = "Welcome" + +# Use listen-host to limit to specific IPs or to the IPs of a provided hostname. +#listen-host = [IP|HOSTNAME] + +use-dbus = no + +# Limit the number of clients. Unset or set to zero for unlimited. +#max-clients = 1024 +max-clients = 16 + +# Limit the number of client connections to one every X milliseconds +# (X is the provided value). Set to zero for no limit. +#rate-limit-ms = 100 + +# Limit the number of identical clients (i.e., users connecting multiple times) +# Unset or set to zero for unlimited. +max-same-clients = 2 + +# TCP and UDP port number +tcp-port = 4473 +udp-port = 4473 + +# Keepalive in seconds +keepalive = 32400 + +# Dead peer detection in seconds +dpd = 440 + +# MTU discovery (DPD must be enabled) +try-mtu-discovery = false + +# The key and the certificates of the server +# The key may be a file, or any URL supported by GnuTLS (e.g., +# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user +# or pkcs11:object=my-vpn-key;object-type=private) +# +# There may be multiple certificate and key pairs and each key +# should correspond to the preceding certificate. +server-cert = server-cert.pem +server-key = server-key.pem + +# Diffie-Hellman parameters. Only needed if you require support +# for the DHE ciphersuites (by default this server supports ECDHE). +# Can be generated using: +# certtool --generate-dh-params --outfile /path/to/dh.pem +#dh-params = /path/to/dh.pem + +# If you have a certificate from a CA that provides an OCSP +# service you may provide a fresh OCSP status response within +# the TLS handshake. That will prevent the client from connecting +# independently on the OCSP server. +# You can update this response periodically using: +# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response +# Make sure that you replace the following file in an atomic way. +#ocsp-response = /path/to/ocsp.der + +# In case PKCS #11 or TPM keys are used the PINs should be available +# in files. The srk-pin-file is applicable to TPM keys only (It's the storage +# root key). +#pin-file = /path/to/pin.txt +#srk-pin-file = /path/to/srkpin.txt + +# The Certificate Authority that will be used +# to verify clients if certificate authentication +# is set. +ca-cert = @SRCDIR@/ca.pem + +# The object identifier that will be used to read the user ID in the client certificate. +# The object identifier should be part of the certificate's DN +# Useful OIDs are: +# CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1 +cert-user-oid = 0.9.2342.19200300.100.1.1 + +# The object identifier that will be used to read the user group in the client +# certificate. The object identifier should be part of the certificate's DN +# Useful OIDs are: +# OU (organizational unit) = 2.5.4.11 +#cert-group-oid = 2.5.4.11 + +# A revocation list of ca-cert is set +#crl = crl.pem + +# GnuTLS priority string +tls-priorities = "PERFORMANCE:%SERVER_PRECEDENCE:%COMPAT" + +# To enforce perfect forward secrecy (PFS) on the main channel. +#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA" + +# The time (in seconds) that a client is allowed to stay connected prior +# to authentication +auth-timeout = 40 + +# The time (in seconds) that a client is not allowed to reconnect after +# a failed authentication attempt. +#min-reauth-time = 2 + +# Cookie validity time (in seconds) +# Once a client is authenticated he's provided a cookie with +# which he can reconnect. This option sets the maximum lifetime +# of that cookie. +cookie-validity = 172800 + +# Script to call when a client connects and obtains an IP +# Parameters are passed on the environment. +# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), +# DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP +# in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON +# may be "connect" or "disconnect". +#connect-script = /usr/bin/myscript +#disconnect-script = /usr/bin/myscript + +# UTMP +use-utmp = true + +# PID file +pid-file = ./ocserv.pid + +# The default server directory. Does not require any devices present. +#chroot-dir = /path/to/chroot + +# socket file used for IPC, will be appended with .PID +# It must be accessible within the chroot environment (if any) +socket-file = ./ocserv-socket + +# The user the worker processes will be run as. It should be +# unique (no other services run as this user). +run-as-user = nobody +run-as-group = daemon + +# Network settings + +device = vpns + +# The default domain to be advertised +default-domain = example.com + +ipv4-network = 192.168.1.0 +ipv4-netmask = 255.255.255.0 +# Use the keywork local to advertize the local P-t-P address as DNS server +dns = 192.168.1.1 + +# The NBNS server (if any) +#ipv4-nbns = 192.168.2.3 + +#ipv6-address = +#ipv6-mask = +#ipv6-dns = + +# Prior to leasing any IP from the pool ping it to verify that +# it is not in use by another (unrelated to this server) host. +ping-leases = false + +# Leave empty to assign the default MTU of the device +# mtu = + +route = 192.168.1.0/255.255.255.0 +#route = 192.168.5.0/255.255.255.0 + +# +# The following options are for (experimental) AnyConnect client +# compatibility. They are only available if the server is built +# with --enable-anyconnect +# + +# Client profile xml. A sample file exists in doc/profile.xml. +# This file must be accessible from inside the worker's chroot. +# The profile is ignored by the openconnect client. +#user-profile = profile.xml + +# Unless set to false it is required for clients to present their +# certificate even if they are authenticating via a previously granted +# cookie. Legacy CISCO clients do not do that, and thus this option +# should be set for them. +cisco-client-compat = true +