X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=393bcc22845e50b9cf61e65a83aa386322f17490;hb=3e5ccfd11d143e113944a8c35831618421d90552;hp=8d2b8f8768e2c25545626a368afc977a7d757446;hpb=6b5b0fdfc95625892df654e4ae057a798e59d588;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index 8d2b8f8..393bcc2 100755
--- a/tests/basic
+++ b/tests/basic
@@ -19,21 +19,33 @@ gpgadmin() {
     GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
 }
 
-failed_cleanup() {
-# FIXME: can we be more verbose here?
-  echo 'FAILED!'
-  cleanup
+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
 }
 
-# cleanup:
-cleanup() {
+ssh_test() {
+    ssh-agent bash -c \
+	"monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
+}
 
-    echo
+failed_cleanup() {
+    # FIXME: can we be more verbose here?
+    echo 'FAILED!'
     read -p "press enter to cleanup and remove tmp:"
 
-    if ( ps $SSHD_PID >/dev/null ) ; then 
+    cleanup
+}
+
+cleanup() {
+    if [ "$SSHD_PID" ] && ( ps "$SSHD_PID" >/dev/null ) ; then 
 	echo "### stopping still-running sshd..."
-	kill $SSHD_PID
+	kill "$SSHD_PID"
     fi
 
     echo "### removing temp dir..."
@@ -68,8 +80,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..."
@@ -78,6 +91,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
 
@@ -134,8 +148,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
 
@@ -160,9 +173,32 @@ 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
 
-ssh-agent bash -c \
-   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost"
+# 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
+
+# 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
+
+echo
+echo "Monkeysphere basic tests completed successfully!"
+echo
+
 cleanup