test suite now auto-detects which flavor of prng support GPG uses.

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index 2befac2ed5e6b43807588bac144ac76accaa287d..9c3796cd516d770e9168d05b05830c4a3d75eed5 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -19,17 +19,39 @@ gpgadmin() {
     GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
 }
 
+launch_sshd() {
+    socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
+    export SSHD_PID=$!
+
+    # wait until the socket is created before continuing
+    while [ ! -S "$SOCKET" ] ; do
+       sleep 1
+    done
+}
+
+ssh_test() {
+    ssh-agent bash -c \
+       "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
+}
+
 failed_cleanup() {
-# FIXME: can we be more verbose here?
-  echo 'FAILED!'
-  read -p "press enter to cleanup and remove tmp:"
+    # FIXME: can we be more verbose here?
+    echo 'FAILED!'
+    read -p "press enter to cleanup and remove tmp:"
 
-  cleanup
+    cleanup
+}
+
+get_gpg_prng_arg() {
+    if (gpg --quick-random --version >/dev/null 2>&1) ; then
+       echo quick-random
+    elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
+       echo debug-quick-random
+    fi
 }
 
-# cleanup:
 cleanup() {
-    if ( ps "$SSHD_PID" >/dev/null ) ; then 
+    if [ "$SSHD_PID" ] && ( ps "$SSHD_PID" >/dev/null ) ; then 
        echo "### stopping still-running sshd..."
        kill "$SSHD_PID"
     fi
@@ -66,8 +88,9 @@ export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src
 export MONKEYSPHERE_MONKEYSPHERE_USER="$USER"
 export MONKEYSPHERE_CHECK_KEYSERVER=false
 
-SSHD_CONFIG="$TEMPDIR"/sshd_config
+export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
+export SSHD_PID=
 
 # copy in admin and testuser home to tmp
 echo "### copying admin and testuser homes..."
@@ -76,6 +99,7 @@ cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
 
 cat <<EOF >> "$TEMPDIR"/testuser/.ssh/config
 UserKnownHostsFile $TEMPDIR/testuser/.ssh/known_hosts
+IdentityFile $TEMPDIR/testuser/.ssh/no-such-identity
 ProxyCommand $TEMPDIR/testuser/.ssh/proxy-command %h %p $SOCKET
 EOF
 
@@ -83,6 +107,8 @@ cat <<EOF >> "$TEMPDIR"/testuser/.monkeysphere/monkeysphere.conf
 KNOWN_HOSTS=$TEMPDIR/testuser/.ssh/known_hosts
 EOF
 
+get_gpg_prng_arg >> "$TEMPDIR"/testuser/.gnupg/gpg.conf
+
 # set up a simple default monkeysphere-server.conf
 cat <<EOF >> "$TEMPDIR"/monkeysphere-server.conf
 AUTHORIZED_USER_IDS="$TEMPDIR/testuser/.monkeysphere/authorized_user_ids"
@@ -102,7 +128,7 @@ EOF
 # create a new host key
 echo "### generating server key..."
 # add gpg.conf with quick-random
-echo "quick-random" >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
+get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
 echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
 # remove the gpg.conf
 rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
@@ -132,8 +158,7 @@ EOF
 
 # launch test sshd with the new host key.
 echo "### starting sshd..."
-socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
-export SSHD_PID=$!
+launch_sshd
 
 ### TESTUSER TESTS
 
@@ -158,9 +183,27 @@ monkeysphere-server update-users "$USER"
 # connect to test sshd, using monkeysphere-ssh-proxycommand to verify
 # the identity before connection.  This should work in both directions!
 echo "### testuser connecting to sshd socket..."
+ssh_test
+
+# kill the previous sshd process if it's still running
+kill "$SSHD_PID"
+
+# now remove the testuser's authorized_user_ids file and reupdate
+# authorized_keys file...
+echo "### removing testuser authorized_user_ids and reupdating authorized_keys..."
+rm -f "$TEMPDIR"/testuser/.monkeysphere/authorized_user_ids
+monkeysphere-server update-users "$USER"
+
+# restart the sshd
+echo "### restarting sshd..."
+launch_sshd
 
-ssh-agent bash -c \
-   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
+# and make sure the user can no longer connect
+echo "### testuser attempting to connect to sshd socket..."
+ssh_test || SSH_RETURN="$?"
+if [ "$SSH_RETURN" != '255' ] ; then
+    exit
+fi
 
 trap - EXIT