From 66a263e477fcea131f792bfa57653e0457c6ce7c Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sun, 18 Oct 2020 00:29:01 +0200 Subject: [PATCH] tests: increase the size of a transmitted banner to reproduce #364 Signed-off-by: Nikos Mavrogiannopoulos --- tests/banner | 11 ++++++----- tests/data/test1.config | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/banner b/tests/banner index c18b249b..44954e29 100755 --- a/tests/banner +++ b/tests/banner @@ -23,8 +23,9 @@ SERV="${SERV:-../src/ocserv}" srcdir=${srcdir:-.} NO_NEED_ROOT=1 -TMPFILE=ocserv-plbanner.$$.tmp +TMPFILE=ocserv-banner.$$.tmp PIDFILE=ocserv-pid.$$.tmp +BANNER="Welcome%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%All" . `dirname $0`/common.sh @@ -52,9 +53,9 @@ echo "Connecting to obtain cookie... " ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >${TMPFILE} 2>&1 ) || fail $PID "Could not receive cookie from server" -grep "AN UNPREDICTABLE BANNER" ${TMPFILE} >/dev/null +grep "${BANNER}" ${TMPFILE} >/dev/null if test $? != 0;then - echo "The banner was not printed" + echo "The banner was not printed (1)" cat $TMPFILE exit 1 fi @@ -63,9 +64,9 @@ echo "Connecting to obtain cookie with wrong password... " ( echo "tost" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT $ADDRESS:$PORT -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >${TMPFILE} 2>&1 ) && fail $PID "Received cookie when we shouldn't" -grep "AN UNPREDICTABLE BANNER" ${TMPFILE} >/dev/null +grep "${BANNER}" ${TMPFILE} >/dev/null if test $? != 0;then - echo "The banner was not printed" + echo "The banner was not printed (2)" cat $TMPFILE exit 1 fi diff --git a/tests/data/test1.config b/tests/data/test1.config index cce0a376..513b5f56 100644 --- a/tests/data/test1.config +++ b/tests/data/test1.config @@ -12,7 +12,7 @@ max-ban-score = 0 # A banner to be displayed on clients #banner = "Welcome" -pre-login-banner = "AN UNPREDICTABLE BANNER" +pre-login-banner = "Welcome%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%All" # Use listen-host to limit to specific IPs or to the IPs of a provided hostname. #listen-host = [IP|HOSTNAME]