From: Daniel Lenski Date: Mon, 18 May 2020 21:59:40 +0000 (-0700) Subject: add obsolete-server-crypto and pfs tests X-Git-Tag: v8.20~396^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cb529c698539f43bd5eae8e96ff8e58260ef7c7e;p=users%2Fdwmw2%2Fopenconnect.git add obsolete-server-crypto and pfs tests These are designed to ensure that we don't inadvertently break compatibility with legacy/obsolete server crypto, and also that we don't *inadvertently connect* to less-secure crypto than requested. Current checks: - connect to a server whose only ciphers are 3DES and/or RC4 [if and only if] `--allow-insecure-crypto` is specified - connect to a server whose only KX is RSA KX [if and only if] `--pfs` is [not specified] Tricky parts: - Override GnuTLS system crypto policy in obsolete-server-crypto test config, because this may be needed for newer versions of GnuTLS to obey it. (per nmav: https://gitlab.com/openconnect/openconnect/-/issues/145#note_346497960) - OpenSSL 1.1.0+ removes 3DES and RC4 from the default build (https://www.openssl.org/blog/blog/2016/08/24/sweet32), so there is no way to re-enable without rebuilding from source. Therefore, obsolete-server-crypto test is marked as XFAIL on all CI builds using it. - Recent GnuTLS versions which support TLS1.3 implicitly allow non-RSA KX (due to VERS-TLS1.3 ciphersuites) even when -KX-ALL:+RSA is in the priority string; in order to actually test RSA-only KX, we need to ensure that TLS1.3 is disabled. See #149. Signed-off-by: Daniel Lenski --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90318f87..aec50a4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,8 @@ CentOS8/OpenSSL: - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --disable-dsa-tests CFLAGS=-g - make -j4 # UTF-8 support is not available - - make VERBOSE=1 XFAIL_TESTS="auth-nonascii" -j4 check +# OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) + - make VERBOSE=1 XFAIL_TESTS="auth-nonascii obsolete-server-crypto" -j4 check tags: - shared except: @@ -276,7 +277,8 @@ Fedora/OpenSSL: - cd openconnect-$(git describe --tags | sed s/^v//) - ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g - make -j4 - - make VERBOSE=1 -j4 check +# OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) + - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto" -j4 check tags: - shared except: @@ -307,7 +309,8 @@ Fedora/OpenSSL/clang: - cd openconnect-$(git describe --tags | sed s/^v//) - ./configure CC=clang --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g - make -j4 - - make VERBOSE=1 -j4 check +# OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) + - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto" -j4 check tags: - shared except: @@ -355,7 +358,8 @@ Ubuntu18.04/OpenSSL: - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --disable-dsa-tests CFLAGS=-g - make -j4 # UTF-8 support is not available - - make VERBOSE=1 XFAIL_TESTS="auth-nonascii" -j4 check +# OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) + - make VERBOSE=1 XFAIL_TESTS="auth-nonascii obsolete-server-crypto" -j4 check tags: - shared except: diff --git a/configure.ac b/configure.ac index 8b1b540f..4b31d507 100644 --- a/configure.ac +++ b/configure.ac @@ -1058,7 +1058,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], $(top_srcdir)/openconnect.8.in \ $(top_srcdir)/tests/softhsm2.conf.in \ $(top_srcdir)/tests/configs/test-user-cert.config.in \ - $(top_srcdir)/tests/configs/test-user-pass.config.in']) + $(top_srcdir)/tests/configs/test-user-pass.config.in \ + $(top_srcdir)/tests/configs/test-obsolete-server-crypto.config.in']) RAWLINGUAS=`sed -e "/^#/d" -e "s/#.*//" "${srcdir}/po/LINGUAS"` # Remove newlines @@ -1090,7 +1091,8 @@ AC_CONFIG_FILES(Makefile openconnect.pc po/Makefile www/Makefile \ libopenconnect.map openconnect.8 www/styles/Makefile \ www/inc/Makefile www/images/Makefile tests/Makefile \ tests/softhsm2.conf tests/configs/test-user-cert.config \ - tests/configs/test-user-pass.config) + tests/configs/test-user-pass.config \ + tests/configs/test-obsolete-server-crypto.config) AC_OUTPUT AC_DEFUN([SUMMARY], diff --git a/tests/Makefile.am b/tests/Makefile.am index 2b31d31d..d8f6506a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,7 @@ EXTRA_DIST = certs/ca.pem certs/ca-key.pem certs/user-cert.pem $(USER_KEYS) $(US pass-UTF-8 pass-ISO8859-2 \ certs/server-cert.pem certs/server-key.pem configs/test1.passwd \ common.sh configs/test-user-cert.config configs/test-user-pass.config \ + configs/test-obsolete-server-crypto.config \ configs/user-cert.prm configs/server-cert.prm \ softhsm2.conf.in softhsm ns.sh configs/test-dtls-psk.config \ scripts/vpnc-script scripts/vpnc-script-detect-disconnect @@ -53,7 +54,7 @@ dist_check_SCRIPTS += dtls-psk sigterm endif if HAVE_CWRAP -dist_check_SCRIPTS += auth-username-pass auth-certificate auth-nonascii cert-fingerprint id-test +dist_check_SCRIPTS += auth-username-pass auth-certificate auth-nonascii cert-fingerprint id-test obsolete-server-crypto pfs if TEST_PKCS11 dist_check_SCRIPTS += auth-pkcs11 diff --git a/tests/common.sh b/tests/common.sh index f07a980f..5952ed78 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -51,7 +51,8 @@ update_config() { -e 's|@ADDRESS@|'${ADDRESS}'|g' "$file.$$.tmp" \ -e 's|@VPNNET@|'${VPNNET}'|g' "$file.$$.tmp" \ -e 's|@VPNNET6@|'${VPNNET6}'|g' "$file.$$.tmp" \ - -e 's|@OCCTL_SOCKET@|'${OCCTL_SOCKET}'|g' "$file.$$.tmp" + -e 's|@OCCTL_SOCKET@|'${OCCTL_SOCKET}'|g' "$file.$$.tmp" \ + -e 's|@TLS_PRIORITIES@|'${TLS_PRIORITIES}'|g' "$file.$$.tmp" CONFIG="$file.$$.tmp" } @@ -84,4 +85,4 @@ fail() { exit 1 } -trap "fail \"Failed to launch the server, aborting test... \"" 10 +trap "fail \"Failed to launch the server, aborting test... \"" 10 diff --git a/tests/configs/test-obsolete-server-crypto.config.in b/tests/configs/test-obsolete-server-crypto.config.in new file mode 100644 index 00000000..e1ed797d --- /dev/null +++ b/tests/configs/test-obsolete-server-crypto.config.in @@ -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[@abs_top_srcdir@/tests/configs/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 = 0 + +# Don't ban failing clients because cert-fingerprint does that on purpose +max-ban-score = 0 + +# 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 = @PORT@ +udp-port = @PORT@ + +# 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 = @abs_top_srcdir@/tests/certs/server-cert.pem +server-key = @abs_top_srcdir@/tests/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 = @abs_top_srcdir@/tests/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 = 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 = /path/to/crl.pem + +# GnuTLS priority string +tls-priorities = "@TLS_PRIORITIES@" + +# 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 = @OCSERV_USER@ +run-as-group = @OCSERV_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 +ipv4-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 + diff --git a/tests/obsolete-server-crypto b/tests/obsolete-server-crypto new file mode 100755 index 00000000..9fb835d2 --- /dev/null +++ b/tests/obsolete-server-crypto @@ -0,0 +1,62 @@ +#!/bin/sh +# +# Copyright (C) 2020 Daniel Lenski +# +# This file is part of openconnect. +# +# This is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see + +SERV="${SERV:-../src/ocserv}" +srcdir=${srcdir:-.} +top_builddir=${top_builddir:-..} + +. `dirname $0`/common.sh + +######################################## +# Need to override mandatory system-wide crypto policy on Fedora 31+, +# for both ocserv and openconnect. +######################################## + +export GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null + +######################################## +# Verify that we cannot connect to a server offering only obsolete, insecure +# crypto UNLESS --allow-insecure-crypto is specified. +######################################## + +echo "Testing against server with insecure crypto (3DES and RC4 only)... " + +# Run servers +PORT=4568 +TLS_PRIORITIES="LEGACY:%SERVER_PRECEDENCE:%COMPAT:-VERS-TLS-ALL:+VERS-TLS1.0:-CIPHER-ALL:+3DES-CBC:+ARCFOUR-128:+MD5:+SHA1" +update_config test-obsolete-server-crypto.config +launch_simple_sr_server -d 1 -f -c $CONFIG +PID=$! +wait_server $PID + +echo -n "Connecting without --allow-insecure-crypto... " +( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1) && + fail $PID "Connected successfully when we shouldn't" + +echo ok + +echo -n "Connecting with --allow-insecure-crypto... " +( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --allow-insecure-crypto --cookieonly >/dev/null 2>&1) || + fail $PID "Could not connect and obtain cookie with --allow-insecure-crypto" + +echo ok + +cleanup + +exit 0 diff --git a/tests/pfs b/tests/pfs new file mode 100755 index 00000000..fe52e27e --- /dev/null +++ b/tests/pfs @@ -0,0 +1,57 @@ +#!/bin/sh +# +# Copyright (C) 2020 Daniel Lenski +# +# This file is part of openconnect. +# +# This is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see + +SERV="${SERV:-../src/ocserv}" +srcdir=${srcdir:-.} +top_builddir=${top_builddir:-..} + +. `dirname $0`/common.sh + +######################################## +# Verify that we cannot connect to a server offering only RSA key exchange +# IF --pfs is specified to require perfect forward secrecy, but that we +# CAN connect if it is not specified. +######################################## + +echo "Testing against server without PFS... " + +# Need to disable TLS 1.3 here because GnuTLS v3.6.13 is allowing non-RSA KX with TLS 1.3, even with -KX-ALL +# But can't use -VERS-TLS1.3 here, because it's not known to earlier versions of GnuTLS. +PORT=4569 +TLS_PRIORITIES="LEGACY:%SERVER_PRECEDENCE:%COMPAT:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-TLS1.1:+VERS-TLS1.2:-KX-ALL:+RSA" +update_config test-obsolete-server-crypto.config +launch_simple_sr_server -d 1 -f -c $CONFIG +PID=$! +wait_server $PID + +echo -n "Connecting with --pfs... " +( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --pfs --cookieonly >/dev/null 2>&1) && + fail $PID "Connected successfully when we shouldn't" + +echo ok + +echo -n "Connecting without --pfs... " +( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1) || + fail $PID "Could not connect and obtain cookie without --pfs" + +echo ok + +cleanup + +exit 0 diff --git a/www/changelog.xml b/www/changelog.xml index 083f37fe..2656cf69 100644 --- a/www/changelog.xml +++ b/www/changelog.xml @@ -19,6 +19,7 @@
  • Emulated a newer version of GlobalProtect official clients, 5.1.5-8; was 4.0.2-19 (!131)
  • Support Juniper login forms containing both password and 2FA token (!121)
  • Explicitly disable 3DES and RC4, unless enabled with --allow-insecure-crypto (!114)
    • +
  • Add obsolete-server-crypto test (!114)

  • OpenConnect v8.10