From dff5a0cab8794b744112380c974dfe116ea2ce96 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 21 Sep 2021 11:15:43 +0200 Subject: [PATCH 1/7] testing: Support build with Debian bullseye base image --- testing/scripts/build-baseimage | 21 ++++++++++++++++++--- testing/scripts/build-guestimages | 5 ++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 10253a564..657851a34 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -20,8 +20,16 @@ INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,apt-transport-https -INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3,iptables-dev -INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute +INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3 +INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute,iptables +case "$BASEIMGSUITE" in +bullseye) + INC=$INC,libiptc-dev + ;; +*) + INC=$INC,iptables-dev + ;; +esac case "$BASEIMGSUITE" in jessie) INC=$INC,libahven4-dev,libxmlada5-dev,libgmpada5-dev @@ -35,6 +43,13 @@ buster) INC=$INC,libahven7-dev,libxmlada-schema8-dev,libgmpada8-dev INC=$INC,libalog4-dev,dbus-user-session ;; +bullseye) + INC=$INC,libahven9-dev,libxmlada-schema10-dev,libgmpada10-dev + INC=$INC,libalog6-dev,dbus-user-session + # workaround for dependency issue gdb -> libsource-highlight4v5 -> virtual + # package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961) + INC=$INC,libboost-regex1.74.0 + ;; *) echo_warn "Package list for '$BASEIMGSUITE' might has to be updated" ;; @@ -136,7 +151,7 @@ do done case "$BASEIMGSUITE" in -buster) +buster|bullseye) log_action "Switching from iptables-nft to iptables-legacy" execute_chroot "update-alternatives --set iptables /usr/sbin/iptables-legacy" 0 execute_chroot "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy" 0 diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index 4ef881836..bb638ec44 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -75,7 +75,10 @@ do execute_chroot "dnssec-signzone -K /etc/bind -o org. /etc/bind/db.org" 0 execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 0 - for service in "apache2 slapd bind9" + # on bullseye, enabling via bind9 doesn't work, while disabling does, so + # use named there. on the other hand, older releases don't have named + # service files (systemctl returns 0 even if files are not found) + for service in apache2 slapd bind9 named do execute_chroot "systemctl enable $service" 0 done From 5b9c46b98871dde5e4a9290f0022f402c6385d34 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 21 Sep 2021 11:18:16 +0200 Subject: [PATCH 2/7] testing: Remove support for Debian jessie and FreeRADIUS 2 --- testing/do-tests | 16 +-- .../hosts/alice/etc/freeradius/clients.conf | 4 - testing/hosts/alice/etc/freeradius/dictionary | 32 ----- .../hosts/alice/etc/freeradius/radiusd.conf | 118 ------------------ testing/scripts/build-baseimage | 4 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 39 ------ .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 42 ------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 18 --- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../freeradius/sites-available/inner-tunnel | 32 ----- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 53 -------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 54 -------- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 72 ----------- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 13 -- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 41 ------ .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 18 --- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../freeradius/sites-available/inner-tunnel | 32 ----- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 72 ----------- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 42 ------- .../hosts/alice/etc/freeradius/users | 4 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 42 ------- .../hosts/alice/etc/freeradius/users | 4 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 18 --- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../freeradius/sites-available/inner-tunnel | 32 ----- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 53 -------- .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 72 ----------- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 72 ----------- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 13 -- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 41 ------ .../hosts/alice/etc/freeradius/users | 1 - .../hosts/alice/etc/freeradius/eap.conf | 18 --- .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 43 ------- .../freeradius/sites-available/inner-tunnel | 32 ----- .../hosts/alice/etc/freeradius/users | 2 - .../hosts/alice/etc/freeradius/eap.conf | 5 - .../hosts/alice/etc/freeradius/proxy.conf | 5 - .../etc/freeradius/sites-available/default | 42 ------- .../hosts/alice/etc/freeradius/users | 1 - 97 files changed, 3 insertions(+), 1705 deletions(-) delete mode 100644 testing/hosts/alice/etc/freeradius/clients.conf delete mode 100644 testing/hosts/alice/etc/freeradius/dictionary delete mode 100644 testing/hosts/alice/etc/freeradius/radiusd.conf delete mode 100644 testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel delete mode 100644 testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel delete mode 100644 testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel delete mode 100644 testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel delete mode 100644 testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users delete mode 100644 testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/eap.conf delete mode 100644 testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/proxy.conf delete mode 100644 testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/sites-available/default delete mode 100644 testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/users diff --git a/testing/do-tests b/testing/do-tests index cc65e6b2c..9e3b3464e 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -693,19 +693,9 @@ do do eval HOSTLOGIN=root@\$ipv4_${host} - RADIUS_DIR=/etc/freeradius/3.0 - RADIUS_EAP_FILE=mods-enabled/eap - RADIUS_EAP_NAME=eap - if [ "$BASEIMGSUITE" == "jessie" ] - then - RADIUS_DIR=/etc/freeradius - RADIUS_EAP_FILE=eap.conf - RADIUS_EAP_NAME=eap.conf - fi - - for file in clients.conf radiusd.conf proxy.conf users sites-enabled/default sites-enabled/inner-tunnel $RADIUS_EAP_FILE + for file in clients.conf radiusd.conf proxy.conf users sites-enabled/default sites-enabled/inner-tunnel mods-enabled/eap do - scp $SSHCONF $HOSTLOGIN:$RADIUS_DIR/$file \ + scp $SSHCONF $HOSTLOGIN:/etc/freeradius/3.0/$file \ $TESTRESULTDIR/${host}.$(basename $file) > /dev/null 2>&1 done @@ -721,7 +711,7 @@ do diff --git a/testing/hosts/alice/etc/freeradius/clients.conf b/testing/hosts/alice/etc/freeradius/clients.conf deleted file mode 100644 index 5fb47a2ad..000000000 --- a/testing/hosts/alice/etc/freeradius/clients.conf +++ /dev/null @@ -1,4 +0,0 @@ -client 10.1.0.1 { - secret = gv6URkSs - shortname = moon -} diff --git a/testing/hosts/alice/etc/freeradius/dictionary b/testing/hosts/alice/etc/freeradius/dictionary deleted file mode 100644 index 4c2c7ebb4..000000000 --- a/testing/hosts/alice/etc/freeradius/dictionary +++ /dev/null @@ -1,32 +0,0 @@ -# -# This is the master dictionary file, which references the -# pre-defined dictionary files included with the server. -# -# Any new/changed attributes MUST be placed in this file, as -# the pre-defined dictionaries SHOULD NOT be edited. -# -# $Id$ -# - -# -# The filename given here should be an absolute path. -# -$INCLUDE /usr/share/freeradius/dictionary - -# -# Place additional attributes or $INCLUDEs here. They will -# over-ride the definitions in the pre-defined dictionaries. -# -# See the 'man' page for 'dictionary' for information on -# the format of the dictionary files. - -# -# If you want to add entries to the dictionary file, -# which are NOT going to be placed in a RADIUS packet, -# add them here. The numbers you pick should be between -# 3000 and 4000. -# - -#ATTRIBUTE My-Local-String 3000 string -#ATTRIBUTE My-Local-IPAddr 3001 ipaddr -#ATTRIBUTE My-Local-Integer 3002 integer diff --git a/testing/hosts/alice/etc/freeradius/radiusd.conf b/testing/hosts/alice/etc/freeradius/radiusd.conf deleted file mode 100644 index bcdc369d2..000000000 --- a/testing/hosts/alice/etc/freeradius/radiusd.conf +++ /dev/null @@ -1,118 +0,0 @@ -# radiusd.conf -- FreeRADIUS server configuration file. - -prefix = /usr -exec_prefix = ${prefix} -sysconfdir = /etc -localstatedir = /var -sbindir = ${exec_prefix}/sbin -logdir = ${localstatedir}/log/freeradius -raddbdir = ${sysconfdir}/freeradius -radacctdir = ${logdir}/radacct - -# name of the running server. See also the "-n" command-line option. -name = freeradius - -# Location of config and logfiles. -confdir = ${raddbdir} -run_dir = ${localstatedir}/run - -# Should likely be ${localstatedir}/lib/radiusd -db_dir = ${raddbdir} - -# libdir: Where to find the rlm_* modules. -libdir = ${exec_prefix}/lib - -# pidfile: Where to place the PID of the RADIUS server. -pidfile = ${run_dir}/${name}.pid - -# max_request_time: The maximum time (in seconds) to handle a request. -max_request_time = 30 - -# cleanup_delay: The time to wait (in seconds) before cleaning up -cleanup_delay = 5 - -# max_requests: The maximum number of requests which the server keeps -max_requests = 1024 - -# listen: Make the server listen on a particular IP address, and send -listen { - type = auth - ipaddr = 10.1.0.10 - port = 0 -} - -# This second "listen" section is for listening on the accounting -# port, too. -# -listen { - type = acct - ipaddr = 10.1.0.10 - port = 0 -} - -# hostname_lookups: Log the names of clients or just their IP addresses -hostname_lookups = no - -# Core dumps are a bad thing. This should only be set to 'yes' -allow_core_dumps = no - -# Regular expressions -regular_expressions = yes -extended_expressions = yes - -# Logging section. The various "log_*" configuration items -log { - destination = files - file = ${logdir}/radius.log - syslog_facility = daemon - stripped_names = no - auth = yes - auth_badpass = yes - auth_goodpass = yes -} - -# The program to execute to do concurrency checks. -checkrad = ${sbindir}/checkrad - -# Security considerations -security { - max_attributes = 200 - reject_delay = 1 - status_server = yes -} - -# PROXY CONFIGURATION -proxy_requests = yes -$INCLUDE proxy.conf - -# CLIENTS CONFIGURATION -$INCLUDE clients.conf - -# THREAD POOL CONFIGURATION -thread pool { - start_servers = 5 - max_servers = 32 - min_spare_servers = 3 - max_spare_servers = 10 - max_requests_per_server = 0 -} - -# MODULE CONFIGURATION -modules { - $INCLUDE ${confdir}/modules/ - $INCLUDE eap.conf -} - -# Instantiation -instantiate { - exec - expr - expiration - logintime -} - -# Policies -$INCLUDE policy.conf - -# Include all enabled virtual hosts -$INCLUDE sites-enabled/ diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 657851a34..d3c7f82b3 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -31,10 +31,6 @@ bullseye) ;; esac case "$BASEIMGSUITE" in -jessie) - INC=$INC,libahven4-dev,libxmlada5-dev,libgmpada5-dev - INC=$INC,libalog1-dev - ;; stretch) INC=$INC,libahven5-dev,libxmlada-schema6-dev,libgmpada6-dev INC=$INC,libalog2-dev diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 4fb07b912..000000000 --- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "4iChxLT3" diff --git a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 929b6cd74..000000000 --- a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,39 +0,0 @@ -authorize { - suffix - files -} - -authenticate { - pap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { -} diff --git a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 4fb07b912..000000000 --- a/testing/tests/ikev1/xauth-rsa-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "4iChxLT3" diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index a67a5dcb4..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,42 +0,0 @@ -authorize { - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-md5-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 11d3e2acd..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,18 +0,0 @@ -eap { - md5 { - } - default_eap_type = peap - tls { - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } - peap { - default_eap_type = md5 - use_tunneled_reply = yes - virtual_server = "inner-tunnel" - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel b/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel deleted file mode 100644 index e088fae14..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -server inner-tunnel { - -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -session { - radutmp -} - -post-auth { - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} - -} # inner-tunnel server block diff --git a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 50ccf3e76..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-peap-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" -dave Cleartext-Password := "W7R0g3do" diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 1dc666992..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,53 +0,0 @@ -authorize { - files - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 1c281a974..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -228060123456001 EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 8d68b81fc..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,54 +0,0 @@ -authorize { - files - suffix - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index a74267d30..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB -dave@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 51b64a74b..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,72 +0,0 @@ -authorize { - preprocess - chap - mschap - files - suffix - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } - unix - files - expiration - logintime - pap -} - -authenticate { - Auth-Type PAP { - pap - } - Auth-Type CHAP { - chap - } - Auth-Type MS-CHAP { - mschap - } - unix - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index a74267d30..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-sim-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB -dave@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB diff --git a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 92f96ad66..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,13 +0,0 @@ -eap { - default_eap_type = tls - tls { - certdir = /etc/raddb/certs - cadir = /etc/raddb/certs - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 18ebf9e9d..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,41 +0,0 @@ -authorize { - eap { - ok = return - } -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-tls-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index c91cd40fb..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,18 +0,0 @@ -eap { - md5 { - } - default_eap_type = ttls - tls { - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } - ttls { - default_eap_type = md5 - use_tunneled_reply = yes - virtual_server = "inner-tunnel" - } -} diff --git a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel b/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel deleted file mode 100644 index e088fae14..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -server inner-tunnel { - -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -session { - radutmp -} - -post-auth { - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} - -} # inner-tunnel server block diff --git a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 50ccf3e76..000000000 --- a/testing/tests/ikev2-stroke/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" -dave Cleartext-Password := "W7R0g3do" diff --git a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 51b64a74b..000000000 --- a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,72 +0,0 @@ -authorize { - preprocess - chap - mschap - files - suffix - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } - unix - files - expiration - logintime - pap -} - -authenticate { - Auth-Type PAP { - pap - } - Auth-Type CHAP { - chap - } - Auth-Type MS-CHAP { - mschap - } - unix - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/users deleted file mode 100644 index aa6f98076..000000000 --- a/testing/tests/ikev2/mult-auth-rsa-eap-sim-id/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -228060123456001 EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB -228060123456002 EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB diff --git a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index a67a5dcb4..000000000 --- a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,42 +0,0 @@ -authorize { - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index ba92f0080..000000000 --- a/testing/tests/ikev2/rw-eap-framed-ip-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,4 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" - Framed-IP-Address = 10.3.0.1 -dave Cleartext-Password := "W7R0g3do" - Framed-IP-Address = 10.3.0.2 diff --git a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index a67a5dcb4..000000000 --- a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,42 +0,0 @@ -authorize { - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 62d459115..000000000 --- a/testing/tests/ikev2/rw-eap-md5-class-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,4 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" - Class = "Research" -dave Cleartext-Password := "W7R0g3do" - Class = "Accounting" diff --git a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2/rw-eap-md5-id-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2/rw-eap-md5-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 11d3e2acd..000000000 --- a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,18 +0,0 @@ -eap { - md5 { - } - default_eap_type = peap - tls { - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } - peap { - default_eap_type = md5 - use_tunneled_reply = yes - virtual_server = "inner-tunnel" - } -} diff --git a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel b/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel deleted file mode 100644 index e088fae14..000000000 --- a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -server inner-tunnel { - -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -session { - radutmp -} - -post-auth { - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} - -} # inner-tunnel server block diff --git a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 50ccf3e76..000000000 --- a/testing/tests/ikev2/rw-eap-peap-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" -dave Cleartext-Password := "W7R0g3do" diff --git a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 1dc666992..000000000 --- a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,53 +0,0 @@ -authorize { - files - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 1c281a974..000000000 --- a/testing/tests/ikev2/rw-eap-sim-id-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -228060123456001 EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB diff --git a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 51b64a74b..000000000 --- a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,72 +0,0 @@ -authorize { - preprocess - chap - mschap - files - suffix - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } - unix - files - expiration - logintime - pap -} - -authenticate { - Auth-Type PAP { - pap - } - Auth-Type CHAP { - chap - } - Auth-Type MS-CHAP { - mschap - } - unix - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index a74267d30..000000000 --- a/testing/tests/ikev2/rw-eap-sim-only-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB -dave@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB diff --git a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 7d8023951..000000000 --- a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = sim - sim { - } -} diff --git a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 51b64a74b..000000000 --- a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,72 +0,0 @@ -authorize { - preprocess - chap - mschap - files - suffix - update reply { - EAP-Sim-Rand1 := "%{control:EAP-Sim-Rand1}" - EAP-Sim-Rand2 := "%{control:EAP-Sim-Rand2}" - EAP-Sim-Rand3 := "%{control:EAP-Sim-Rand3}" - EAP-Sim-SRES1 := "%{control:EAP-Sim-SRES1}" - EAP-Sim-SRES2 := "%{control:EAP-Sim-SRES2}" - EAP-Sim-SRES3 := "%{control:EAP-Sim-SRES3}" - EAP-Sim-KC1 := "%{control:EAP-Sim-KC1}" - EAP-Sim-KC2 := "%{control:EAP-Sim-KC2}" - EAP-Sim-KC3 := "%{control:EAP-Sim-KC3}" - } - eap { - ok = return - } - unix - files - expiration - logintime - pap -} - -authenticate { - Auth-Type PAP { - pap - } - Auth-Type CHAP { - chap - } - Auth-Type MS-CHAP { - mschap - } - unix - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index a74267d30..000000000 --- a/testing/tests/ikev2/rw-eap-sim-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x30000000000000000000000000000000, EAP-Sim-SRES1 := 0x30112233, EAP-Sim-KC1 := 0x305566778899AABB, EAP-Sim-RAND2 := 0x31000000000000000000000000000000, EAP-Sim-SRES2 := 0x31112233, EAP-Sim-KC2 := 0x315566778899AABB, EAP-Sim-RAND3 := 0x32000000000000000000000000000000, EAP-Sim-SRES3 := 0x32112233, EAP-Sim-KC3 := 0x325566778899AABB -dave@strongswan.org EAP-Type := SIM, EAP-Sim-RAND1 := 0x33000000000000000000000000000000, EAP-Sim-SRES1 := 0x33112233, EAP-Sim-KC1 := 0x335566778899AABB, EAP-Sim-RAND2 := 0x34000000000000000000000000000000, EAP-Sim-SRES2 := 0x34112233, EAP-Sim-KC2 := 0x345566778899AABB, EAP-Sim-RAND3 := 0x35000000000000000000000000000000, EAP-Sim-SRES3 := 0x35112233, EAP-Sim-KC3 := 0x355566778899AABB diff --git a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 92f96ad66..000000000 --- a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,13 +0,0 @@ -eap { - default_eap_type = tls - tls { - certdir = /etc/raddb/certs - cadir = /etc/raddb/certs - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } -} diff --git a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index 18ebf9e9d..000000000 --- a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,41 +0,0 @@ -authorize { - eap { - ok = return - } -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2/rw-eap-tls-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" diff --git a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index c91cd40fb..000000000 --- a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,18 +0,0 @@ -eap { - md5 { - } - default_eap_type = ttls - tls { - private_key_file = /etc/raddb/certs/aaaKey.pem - certificate_file = /etc/raddb/certs/aaaCert.pem - CA_file = /etc/raddb/certs/strongswanCert.pem - cipher_list = "DEFAULT" - dh_file = /etc/raddb/certs/dh - random_file = /etc/raddb/certs/random - } - ttls { - default_eap_type = md5 - use_tunneled_reply = yes - virtual_server = "inner-tunnel" - } -} diff --git a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 23cba8d11..000000000 --- a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm strongswan.org { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index dd0825858..000000000 --- a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,43 +0,0 @@ -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel b/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel deleted file mode 100644 index e088fae14..000000000 --- a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/sites-available/inner-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -server inner-tunnel { - -authorize { - suffix - eap { - ok = return - } - files -} - -authenticate { - eap -} - -session { - radutmp -} - -post-auth { - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} - -} # inner-tunnel server block diff --git a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users deleted file mode 100644 index 50ccf3e76..000000000 --- a/testing/tests/ikev2/rw-eap-ttls-radius/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1,2 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" -dave Cleartext-Password := "W7R0g3do" diff --git a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/eap.conf b/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/eap.conf deleted file mode 100644 index 623f42904..000000000 --- a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/eap.conf +++ /dev/null @@ -1,5 +0,0 @@ -eap { - default_eap_type = md5 - md5 { - } -} diff --git a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/proxy.conf b/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/proxy.conf deleted file mode 100644 index 783587b55..000000000 --- a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/proxy.conf +++ /dev/null @@ -1,5 +0,0 @@ -realm LOCAL { - type = radius - authhost = LOCAL - accthost = LOCAL -} diff --git a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/sites-available/default b/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/sites-available/default deleted file mode 100644 index a67a5dcb4..000000000 --- a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/sites-available/default +++ /dev/null @@ -1,42 +0,0 @@ -authorize { - eap { - ok = return - } - files -} - -authenticate { - eap -} - -preacct { - preprocess - acct_unique - suffix - files -} - -accounting { - detail - unix - radutmp - attr_filter.accounting_response -} - -session { - radutmp -} - -post-auth { - exec - Post-Auth-Type REJECT { - attr_filter.access_reject - } -} - -pre-proxy { -} - -post-proxy { - eap -} diff --git a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/users b/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/users deleted file mode 100644 index 247b918e3..000000000 --- a/testing/tests/ikev2/rw-radius-accounting/hosts/alice/etc/freeradius/users +++ /dev/null @@ -1 +0,0 @@ -carol Cleartext-Password := "Ar3etTnp" From ccac9c30479e37464f02676b55a4521de13b2e67 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 22 Sep 2021 13:28:53 +0200 Subject: [PATCH 3/7] testing: Allow DNS via TCP in net2net-dnscert scenario New versions of Bind limit the maximum UDP message size to 1232 bytes, which is the same that newer versions of libunbound propose as maximum via EDNS in requests, so increasing the limit on the server wouldn't help. Instead we allow DNS via TCP so the client can switch after receiving the truncated UDP response. --- .../tests/ikev2/net2net-dnscert/hosts/moon/etc/iptables.rules | 4 ++++ .../tests/ikev2/net2net-dnscert/hosts/sun/etc/iptables.rules | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/testing/tests/ikev2/net2net-dnscert/hosts/moon/etc/iptables.rules b/testing/tests/ikev2/net2net-dnscert/hosts/moon/etc/iptables.rules index b2c425289..7d1bea971 100644 --- a/testing/tests/ikev2/net2net-dnscert/hosts/moon/etc/iptables.rules +++ b/testing/tests/ikev2/net2net-dnscert/hosts/moon/etc/iptables.rules @@ -25,4 +25,8 @@ -A INPUT -i eth0 -p udp --sport 53 -s PH_IP_WINNETOU -j ACCEPT -A OUTPUT -o eth0 -p udp --dport 53 -d PH_IP_WINNETOU -j ACCEPT +# allow DNSSEC fetch from winnetou via TCP +-A INPUT -i eth0 -p tcp --sport 53 -s PH_IP_WINNETOU -j ACCEPT +-A OUTPUT -o eth0 -p tcp --dport 53 -d PH_IP_WINNETOU -j ACCEPT + COMMIT diff --git a/testing/tests/ikev2/net2net-dnscert/hosts/sun/etc/iptables.rules b/testing/tests/ikev2/net2net-dnscert/hosts/sun/etc/iptables.rules index b2c425289..7d1bea971 100644 --- a/testing/tests/ikev2/net2net-dnscert/hosts/sun/etc/iptables.rules +++ b/testing/tests/ikev2/net2net-dnscert/hosts/sun/etc/iptables.rules @@ -25,4 +25,8 @@ -A INPUT -i eth0 -p udp --sport 53 -s PH_IP_WINNETOU -j ACCEPT -A OUTPUT -o eth0 -p udp --dport 53 -d PH_IP_WINNETOU -j ACCEPT +# allow DNSSEC fetch from winnetou via TCP +-A INPUT -i eth0 -p tcp --sport 53 -s PH_IP_WINNETOU -j ACCEPT +-A OUTPUT -o eth0 -p tcp --dport 53 -d PH_IP_WINNETOU -j ACCEPT + COMMIT From 1ec01f10a25e3b799aa13682af8dd17522591076 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 22 Sep 2021 13:46:19 +0200 Subject: [PATCH 4/7] testing: Replace `arp` with `ip neigh` The net-tools package, which provides arp and other older utilities like ifconfig, is not installed anymore on Debian bullseye. --- testing/tests/ikev2/dhcp-dynamic/posttest.dat | 4 ++-- testing/tests/ikev2/dhcp-static-client-id/posttest.dat | 4 ++-- testing/tests/ikev2/dhcp-static-mac/posttest.dat | 4 ++-- testing/tests/ikev2/farp/pretest.dat | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/tests/ikev2/dhcp-dynamic/posttest.dat b/testing/tests/ikev2/dhcp-dynamic/posttest.dat index d258f1e38..5951a694b 100644 --- a/testing/tests/ikev2/dhcp-dynamic/posttest.dat +++ b/testing/tests/ikev2/dhcp-dynamic/posttest.dat @@ -9,5 +9,5 @@ venus::rm /var/lib/dhcp/dhcpd.leases*; touch /var/lib/dhcp/dhcpd.leases moon::iptables-restore < /etc/iptables.flush carol::iptables-restore < /etc/iptables.flush dave::iptables-restore < /etc/iptables.flush -alice::arp -d 10.1.0.50 -alice::arp -d 10.1.0.51 +alice::ip neigh del 10.1.0.50 dev eth0 +alice::ip neigh del 10.1.0.51 dev eth0 diff --git a/testing/tests/ikev2/dhcp-static-client-id/posttest.dat b/testing/tests/ikev2/dhcp-static-client-id/posttest.dat index 84ee53137..cd77f5d67 100644 --- a/testing/tests/ikev2/dhcp-static-client-id/posttest.dat +++ b/testing/tests/ikev2/dhcp-static-client-id/posttest.dat @@ -7,5 +7,5 @@ venus::service isc-dhcp-server stop 2> /dev/null moon::iptables-restore < /etc/iptables.flush carol::iptables-restore < /etc/iptables.flush dave::iptables-restore < /etc/iptables.flush -alice::arp -d 10.1.0.30 -alice::arp -d 10.1.0.40 +alice::ip neigh del 10.1.0.30 dev eth0 +alice::ip neigh del 10.1.0.40 dev eth0 diff --git a/testing/tests/ikev2/dhcp-static-mac/posttest.dat b/testing/tests/ikev2/dhcp-static-mac/posttest.dat index 84ee53137..cd77f5d67 100644 --- a/testing/tests/ikev2/dhcp-static-mac/posttest.dat +++ b/testing/tests/ikev2/dhcp-static-mac/posttest.dat @@ -7,5 +7,5 @@ venus::service isc-dhcp-server stop 2> /dev/null moon::iptables-restore < /etc/iptables.flush carol::iptables-restore < /etc/iptables.flush dave::iptables-restore < /etc/iptables.flush -alice::arp -d 10.1.0.30 -alice::arp -d 10.1.0.40 +alice::ip neigh del 10.1.0.30 dev eth0 +alice::ip neigh del 10.1.0.40 dev eth0 diff --git a/testing/tests/ikev2/farp/pretest.dat b/testing/tests/ikev2/farp/pretest.dat index 5d467f71f..98a58e2d8 100755 --- a/testing/tests/ikev2/farp/pretest.dat +++ b/testing/tests/ikev2/farp/pretest.dat @@ -1,8 +1,8 @@ moon::iptables-restore < /etc/iptables.rules carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules -alice::arp -d 10.1.0.30 -alice::arp -d 10.1.0.40 +alice::ip neigh del 10.1.0.30 dev eth0 +alice::ip neigh del 10.1.0.40 dev eth0 moon::systemctl start strongswan carol::systemctl start strongswan dave::systemctl start strongswan From f2420cee49fd2c2fc3a128dee86d991fb0129dcf Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 22 Sep 2021 14:04:39 +0200 Subject: [PATCH 5/7] libimcv: Add Debian 11 (bullseye) to IMV database --- src/libimcv/imv/data.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql index 6587b3d56..1b32d28d4 100644 --- a/src/libimcv/imv/data.sql +++ b/src/libimcv/imv/data.sql @@ -610,6 +610,12 @@ INSERT INTO products ( /* 102 */ 'Debian 10 x86_64' ); +INSERT INTO products ( /* 103 */ + name +) VALUES ( + 'Debian 11 x86_64' +); + /* Directories */ INSERT INTO directories ( /* 1 */ @@ -1336,6 +1342,12 @@ INSERT INTO groups_product_defaults ( 5, 102 ); +INSERT INTO groups_product_defaults ( + group_id, product_id +) VALUES ( + 5, 103 +); + INSERT INTO groups_product_defaults ( group_id, product_id ) VALUES ( From bc518158398330eb094ed40ec3f133f4a136a7d7 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 22 Sep 2021 14:10:54 +0200 Subject: [PATCH 6/7] testing: Determine Debian version in TNC scenarios automatically again Was statically set to 10 since f3d96b7bc9e2 ("Version bump to 5.9.1dr1"). --- testing/hosts/default/usr/local/bin/init_collector | 2 +- testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-os-pts/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-os/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat | 2 +- testing/tests/tnc/tnccs-20-pts/pretest.dat | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/hosts/default/usr/local/bin/init_collector b/testing/hosts/default/usr/local/bin/init_collector index c9206fec9..a9f951d3f 100755 --- a/testing/hosts/default/usr/local/bin/init_collector +++ b/testing/hosts/default/usr/local/bin/init_collector @@ -1,6 +1,6 @@ #! /bin/sh cat /usr/local/share/strongswan/templates/database/sw-collector/sw_collector_tables.sql | sqlite3 /etc/db.d/collector.db -sed -i "s/DEBIAN_VERSION/10/" /etc/pts/collector.sql +sed -i "s:DEBIAN_VERSION:`. /etc/os-release; echo $VERSION_ID`:" /etc/pts/collector.sql cat /etc/pts/collector.sql | sqlite3 /etc/db.d/collector.db LEAK_DETECTIVE_DISABLE=1 /usr/local/sbin/sw-collector diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat index 54da736b0..c59369820 100644 --- a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat @@ -7,7 +7,7 @@ carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id dave::cat /etc/tnc_config alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql -alice::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +alice::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db alice::/usr/local/bin/init_tnc diff --git a/testing/tests/tnc/tnccs-20-os-pts/pretest.dat b/testing/tests/tnc/tnccs-20-os-pts/pretest.dat index 5d002b793..df7fa88bf 100644 --- a/testing/tests/tnc/tnccs-20-os-pts/pretest.dat +++ b/testing/tests/tnc/tnccs-20-os-pts/pretest.dat @@ -3,7 +3,7 @@ carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id -moon::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +moon::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db moon::cat /etc/tnc_config carol::cat /etc/tnc_config diff --git a/testing/tests/tnc/tnccs-20-os/pretest.dat b/testing/tests/tnc/tnccs-20-os/pretest.dat index b98c41f2b..0dd78cb1a 100644 --- a/testing/tests/tnc/tnccs-20-os/pretest.dat +++ b/testing/tests/tnc/tnccs-20-os/pretest.dat @@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id moon::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql -moon::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +moon::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db moon::cat /etc/tnc_config carol::cat /etc/tnc_config diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat index 8c34c7e13..8f8930c98 100644 --- a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat @@ -13,7 +13,7 @@ dave::cat /etc/tnc_config carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql -alice::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +alice::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db alice::/usr/local/bin/init_tnc diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat index 115400645..0bb6d818c 100644 --- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat @@ -7,7 +7,7 @@ carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id dave::cat /etc/tnc_config alice::sed -i "s/NOW/`date +%s`/g" /etc/pts/data1.sql -alice::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +alice::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql alice::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db alice::chgrp -R www-data /etc/db.d/config.db; chmod -R g+w /etc/db.d/config.db alice::/usr/local/bin/init_tnc diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat b/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat index 5a539e3de..3302fa660 100644 --- a/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat @@ -3,7 +3,7 @@ carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id -moon::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +moon::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db moon::cat /etc/tnc_config carol::cat /etc/tnc_config diff --git a/testing/tests/tnc/tnccs-20-pts/pretest.dat b/testing/tests/tnc/tnccs-20-pts/pretest.dat index 5a539e3de..3302fa660 100644 --- a/testing/tests/tnc/tnccs-20-pts/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pts/pretest.dat @@ -3,7 +3,7 @@ carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules carol::echo 0 > /proc/sys/net/ipv4/ip_forward dave::echo aabbccddeeff11223344556677889900 > /var/lib/dbus/machine-id -moon::sed -i "s/DEBIAN_VERSION/10/" /etc/pts/data1.sql +moon::sed -i "s:DEBIAN_VERSION:\`. /etc/os-release\; echo \$VERSION_ID\`:" /etc/pts/data1.sql moon::cd /usr/local/share/strongswan/templates/database/imv; cat tables.sql data.sql /etc/pts/data1.sql | sqlite3 /etc/db.d/config.db moon::cat /etc/tnc_config carol::cat /etc/tnc_config From 3edf3856d4f35e68c0a0dd45224770a7f5ec1126 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 21 Sep 2021 19:30:00 +0200 Subject: [PATCH 7/7] testing: Use Debian bullseye as base image --- testing/testing.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/testing.conf b/testing/testing.conf index fed8cbbbe..fa163be7c 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -49,7 +49,7 @@ fi # Base image settings # The base image is a pristine OS installation created using debootstrap. : ${BASEIMGSIZE=2500} -: ${BASEIMGSUITE=buster} +: ${BASEIMGSUITE=bullseye} : ${BASEIMGARCH=amd64} : ${BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT} : ${BASEIMGMIRROR=http://http.debian.net/debian}