GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 00:37:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

test-udp-listen-host: added some reliability improvements

Browse Source 
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
This commit is contained in:
Nikos Mavrogiannopoulos
2020-06-28 20:05:50 +02:00
committed by Nikos Mavrogiannopoulos
parent 8457249a8e
commit 95fb96ee32
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/data/test-udp-listen-host.config
View File

@@ -110,12 +110,6 @@ auth-timeout = 40
# a failed authentication attempt.
#min-reauth-time = 2
# Cookie validity time (in seconds)
# Once a client is authenticated he's provided a cookie with
# which he can reconnect. This option sets the maximum lifetime
# of that cookie.
cookie-validity = 172800
# Script to call when a client connects and obtains an IP
# Parameters are passed on the environment.
# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),

37
tests/test-udp-listen-host
View File

@@ -57,11 +57,31 @@ function finish {
rm "${OUTFILE}" "${CONFIG_UDP_LISTEN_LOCAL}"
# first openconnect cli will exit after ocserv is killed/restarted
kill "$(cat "${CLIPID2}")"
rm "${CLIPID2}"
test -f "${CLIPID2}" && kill "$(cat "${CLIPID2}")"
test -f "${CLIPID}" && kill "$(cat "${CLIPID}")"
rm -f "${CLIPID2}" "${CLIPID}"
}
trap finish EXIT
function wait_file {
local file=$1
local max_time=$2
local time=0
while [ ${time} -lt ${max_time} ]
do
sleep 5
if test -e ${file};then
echo "Found file (waited ${time})"
return 0
fi
let time+=5
done
#timeout
echo "Could not find ${file} after ${time} secs"
}
# server address
ADDRESS=10.201.2.1
CLI_ADDRESS=10.201.1.1
@@ -91,9 +111,9 @@ sleep 3
echo " * Connecting to haproxy and using dtls ... "
echo "test" | ${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${HAPORT} --user test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --script=/bin/true --verbose --pid-file "${CLIPID}" --background
${OCCTL} -s ${OCCTL_SOCKET} show user ${USERNAME} >${OUTFILE}
wait_file "${CLIPID}" 11
sleep 3
${OCCTL} -s ${OCCTL_SOCKET} show user ${USERNAME} >${OUTFILE}
grep "DTLS cipher:" ${OUTFILE}
if test $? != 0;then
@@ -101,17 +121,20 @@ if test $? != 0;then
exit 1
fi
test -n "${PID}" && kill "${PID}" >/dev/null 2>&1
test -n "${PID}" && kill "${PID}" >/dev/null
sed -e "s/^udp-listen-host = ${ADDRESS}/udp-listen-host = 127.0.0.1/" "${CONFIG}" >${CONFIG_UDP_LISTEN_LOCAL}
kill -9 "${PID}" >/dev/null
wait ${PID}
kill "$(cat "${CLIPID}")"
sleep 1
echo "restart ocsev with udp-listen-host set to 127.0.0.1"
${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG_UDP_LISTEN_LOCAL} ${DEBUG} & PID=$!
echo " * Connecting to haproxy and using dtls again ... "
echo "test" | ${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${HAPORT} --user test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --script=/bin/true --verbose --pid-file "${CLIPID2}" --background
sleep 3
wait_file "${CLIPID2}" 11
${OCCTL} -s ${OCCTL_SOCKET} show user ${USERNAME} >${OUTFILE}