X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=2befac2ed5e6b43807588bac144ac76accaa287d;hb=a7b32862181b24557fdad586a17b49fc9366b620;hp=832b33a69836a5ba5410ed1b3a8d93a8468c9f93;hpb=deff162a515d6cbd4a657f62d8137c4e82ca7d30;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index 832b33a..2befac2 100755
--- 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,11 +83,17 @@ 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
 mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/gnupg-host
 mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
+mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authorized_keys
 cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication/gpg.conf
 primary-keyring ${MONKEYSPHERE_SYSDATADIR}/gnupg-authentication/pubring.gpg
 keyring ${MONKEYSPHERE_SYSDATADIR}/gnupg-host/pubring.gpg
@@ -126,9 +130,6 @@ HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
 AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
 EOF
 
-# FIXME: teach the "server" about the testuser's key, and update the
-# fake authorized_keys file for testuser!
-
 # 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 &
@@ -148,12 +149,23 @@ monkeysphere gen-subkey --expire 0
 echo "### export server key to testuser..."
 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 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