From 0bb085de4a8eb0a1ba86f50a39aa46c17c52747c Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 14 Apr 2018 18:15:52 +0200 Subject: [PATCH] tests: pam-test was restricted to pam_matrix valgrind and asan were indicating issues with pam_oath, so avoid using it in the testsuite. Signed-off-by: Nikos Mavrogiannopoulos --- README.md | 2 -- tests/data/pam/ocserv.in | 1 - tests/test-pam | 17 ++++++----------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 06ce3b78..26f5d8c1 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ seccomp: libseccomp-dev / libseccomp-devel occtl: libreadline-dev / readline-devel libnl-route-3-dev / libnl3-devel GSSAPI: libkrb5-dev / krb5-devel -OATH: liboath-dev / liboath-devel Radius: libradcli-dev / radcli-devel ``` @@ -54,7 +53,6 @@ libpam-wrapper / pam_wrapper libnss-wrapper / nss_wrapper libsocket-wrapper / socket_wrapper gss-ntlmssp / gssntlmssp -libpam-oath / pam_oath haproxy / haproxy iputils-ping / iputils ``` diff --git a/tests/data/pam/ocserv.in b/tests/data/pam/ocserv.in index 9131c31b..3f5d628d 100644 --- a/tests/data/pam/ocserv.in +++ b/tests/data/pam/ocserv.in @@ -1,6 +1,5 @@ #%PAM-1.0 auth required @PAMWRAPDIR@/pam_matrix.so passdb=./data/pam/passdb -auth requisite @PAMDIR@/pam_oath.so debug usersfile=./data/pam/users.oath window=20 account required @PAMWRAPDIR@/pam_matrix.so passdb=./data/pam/passdb account required @PAMWRAPDIR@/pam_matrix.so passdb=./data/pam/passdb session required @PAMWRAPDIR@/pam_matrix.so passdb=./data/pam/passdb diff --git a/tests/test-pam b/tests/test-pam index 2e1cb5cf..421bbfb3 100755 --- a/tests/test-pam +++ b/tests/test-pam @@ -27,7 +27,7 @@ VERBOSE=1 . `dirname $0`/common.sh -echo "Testing PAM backend with username-password-otp... " +echo "Testing PAM backend with username-password... " export PAMDIR=pam update_config test-pam.config @@ -35,23 +35,18 @@ launch_sr_pam_server -d 1 -f -c ${CONFIG} & PID=$! wait_server $PID echo "" -echo "Connecting with wrong password and OTP... " -( echo -e "testuser\n9999999\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u testuser --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1 ) && +echo "Connecting with wrong password... " +( echo -e "testuser\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u testuser --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1 ) && fail $PID "Received cookie with wrong cred" echo "" echo "Connecting with wrong username... " -( echo -e "testuser123\n328482\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1 ) && +( echo -e "testuser123\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u test --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1 ) && fail $PID "Received cookie with wrong cred" echo "" -echo "Connecting with wrong OTP... " -( echo -e "testuser123\n328489\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u testuser --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly >/dev/null 2>&1 ) && - fail $PID "Received cookie with wrong cred" - -echo "" -echo "Connecting with correct password and OTP... " -( echo -e "testuser123\n328482\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u testuser --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly ) ||#>/dev/null 2>&1 ) || +echo "Connecting with correct password... " +( echo -e "testuser123\n" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -v $ADDRESS:$PORT --authgroup group2 -u testuser --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly ) ||#>/dev/null 2>&1 ) || fail $PID "Could not receive cookie from server" cleanup