mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2026-08-08 09:21:48 +08:00
tests: add radius-multi-group-comma test for group-separator=comma
Regression test for the group-separator=comma option: verifies that OU= Class attributes with comma-separated group names (as sent by Freeradius) are correctly parsed when group-separator=comma is set. Relates: #428 Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
This commit is contained in:
Nikos Mavrogiannopoulos
@@ -124,6 +124,16 @@ test-multi-class-ou Cleartext-Password := "test-multi-class-ou"
|
||||
Class = "OU=group3;group4",
|
||||
Framed-MTU = 1500
|
||||
|
||||
test-multi-class-ou-comma Cleartext-Password := "test-multi-class-ou-comma"
|
||||
Service-Type = Framed-User,
|
||||
Framed-Protocol = PPP,
|
||||
Framed-IP-Address = 192.168.95.192,
|
||||
Framed-IP-Netmask = 255.255.255.0,
|
||||
Framed-Routing = Broadcast-Listen,
|
||||
Class = "OU=group1,group2",
|
||||
Class = "OU=group3,group4",
|
||||
Framed-MTU = 1500
|
||||
|
||||
testtime Cleartext-Password := "test"
|
||||
Service-Type = Framed-User,
|
||||
Framed-Protocol = PPP,
|
||||
|
||||
@@ -0,0 +1,301 @@
|
||||
# User authentication method. Could be set multiple times and in that case
|
||||
# all should succeed.
|
||||
# Options: certificate, pam.
|
||||
#auth = "certificate"
|
||||
#auth = "plain[/etc/ocserv/passwd]"
|
||||
#auth = "pam"
|
||||
auth = "radius[config=@RADIUSCLIENT_DIR@/radiusclient.conf,groupconfig=true,nas-identifier=ocserv1,group-separator=comma]"
|
||||
#enable-auth = "certificate"
|
||||
|
||||
# Whether to enable support for the occtl tool (i.e., either through D-BUS,
|
||||
# or via a unix socket).
|
||||
occtl-socket-file = @OCCTL_SOCKET@
|
||||
use-occtl = true
|
||||
|
||||
select-group = group1
|
||||
select-group = group2
|
||||
select-group = group3
|
||||
select-group = group4
|
||||
|
||||
isolate-workers = @ISOLATE_WORKERS@
|
||||
|
||||
# socket file used for IPC with occtl. You only need to set that,
|
||||
# if you use more than a single servers.
|
||||
#occtl-socket-file = /var/run/occtl.socket
|
||||
|
||||
# The plain option requires specifying a password file which contains
|
||||
# entries of the following format.
|
||||
# "username:groupname:encoded-password"
|
||||
# One entry must be listed per line, and 'ocpasswd' can be used
|
||||
# to generate password entries.
|
||||
#auth = "plain[/etc/ocserv/ocpasswd]"
|
||||
|
||||
acct = "radius[config=@RADIUSCLIENT_DIR@/radiusclient.conf]"
|
||||
|
||||
# A banner to be displayed on clients
|
||||
#banner = "Welcome"
|
||||
|
||||
stats-report-time = 30
|
||||
|
||||
# Use listen-host to limit to a specific IP or to the IPs of a provided
|
||||
# hostname.
|
||||
#listen-host = @ADDRESS@
|
||||
|
||||
# Limit the number of clients. Unset or set to zero for unlimited.
|
||||
#max-clients = 1024
|
||||
max-clients = 16
|
||||
|
||||
# Limit the number of client connections to one every X milliseconds
|
||||
# (X is the provided value). Set to zero for no limit.
|
||||
#rate-limit-ms = 100
|
||||
|
||||
# Limit the number of identical clients (i.e., users connecting
|
||||
# multiple times). Unset or set to zero for unlimited.
|
||||
max-same-clients = 2
|
||||
|
||||
# TCP and UDP port number
|
||||
tcp-port = @PORT@
|
||||
udp-port = @PORT@
|
||||
|
||||
# Keepalive in seconds
|
||||
keepalive = 32400
|
||||
|
||||
# Dead peer detection in seconds.
|
||||
dpd = 240
|
||||
|
||||
# Dead peer detection for mobile clients. The needs to
|
||||
# be much higher to prevent such clients being awaken too
|
||||
# often by the DPD messages, and save battery.
|
||||
# (clients that send the X-AnyConnect-Identifier-DeviceType)
|
||||
mobile-dpd = 1800
|
||||
|
||||
# MTU discovery (DPD must be enabled)
|
||||
try-mtu-discovery = false
|
||||
|
||||
# The key and the certificates of the server
|
||||
# The key may be a file, or any URL supported by GnuTLS (e.g.,
|
||||
# tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
|
||||
# or pkcs11:object=my-vpn-key;object-type=private)
|
||||
#
|
||||
# There may be multiple certificate and key pairs and each key
|
||||
# should correspond to the preceding certificate.
|
||||
server-cert = @SRCDIR@/certs/server-cert.pem
|
||||
server-key = @SRCDIR@/certs/server-key.pem
|
||||
|
||||
# Diffie-Hellman parameters. Only needed if you require support
|
||||
# for the DHE ciphersuites (by default this server supports ECDHE).
|
||||
# Can be generated using:
|
||||
# certtool --generate-dh-params --outfile /path/to/dh.pem
|
||||
#dh-params = /path/to/dh.pem
|
||||
|
||||
# If you have a certificate from a CA that provides an OCSP
|
||||
# service you may provide a fresh OCSP status response within
|
||||
# the TLS handshake. That will prevent the client from connecting
|
||||
# independently on the OCSP server.
|
||||
# You can update this response periodically using:
|
||||
# ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response
|
||||
# Make sure that you replace the following file in an atomic way.
|
||||
#ocsp-response = /path/to/ocsp.der
|
||||
|
||||
# In case PKCS #11 or TPM keys are used the PINs should be available
|
||||
# in files. The srk-pin-file is applicable to TPM keys only, and is the
|
||||
# storage root key.
|
||||
#pin-file = /path/to/pin.txt
|
||||
#srk-pin-file = /path/to/srkpin.txt
|
||||
|
||||
# The Certificate Authority that will be used to verify
|
||||
# client certificates (public keys) if certificate authentication
|
||||
# is set.
|
||||
ca-cert = /etc/ocserv/ca.pem
|
||||
|
||||
# The object identifier that will be used to read the user ID in the client
|
||||
# certificate. The object identifier should be part of the certificate's DN
|
||||
# Useful OIDs are:
|
||||
# CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
|
||||
cert-user-oid = 0.9.2342.19200300.100.1.1
|
||||
|
||||
# The object identifier that will be used to read the user group in the
|
||||
# client certificate. The object identifier should be part of the certificate's
|
||||
# DN. Useful OIDs are:
|
||||
# OU (organizational unit) = 2.5.4.11
|
||||
cert-group-oid = 2.5.4.11
|
||||
|
||||
# The revocation list of the certificates issued by the 'ca-cert' above.
|
||||
#crl = /path/to/crl.pem
|
||||
|
||||
# GnuTLS priority string
|
||||
tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT"
|
||||
|
||||
# To enforce perfect forward secrecy (PFS) on the main channel.
|
||||
#tls-priorities = "NORMAL:%SERVER_PRECEDENCE:%COMPAT:-RSA"
|
||||
|
||||
# The time (in seconds) that a client is allowed to stay connected prior
|
||||
# to authentication
|
||||
auth-timeout = 40
|
||||
|
||||
# The time (in seconds) that a client is allowed to stay idle (no traffic)
|
||||
# before being disconnected. Unset to disable.
|
||||
#idle-timeout = 1200
|
||||
|
||||
# The time (in seconds) that a mobile client is allowed to stay idle (no
|
||||
# traffic) before being disconnected. Unset to disable.
|
||||
#mobile-idle-timeout = 2400
|
||||
|
||||
# ReKey time (in seconds)
|
||||
# ocserv will ask the client to refresh keys periodically once
|
||||
# this amount of seconds is elapsed. Set to zero to disable.
|
||||
rekey-time = 172800
|
||||
|
||||
# ReKey method
|
||||
# Valid options: ssl, new-tunnel
|
||||
# ssl: Will perform an efficient rehandshake on the channel allowing
|
||||
# a seamless connection during rekey.
|
||||
# new-tunnel: Will instruct the client to discard and re-establish the channel.
|
||||
# Use this option only if the connecting clients have issues with the ssl
|
||||
# option.
|
||||
rekey-method = ssl
|
||||
|
||||
# Script to call when a client connects and obtains an IP
|
||||
# Parameters are passed on the environment.
|
||||
# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),
|
||||
# DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP
|
||||
# in the P-t-P connection), IP_REMOTE (the VPN IP of the client),
|
||||
# ID (a unique numeric ID); REASON may be "connect" or "disconnect".
|
||||
#connect-script = /usr/bin/myscript
|
||||
#disconnect-script = /usr/bin/myscript
|
||||
|
||||
# UTMP
|
||||
use-utmp = true
|
||||
|
||||
# D-BUS usage. If disabled occtl tool cannot be used. If enabled
|
||||
# then ocserv must have access to register org.infradead.ocserv
|
||||
# D-BUS service. See doc/dbus/org.infradead.ocserv.conf
|
||||
use-dbus = false
|
||||
|
||||
# PID file. It can be overridden in the command line.
|
||||
pid-file = /var/run/ocserv.pid
|
||||
|
||||
# The default server directory. Does not require any devices present.
|
||||
#chroot-dir = /path/to/chroot
|
||||
|
||||
# socket file used for IPC, will be appended with .PID
|
||||
# It must be accessible within the chroot environment (if any)
|
||||
socket-file = /var/run/ocserv-socket
|
||||
|
||||
# The user the worker processes will be run as. It should be
|
||||
# unique (no other services run as this user).
|
||||
run-as-user = @USERNAME@
|
||||
run-as-group = @GROUP@
|
||||
|
||||
# Set the protocol-defined priority (SO_PRIORITY) for packets to
|
||||
# be sent. That is a number from 0 to 6 with 0 being the lowest
|
||||
# priority. Alternatively this can be used to set the IP Type-
|
||||
# Of-Service, by setting it to a hexadecimal number (e.g., 0x20).
|
||||
# This can be set per user/group or globally.
|
||||
#net-priority = 3
|
||||
|
||||
# Set the VPN worker process into a specific cgroup. This is Linux
|
||||
# specific and can be set per user/group or globally.
|
||||
#cgroup = "cpuset,cpu:test"
|
||||
|
||||
#
|
||||
# Network settings
|
||||
#
|
||||
|
||||
# The name of the tun device
|
||||
device = vpns
|
||||
|
||||
# The default domain to be advertised
|
||||
default-domain = example.com
|
||||
|
||||
# The pool of addresses that leases will be given from.
|
||||
ipv4-network = @VPNNET@
|
||||
ipv6-network = @VPNNET6@
|
||||
|
||||
# The advertised DNS server. Use multiple lines for
|
||||
# multiple servers.
|
||||
# dns = fc00::4be0
|
||||
#dns = 192.168.1.2
|
||||
|
||||
# The NBNS server (if any)
|
||||
#nbns = 192.168.1.3
|
||||
|
||||
# The domains over which the provided DNS should be used. Use
|
||||
# multiple lines for multiple domains.
|
||||
#split-dns = example.com
|
||||
|
||||
# Prior to leasing any IP from the pool ping it to verify that
|
||||
# it is not in use by another (unrelated to this server) host.
|
||||
ping-leases = false
|
||||
|
||||
# Unset to assign the default MTU of the device
|
||||
# mtu =
|
||||
|
||||
# Unset to enable bandwidth restrictions (in bytes/sec). The
|
||||
# setting here is global, but can also be set per user or per group.
|
||||
#rx-data-per-sec = 40000
|
||||
#tx-data-per-sec = 40000
|
||||
|
||||
# The number of packets (of MTU size) that are available in
|
||||
# the output buffer. The default is low to improve latency.
|
||||
# Setting it higher will improve throughput.
|
||||
#output-buffer = 10
|
||||
|
||||
# Routes to be forwarded to the client. If you need the
|
||||
# client to forward routes to the server, you may use the
|
||||
# config-per-user/group or even connect and disconnect scripts.
|
||||
#
|
||||
# To set the server as the default gateway for the client just
|
||||
# comment out all routes from the server.
|
||||
route = 10.209.209.0/255.255.255.0
|
||||
#route = 192.168.5.0/255.255.255.0
|
||||
route = fc13:71:ea31:4b4e::/64
|
||||
|
||||
# Configuration files that will be applied per user connection or
|
||||
# per group. Each file name on these directories must match the username
|
||||
# or the groupname.
|
||||
# The options allowed in the configuration files are dns, nbns,
|
||||
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-data-per-sec, iroute, route,
|
||||
# net-priority and cgroup.
|
||||
#
|
||||
# Note that the 'iroute' option allows one to add routes on the server
|
||||
# based on a user or group. The syntax depends on the input accepted
|
||||
# by the commands route-add-cmd and route-del-cmd (see below).
|
||||
|
||||
#config-per-user = /etc/ocserv/config-per-user/
|
||||
#config-per-group = /etc/ocserv/config-per-group/
|
||||
|
||||
# The system command to use to setup a route. %R will be replaced with the
|
||||
# route/mask and %D with the (tun) device.
|
||||
#
|
||||
# The following example is from linux systems. %R should be something
|
||||
# like 192.168.2.0/24
|
||||
|
||||
#route-add-cmd = "ip route add %R dev %D"
|
||||
#route-del-cmd = "ip route delete %R dev %D"
|
||||
|
||||
#
|
||||
# The following options are for (experimental) AnyConnect client
|
||||
# compatibility.
|
||||
|
||||
# Client profile xml. A sample file exists in doc/profile.xml.
|
||||
# This file must be accessible from inside the worker's chroot.
|
||||
# It is not used by the openconnect client.
|
||||
#user-profile = profile.xml
|
||||
|
||||
# Binary files that may be downloaded by the CISCO client. Must
|
||||
# be within any chroot environment.
|
||||
#binary-files = /path/to/binaries
|
||||
|
||||
# Unless set to false it is required for clients to present their
|
||||
# certificate even if they are authenticating via a previously granted
|
||||
# cookie and complete their authentication in the same TCP connection.
|
||||
# Legacy CISCO clients do not do that, and thus this option should be
|
||||
# set for them.
|
||||
#cisco-client-compat = false
|
||||
|
||||
#Advanced options
|
||||
|
||||
# Option to allow sending arbitrary custom headers to the client after
|
||||
# authentication and prior to VPN tunnel establishment.
|
||||
#custom-header = "X-My-Header: hi there"
|
||||
+1
-1
@@ -283,7 +283,7 @@ if get_option('root-tests')
|
||||
|
||||
if radcli_dep.found()
|
||||
foreach s : ['radius', 'radius-group', 'radius-multi-group',
|
||||
'radius-otp', 'radius-config']
|
||||
'radius-multi-group-comma', 'radius-otp', 'radius-config']
|
||||
test(s, find_program(s),
|
||||
env: test_env,
|
||||
timeout: 300,
|
||||
|
||||
Executable
+154
@@ -0,0 +1,154 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2018 Nikos Mavrogiannopoulos
|
||||
#
|
||||
# This file is part of ocserv.
|
||||
#
|
||||
# ocserv is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by the
|
||||
# Free Software Foundation; either version 2 of the License, or (at
|
||||
# your option) any later version.
|
||||
#
|
||||
# ocserv is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# This tests the group-separator=comma option for radius OU= Class attributes.
|
||||
|
||||
OCCTL="${OCCTL:-../src/occtl/occtl}"
|
||||
SERV="${SERV:-../src/ocserv}"
|
||||
srcdir=${srcdir:-.}
|
||||
PIDFILE=ocserv-pid.$$.tmp
|
||||
CLIPID=oc-pid.$$.tmp
|
||||
PATH=${PATH}:/usr/sbin
|
||||
IP=$(which ip)
|
||||
OUTFILE=traffic.$$.tmp
|
||||
RADIUSLOG=radius-group.$$.log
|
||||
RADIUSD=$(which radiusd)
|
||||
|
||||
if test -z "${RADIUSD}";then
|
||||
RADIUSD=$(which freeradius)
|
||||
fi
|
||||
|
||||
. `dirname $0`/common.sh
|
||||
|
||||
eval "${GETPORT}"
|
||||
|
||||
if test -z "${IP}";then
|
||||
echo "no IP tool is present"
|
||||
exit 77
|
||||
fi
|
||||
|
||||
if test -z "${RADIUSD}";then
|
||||
echo "no radiusd is present"
|
||||
exit 77
|
||||
fi
|
||||
|
||||
if test "$(id -u)" != "0";then
|
||||
echo "This test must be run as root"
|
||||
exit 77
|
||||
fi
|
||||
|
||||
echo "Testing ocserv and radius with group-separator=comma... "
|
||||
|
||||
function finish {
|
||||
echo " * Cleaning up..."
|
||||
cleanup_client_server
|
||||
test -n "${RADIUSPID}" && kill ${RADIUSPID} >/dev/null 2>&1
|
||||
rm -f ${OUTFILE} 2>&1
|
||||
test -f "${RADIUSLOG}" && cat "${RADIUSLOG}"
|
||||
rm -f "${RADIUSLOG}"
|
||||
}
|
||||
trap finish EXIT
|
||||
|
||||
# server address
|
||||
. `dirname $0`/random-net.sh
|
||||
|
||||
# These must match the data/raddb/users:test-multi-class-ou-comma user
|
||||
VPNNET=192.168.95.0/24
|
||||
VPNADDR=192.168.95.192
|
||||
VPNNET6=fc7d:b139:f7ba:5f50:c634:e98e:b777:0/112
|
||||
VPNADDR6=fc7d:b139:f7ba:5f50:c634:e98e:b777:1
|
||||
OCCTL_SOCKET=./occtl-radius-group-$$.socket
|
||||
|
||||
. `dirname $0`/ns.sh
|
||||
|
||||
${CMDNS2} ${IP} link set dev lo up
|
||||
|
||||
# Run servers
|
||||
${CMDNS2} ${RADIUSD} -d ${RADDB_DIR}/ -s -xx -l ${RADIUSLOG} &
|
||||
RADIUSPID=$!
|
||||
|
||||
update_config radius-multi-group-comma.config
|
||||
if test "$VERBOSE" = 1;then
|
||||
DEBUG="-d 3"
|
||||
fi
|
||||
|
||||
${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG} ${DEBUG} & PID=$!
|
||||
|
||||
sleep 4
|
||||
|
||||
GROUP=group4
|
||||
echo " * Tests OU= comma-separated groups ($GROUP)"
|
||||
USERNAME=test-multi-class-ou-comma
|
||||
( echo "${USERNAME}" | ${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} --authgroup ${GROUP} -u ${USERNAME} --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= -s ${srcdir}/scripts/vpnc-script --pid-file=${CLIPID} --passwd-on-stdin -b )
|
||||
if test $? != 0;then
|
||||
echo "Could not connect to server"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sleep 6
|
||||
|
||||
${CMDNS1} ${IP} addr show|grep $(echo ${VPNADDR}|cut -d '.' -f 1-3)
|
||||
if test $? != 0;then
|
||||
${CMDNS1} ${IP} addr show
|
||||
echo "Did not find expected IP in VPN"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MATCH="Groupname: ${GROUP}"
|
||||
${OCCTL} -s ${OCCTL_SOCKET} show user ${USERNAME} >${OUTFILE} 2>&1
|
||||
grep "${MATCH}" ${OUTFILE}
|
||||
if test $? != 0;then
|
||||
cat ${OUTFILE}
|
||||
echo "could not find group information"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
test -f "${CLIPID}" && kill $(cat ${CLIPID}) >/dev/null 2>&1
|
||||
test -n "${CLIPID}" && rm -f ${CLIPID} >/dev/null 2>&1
|
||||
sleep 4
|
||||
|
||||
GROUP=group1
|
||||
echo " * Tests OU= comma-separated groups ($GROUP)"
|
||||
USERNAME=test-multi-class-ou-comma
|
||||
( echo "${USERNAME}" | ${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} --authgroup ${GROUP} -u ${USERNAME} --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= -s ${srcdir}/scripts/vpnc-script --pid-file=${CLIPID} --passwd-on-stdin -b )
|
||||
if test $? != 0;then
|
||||
echo "Could not connect to server"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sleep 6
|
||||
|
||||
${CMDNS1} ${IP} addr show|grep $(echo ${VPNADDR}|cut -d '.' -f 1-3)
|
||||
if test $? != 0;then
|
||||
${CMDNS1} ${IP} addr show
|
||||
echo "Did not find expected IP in VPN"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MATCH="Groupname: ${GROUP}"
|
||||
${OCCTL} -s ${OCCTL_SOCKET} show user ${USERNAME} >${OUTFILE} 2>&1
|
||||
grep "${MATCH}" ${OUTFILE}
|
||||
if test $? != 0;then
|
||||
cat ${OUTFILE}
|
||||
echo "could not find group information"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Reference in New Issue
Block a user