updated full-test

tests/Makefile.am

@@ -3,7 +3,7 @@ EXTRA_DIST = ca-key.pem ca.pem common.sh server-cert.pem server-key.pem test1.co
 	user-config/test test-pass-script.config test-multi-cookie.config test-pam.config \
 	test-stress.config user-cert-wrong.pem connect-script test-group.passwd \
 	test-group-pass.config user-group-cert.pem user-group-key.pem test-user-group-cert.config \
-	test-user-group-cert-no-pass.config echo-admin
+	test-user-group-cert-no-pass.config
 
 SUBDIRS = docker-ocserv
 

tests/docker-ocserv/Dockerfile

@@ -1,14 +1,13 @@
 FROM tianon/debian:jessie
 
-RUN apt-get update;sleep 1
+RUN apt-get update;sleep 3
 RUN apt-get install -y libgnutls-deb0-28
 RUN apt-get install -y libprotobuf-c1
 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200
 RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen
 RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash
-#RUN apt-get install -y inotify-tools
-RUN apt-get update
 RUN apt-get install -y libtalloc2
+RUN sed 's/PermitRootLogin without-password/PermitRootLogin yes/g' -i /etc/ssh/sshd_config
 
 RUN echo 'root:root' |chpasswd
 RUN useradd -m -d /home/admin -s /bin/bash admin

tests/docker-ocserv/ocserv.conf

@@ -5,6 +5,14 @@
 auth = "plain[/etc/ocserv/passwd]"
 #auth = "pam"
 
+# Whether to enable support for the occtl tool (i.e., either through D-BUS,
+# or via a unix socket).
+use-occtl = true
+
+# 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"

tests/full-test

@@ -106,8 +106,29 @@ if test $? != 0;then
 	stop
 fi
 
-export SSH_ASKPASS="$srcdir/echo-admin"
+echo "Waiting for RX data to be sent to master"
-setsid ssh admin@192.168.1.190 occtl show user test >out.tmp 2>&1
+sleep 65
+
+echo "UserKnownHostsFile ./known-hosts.tmp" >config.tmp
+
+printf "#\!/bin/sh\n" >echo-admin.tmp
+printf "echo yes" >>echo-admin.tmp
+printf "echo root" >>echo-admin.tmp
+printf "\n" >>echo-admin.tmp
+chmod 755 echo-admin.tmp
+export SSH_ASKPASS="./echo-admin.tmp"
+setsid ssh -T -F config.tmp root@192.168.1.190 occtl show user test >out.tmp 2>&1
+cat out.tmp
+
+printf "#\!/bin/sh\n" >echo-admin.tmp
+printf "echo root" >>echo-admin.tmp
+printf "\n" >>echo-admin.tmp
+chmod 755 echo-admin.tmp
+setsid ssh -T -F config.tmp root@192.168.1.190 occtl show user test >out.tmp 2>&1
+cat out.tmp
+rm -f echo-admin.tmp
+rm -f config.tmp
+rm -f known-hosts.tmp
 
 grep "RX data" out.tmp
 if test $? != 0;then