From fc9cd704db9ecf42c806de9ae43bff6fc96181eb Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Sun, 6 Jan 2019 18:48:27 +0000 Subject: [PATCH] e2e test will not loop infinitely --- Dockerfile | 4 +--- sshpiperd/e2e/test.sh | 15 +++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 39f8798d..4ee8f860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ LABEL maintainer="Boshi Lian" RUN apt-get update && apt-get install -y libpam0g-dev libpam-google-authenticator -RUN ln -sf /usr/include/security/_pam_types.h /usr/include/security/pam_types.h - ADD . /go/src/github.com/tg123/sshpiper/ RUN go install -ldflags "$(/go/src/github.com/tg123/sshpiper/sshpiperd/ldflags.sh)" -tags pam github.com/tg123/sshpiper/sshpiperd @@ -13,4 +11,4 @@ EXPOSE 2222 ADD entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] -CMD ["/go/bin/sshpiperd"] +CMD ["/go/bin/sshpiperd", "daemon"] diff --git a/sshpiperd/e2e/test.sh b/sshpiperd/e2e/test.sh index 7f5c2e27..79b620c0 100644 --- a/sshpiperd/e2e/test.sh +++ b/sshpiperd/e2e/test.sh @@ -9,15 +9,19 @@ ssh-keygen -N '' -f /workingdir/host1/id_rsa /bin/cp /local/id_rsa.pub /workingdir/host1/authorized_keys /bin/cp /workingdir/host1/id_rsa.pub /host1/authorized_keys +chmod 600 /workingdir/host1/authorized_keys +chmod 600 /host1/authorized_keys echo "root@host1" > /workingdir/host1/sshpiper_upstream +chmod 600 /workingdir/host1/sshpiper_upstream + echo "root@host2" > /workingdir/host2/sshpiper_upstream +chmod 600 /workingdir/host2/sshpiper_upstream fail="\033[0;31mFAIL\033[0m" succ="\033[0;32mSUCC\033[0m" - runtest(){ casename=$1 host=$2 @@ -43,13 +47,12 @@ runtest(){ if [ $? -ne 0 ];then echo -e "welcome text" $fail + exit 1 fi } -while true; do - runtest "host1 with public key:" "host1" "ssh host1@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /local/id_rsa cat /names/host1" - runtest "host2 with password:" "host2" "sshpass -p root ssh host2@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null cat /names/host2" - sleep 2 -done +runtest "host1 with public key:" "host1" "ssh host1@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /local/id_rsa cat /names/host1" +runtest "host2 with password:" "host2" "sshpass -p root ssh host2@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null cat /names/host2" +