close bug about problem in authorized_keys generation in monkeysphere-server.

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index 9f4d02ecc638063746c7dba41e06d40a48a9fa40..2befac2ed5e6b43807588bac144ac76accaa287d 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -22,18 +22,16 @@ gpgadmin() {
 failed_cleanup() {
 # FIXME: can we be more verbose here?
   echo 'FAILED!'
+  read -p "press enter to cleanup and remove tmp:"
+
   cleanup
 }
 
 # cleanup:
 cleanup() {
-
-    echo
-    read -p "press enter to cleanup and remove tmp:"
-
-    if ( ps $SSHD_PID >/dev/null ) ; then 
+    if ( ps "$SSHD_PID" >/dev/null ) ; then 
        echo "### stopping still-running sshd..."
-       kill $SSHD_PID
+       kill "$SSHD_PID"
     fi
 
     echo "### removing temp dir..."
@@ -85,6 +83,11 @@ cat <<EOF >> "$TEMPDIR"/testuser/.monkeysphere/monkeysphere.conf
 KNOWN_HOSTS=$TEMPDIR/testuser/.ssh/known_hosts
 EOF
 
+# set up a simple default monkeysphere-server.conf
+cat <<EOF >> "$TEMPDIR"/monkeysphere-server.conf
+AUTHORIZED_USER_IDS="$TEMPDIR/testuser/.monkeysphere/authorized_user_ids"
+EOF
+
 ### SERVER TESTS
 
 # setup monkeysphere temp gnupghome directories
@@ -149,15 +152,20 @@ gpgadmin --armor --export "$HOSTKEYID" | gpg --import
 # teach the "server" about the testuser's key
 echo "### export testuser key to server..."
 gpg --export testuser | monkeysphere-server gpg-authentication-cmd --import
-echo "### update server authorized_keys file for testuser..."
-monkeysphere-server update-users testuser
+echo "### update server authorized_keys file for this testuser..."
+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-agent bash -c \
-   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost"
+   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
 
 trap - EXIT
+
+echo
+echo "Monkeysphere basic tests completed successfully!"
+echo
+
 cleanup