mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2026-08-08 09:21:48 +08:00
Nikos Mavrogiannopoulos
826fe0ff30
After the occtl disconnect, poll 'occtl show user test' until the session is gone before attempting the reconnect. This guarantees that session_close() has already returned and main's event loop is free to process the reconnect worker's AUTH_COOKIE_REQ. Addresses intermittent failures observed in the Fedora, CentOS9, and CentOS10 CI jobs. Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
118 lines
3.2 KiB
Bash
Executable File
118 lines
3.2 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (C) 2020 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 test checks whether an explicitly disconnected user via occtl
|
|
# can connect again using its cookie.
|
|
|
|
OCCTL="${OCCTL:-../src/occtl/occtl}"
|
|
SERV="${SERV:-../src/ocserv}"
|
|
srcdir=${srcdir:-.}
|
|
TMPFILE=ocfile.$$.tmp
|
|
PIDFILE=ocserv-pid.$$.tmp
|
|
CLIPID=oc-pid.$$.tmp
|
|
OCCTL_SOCKET=./occtl-$$.socket
|
|
|
|
. `dirname $0`/common.sh
|
|
|
|
eval "${GETPORT}"
|
|
|
|
if test "$(id -u)" != "0";then
|
|
echo "This test must be run as root"
|
|
exit 77
|
|
fi
|
|
|
|
echo "Testing ocserv disconnection via occtl... "
|
|
|
|
function finish {
|
|
echo " * Cleaning up..."
|
|
cleanup_client_server
|
|
test -n "${TMPFILE}" && rm -f ${TMPFILE} >/dev/null 2>&1
|
|
}
|
|
trap finish EXIT
|
|
|
|
# server address
|
|
. `dirname $0`/random-net.sh
|
|
. `dirname $0`/ns.sh
|
|
|
|
# Run servers
|
|
update_config disconnect-user2.config
|
|
if test "$VERBOSE" = 1;then
|
|
DEBUG="-d 3"
|
|
fi
|
|
|
|
${CMDNS2} ${SERV} -p ${PIDFILE} -f -c ${CONFIG} ${DEBUG} & PID=$!
|
|
|
|
sleep 3
|
|
|
|
# Run clients
|
|
echo " * Getting cookie from ${ADDRESS}:${PORT}..."
|
|
( echo "test" | ${CMDNS1} ${OPENCONNECT} ${ADDRESS}:${PORT} -u test --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= --authenticate >${TMPFILE} )
|
|
if test $? != 0;then
|
|
echo "Could not get cookie from server"
|
|
exit 1
|
|
fi
|
|
|
|
eval $(cat ${TMPFILE})
|
|
echo " * Connecting to ${ADDRESS}:${PORT}..."
|
|
( ${CMDNS1} ${OPENCONNECT} -q ${ADDRESS}:${PORT} -u test --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= -s ${srcdir}/scripts/vpnc-script -C "${COOKIE}" --pid-file=${CLIPID} -b )
|
|
if test $? != 0;then
|
|
echo "Could not connect to server"
|
|
exit 1
|
|
fi
|
|
|
|
set -e
|
|
echo " * ping remote address"
|
|
|
|
${CMDNS1} ping -c 3 ${VPNADDR}
|
|
|
|
set +e
|
|
|
|
${OCCTL} -s ${OCCTL_SOCKET} disconnect user test
|
|
if test $? != 0;then
|
|
echo "occtl didn't find connected user!"
|
|
exit 1
|
|
fi
|
|
|
|
# Wait for main + sec-mod to finish session cleanup before reconnecting;
|
|
# without this, session_close() blocks main's event loop and the reconnect
|
|
# worker's AUTH_COOKIE_REQ goes unread, causing a deadlock.
|
|
for i in $(seq 1 10); do
|
|
${OCCTL} -s ${OCCTL_SOCKET} show user test >/dev/null 2>&1 || break
|
|
sleep 1
|
|
done
|
|
|
|
echo " * Re-connecting to obtain cookie after disconnect... "
|
|
( ${CMDNS1} ${OPENCONNECT} -q ${ADDRESS}:${PORT} -u test --servercert=pin-sha256:xp3scfzy3rOQsv9NcOve/8YVVv+pHr4qNCXEXrNl5s8= -s ${srcdir}/scripts/vpnc-script -C "${COOKIE}" --pid-file=${CLIPID} -b )
|
|
if test $? = 0;then
|
|
echo "Succeeded using the cookie to connect"
|
|
exit 1
|
|
fi
|
|
|
|
sleep 2
|
|
|
|
${OCCTL} -s ${OCCTL_SOCKET} show user test
|
|
if test $? = 0;then
|
|
echo "occtl found disconnected user!"
|
|
exit 1
|
|
fi
|
|
|
|
exit 0
|