tests: Added check for certificate alternative name checking

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

tests/Makefile.am

@@ -18,7 +18,8 @@ EXTRA_DIST = certs/ca-key.pem certs/ca.pem common.sh certs/server-cert.pem \
 	certs/server-key-ossl.pem certs/server-key-p8.pem proxyproto-unix-test certs/user-cn.pem \
 	certs/user-cert-testuser.pem test-stress data/test-user-config.config user-config/testuser \
 	data/test-sighup-key-change.config data/test-sighup-key-change.config user-config/testipnet \
-	certs/user-cert-testipnet.pem certs/user-cert-invalid.pem certs/server-cert-ca.pem
+	certs/user-cert-testipnet.pem certs/user-cert-invalid.pem certs/server-cert-ca.pem \
+	data/test-san-cert.config
 
 SUBDIRS = docker-ocserv docker-kerberos
 
@@ -39,7 +40,7 @@ endif
 if HAVE_CWRAP
 dist_check_SCRIPTS += test-pass test-pass-cert test-cert test-group-pass \
 	test-pass-group-cert test-pass-group-cert-no-pass test-sighup \
-	test-enc-key test-sighup-key-change test-get-cert
+	test-enc-key test-sighup-key-change test-get-cert test-san-cert
 
 if HAVE_CWRAP_PAM
 dist_check_SCRIPTS += test-pam test-pam-noauth

tests/certs/user-san-cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDhjCCAj6gAwIBAgIIWIymeRmBgA8wDQYJKoZIhvcNAQELBQAwDTELMAkGA1UE
+AxMCQ0EwIBcNMTcwMTI4MTQxMTA2WhgPOTk5OTEyMzEyMzU5NTlaMAAwggFSMA0G
+CSqGSIb3DQEBAQUAA4IBPwAwggE6AoIBMQCrVJj8qcYVlZ2mwZSElJF5HnjbLUhR
+mWUBAsBAUkld63C8Ju9oOR4EkeLby2+TQEUeIo5xWliJKHleGjIlPoudOzR/GfjQ
+Lze3YjK3U6VDLMVd7Kz5NfoUKzRm8danodCDmlb0GYO8vxF0MC2oKFuiq3rGzZxc
++FHpqQxI23G7sTR39+7eXXjASAo3DWUeOysUA4ly8lLtXwDFBmDqgCDQQ+xmvNIm
+2/ApPmr5YiC+WCZEuteMb3amBSDkmLfEcnpd308NI+wunHHsMPkUX8h1C6tn9n37
+TXZkSqXV+rQIUJ0Tx4/CebC0Pi+J0zMnTZ+L02AkB6uycj0ppcRK7DwE0kk+Jhvs
+ehA9ykVagItNKpZjTy1jKA87R0fKfCwVQTLV4Mm+pVUss2tGKlaxG+0pAgMBAAGj
+gZQwgZEwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAbBgNVHREE
+FDASgRB0ZXN0QGV4YW1wbGUub3JnMA8GA1UdDwEB/wQFAwMHgAAwHQYDVR0OBBYE
+FIsBCUs7kezjIbkd7I1rTF2eQIBeMB8GA1UdIwQYMBaAFEgjNFMKiTE4SlrqyrbS
+pt7OHSsYMA0GCSqGSIb3DQEBCwUAA4IBMQCzHJ7Jscl1FW247l6S8yb6L6IRMtEL
+/SEVIQZkTJwVwr+gLlUOf2Tu1Iry/YPQQMpHv6h0P26nnIa3atfUkG7MY7ixpjCJ
+2pAju2c3h9LMg2kKvkQJsmrOtoQp6SvvVseggEAoGZcOtn1Mph52K9FrIMFj+MUt
+X+wcDEYufhWRiV5jE4xNjt072mvYhlgQOFZmE8raEnmCdlZP+F8U2RKZ5zvJFpHe
+4BzqXOqz5zf8Za0nsHfiYdsZL+RLic7c4GLE227YiugFF/LiTW4beV+6RdGpL4tX
+099Q4mVL5VGL7nXY4q5ravHaeByZWzvwsLjhMyP/2f8JCO5Tt+UBTzctOYwsWlc8
+CCXGyf/u2m+DaSiSNsgrtaEv9o9l2rPO9jCy6YfVfvo2CSre9QUKwxXL
+-----END CERTIFICATE-----

tests/common.sh

@@ -65,67 +65,87 @@ fail() {
 }
 
 launch_server() {
-       $SERV $* >/dev/null 2>&1 &
-       LOCALPID="$!";
-       trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
-       wait "${LOCALPID}"
-       LOCALRET="$?"
-       if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
-               # Houston, we'v got a problem...
-               exit 1
-       fi
+	if test -n "${VERBOSE}" && test "${VERBOSE}" -ge 1;then
+	    $SERV $* &
+	else
+	    $SERV $* >/dev/null 2>&1 &
+	fi
+	LOCALPID="$!";
+	trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
+	wait "${LOCALPID}"
+	LOCALRET="$?"
+	if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
+		 # Houston, we'v got a problem...
+		 exit 1
+	fi
 }
 
 launch_sr_server() {
-       LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* &#>/dev/null 2>&1 &
-       LOCALPID="$!";
-       trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
-       wait "${LOCALPID}"
-       LOCALRET="$?"
-       if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
-               # Houston, we'v got a problem...
-               exit 1
-       fi
+	if test -n "${VERBOSE}" && test "${VERBOSE}" -ge 1;then
+		LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* &
+	else
+		LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* >/dev/null 2>&1 &
+	fi
+	LOCALPID="$!";
+	trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
+	wait "${LOCALPID}"
+	LOCALRET="$?"
+	if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
+		 # Houston, we'v got a problem...
+		 exit 1
+	fi
 }
 
 launch_sr_pam_server() {
-       mkdir -p "data/$PAMDIR/"
-       test -f "${srcdir}/data/$PAMDIR/users.oath.templ" && cp "${srcdir}/data/$PAMDIR/users.oath.templ" "data/$PAMDIR/users.oath"
-       test -f "${srcdir}/data/$PAMDIR/passdb.templ" && cp "${srcdir}/data/$PAMDIR/passdb.templ" "data/$PAMDIR/passdb"
+	mkdir -p "data/$PAMDIR/"
+	test -f "${srcdir}/data/$PAMDIR/users.oath.templ" && cp "${srcdir}/data/$PAMDIR/users.oath.templ" "data/$PAMDIR/users.oath"
+	test -f "${srcdir}/data/$PAMDIR/passdb.templ" && cp "${srcdir}/data/$PAMDIR/passdb.templ" "data/$PAMDIR/passdb"
 
-       export NSS_WRAPPER_PASSWD=./data/pam/nss-passwd
-       export NSS_WRAPPER_GROUP=./data/pam/nss-group
-       LD_PRELOAD=libnss_wrapper.so:libpam_wrapper.so:libsocket_wrapper.so:libuid_wrapper.so PAM_WRAPPER_SERVICE_DIR="data/$PAMDIR" PAM_WRAPPER=1  UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* & #>/dev/null 2>&1 &
-       LOCALPID="$!";
-       unset NSS_WRAPPER_PASSWD
-       unset NSS_WRAPPER_GROUP
-       trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
-       wait "${LOCALPID}"
-       LOCALRET="$?"
-       if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
-               # Houston, we'v got a problem...
-               exit 1
-       fi
+	export NSS_WRAPPER_PASSWD=./data/pam/nss-passwd
+	export NSS_WRAPPER_GROUP=./data/pam/nss-group
+	if test -n "${VERBOSE}" && test "${VERBOSE}" -ge 1;then
+		LD_PRELOAD=libnss_wrapper.so:libpam_wrapper.so:libsocket_wrapper.so:libuid_wrapper.so PAM_WRAPPER_SERVICE_DIR="data/$PAMDIR" PAM_WRAPPER=1  UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* &
+	else
+		LD_PRELOAD=libnss_wrapper.so:libpam_wrapper.so:libsocket_wrapper.so:libuid_wrapper.so PAM_WRAPPER_SERVICE_DIR="data/$PAMDIR" PAM_WRAPPER=1  UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* >/dev/null 2>&1 &
+	fi
+	LOCALPID="$!";
+	unset NSS_WRAPPER_PASSWD
+	unset NSS_WRAPPER_GROUP
+	trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
+	wait "${LOCALPID}"
+	LOCALRET="$?"
+	if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
+		 # Houston, we'v got a problem...
+		 exit 1
+	fi
 }
 
 launch_simple_sr_server() {
-       LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* >/dev/null 2>&1 &
+	if test -n "${VERBOSE}" && test "${VERBOSE}" -ge 1;then
+		LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* &
+	else
+		LD_PRELOAD=libsocket_wrapper.so:libuid_wrapper.so UID_WRAPPER=1 UID_WRAPPER_ROOT=1 $SERV $* >/dev/null 2>&1 &
+	fi
 }
 
 launch_simple_server() {
-       $PRELOAD_CMD $SERV $* >/dev/null 2>&1 &
+	if test -n "${VERBOSE}" && test "${VERBOSE}" -ge 1;then
+		$PRELOAD_CMD $SERV $* &
+	else
+		$PRELOAD_CMD $SERV $* >/dev/null 2>&1 &
+	fi
 }
 
 launch_debug_server() {
-       valgrind --leak-check=full $SERV $* >out.txt 2>&1 &
-       LOCALPID="$!";
-       trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
-       wait "${LOCALPID}"
-       LOCALRET="$?"
-       if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
-               # Houston, we'v got a problem...
-               exit 1
-       fi
+	valgrind --leak-check=full $SERV $* >out.txt 2>&1 &
+	LOCALPID="$!";
+	trap "[ ! -z \"${LOCALPID}\" ] && kill ${LOCALPID};" 15
+	wait "${LOCALPID}"
+	LOCALRET="$?"
+	if [ "${LOCALRET}" != "0" ] && [ "${LOCALRET}" != "143" ] ; then
+		 # Houston, we'v got a problem...
+		 exit 1
+	fi
 }
 
 wait_server() {

tests/data/test-san-cert.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@/data/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 = 443
+udp-port = 443
+
+# 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 = @SRCDIR@/certs/server-cert.pem
+server-key = @SRCDIR@/certs/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@/certs/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 = SAN(rfc822name)
+
+# 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 = @CRLNAME@
+
+# 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 = @USERNAME@
+run-as-group = @GROUP@
+
+# 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
+

tests/test-san-cert

@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Copyright (C) 2013 Nikos Mavrogiannopoulos
+#
+# This file is part of ocserv.
+#
+# ocserv is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# ocserv is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GnuTLS; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+SERV="${SERV:-../src/ocserv}"
+srcdir=${srcdir:-.}
+NO_NEED_ROOT=1
+
+CRLNAME=crl.pem.$$.tmp
+CRLTMPLNAME=crl.tmpl.$$.tmp
+
+. `dirname $0`/common.sh
+
+echo "Testing ocserv with certificates... "
+
+rm -f "${CRLNAME}" "${CRLTMPLNAME}"
+echo crl_next_update = 999 >"${CRLTMPLNAME}"
+echo crl_number = 1 >>"${CRLTMPLNAME}"
+
+certtool --generate-crl --load-ca-privkey "${srcdir}/certs/ca-key.pem" --load-ca-certificate "${srcdir}/certs/ca.pem" \
+	--outfile "${CRLNAME}" --template "${CRLTMPLNAME}" >/dev/null 2>&1
+if test $? != 0;then
+	kill $PID
+	exit 77
+fi
+
+update_config test-san-cert.config
+launch_simple_sr_server -d 1 -f -c ${CONFIG}
+PID=$!
+
+wait_server $PID
+
+echo -n "Connecting to obtain cookie (without certificate)... "
+( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly </dev/null >/dev/null 2>&1 ) &&
+	fail $PID "Connected without certificate!"
+
+echo "ok (failed as expected)"
+
+echo -n "Connecting to obtain cookie (with invalid certificate)... "
+( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS --sslkey "${srcdir}/certs/user-key.pem" -c "${srcdir}/certs/user-cert-invalid.pem" --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly </dev/null >/dev/null 2>&1 ) &&
+	fail $PID "Connected with invalid certificate!"
+
+echo "ok (failed as expected)"
+
+echo -n "Connecting to obtain cookie (with certificate - no SAN)... "
+( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS --sslkey "${srcdir}/certs/user-key.pem" -c "${srcdir}/certs/user-cert.pem" --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly </dev/null >/dev/null 2>&1 ) &&
+	fail $PID "Connected with invalid certificate!"
+
+echo "ok (failed as expected)"
+
+echo -n "Connecting to obtain cookie (with certificate - SAN)... "
+( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS --sslkey "${srcdir}/certs/user-key.pem" -c "${srcdir}/certs/user-san-cert.pem" --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly </dev/null >/dev/null 2>&1 ) ||
+	fail $PID "Failed to connect with certificate!"
+
+echo ok
+
+rm -f "${CRLNAME}" "${CRLTMPLNAME}"
+
+cleanup
+if test $? != 0;then
+	exit 1
+fi
+
+exit 0