X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=4d2266ebf5a6b22dd40fd2c19030b7f788c94e97;hb=44a499dd669cc20e77e35c2f7ffcbc2a8f08ec29;hp=e30f31b7f758dfe757bcfa3a8c9ce42dec16bf19;hpb=98ee387a0ba4b15fe80cfcd7828127ff8ae9518d;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index e30f31b..4d2266e 100755
--- a/tests/basic
+++ b/tests/basic
@@ -23,6 +23,9 @@ which socat >/dev/null || { echo "You must have socat installed to run this test
 
 ## FIXME: other checks?
 
+######################################################################
+### FUNCTIONS
+
 # gpg command for test admin user
 gpgadmin() {
     GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
@@ -103,7 +106,9 @@ SSHD_PID=
 trap failed_cleanup EXIT
 
 
+######################################################################
 ### SETUP VARIABLES
+
 ## set up some variables to ensure that we're operating strictly in
 ## the tests, not system-wide:
 
@@ -138,6 +143,7 @@ export SOCKET="$TEMPDIR"/ssh-socket
 export DISPLAY=monkeys
 
 
+######################################################################
 ### CONFIGURE ENVIRONMENTS
 
 # copy in admin and testuser home to tmp
@@ -172,6 +178,7 @@ AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authentication/authorized_keys/%u
 EOF
 
 
+######################################################################
 ### SERVER HOST SETUP
 
 # set up monkeysphere host
@@ -199,26 +206,24 @@ echo "### certifying server host key..."
 GNUPGHOME="$MONKEYSPHERE_SYSCONFIGDIR"/host gpg --armor --export "$HOSTKEYID" | gpgadmin --import
 echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
 
+# FIXME: add revoker?
+
 # FIXME: how can we test publish-key without flooding junk into the
 # keyservers?
 
 # FIXME: should we run "diagnostics" here to test setup?
 
 
+######################################################################
 ### SERVER AUTHENTICATION SETUP
 
 # set up monkeysphere authentication
 echo "##################################################"
-echo "### configuring monkeysphere authentication..."
-mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/{authorized_keys,core,sphere,tmp}
+echo "### setup monkeysphere authentication..."
 cp "$TESTDIR"/etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/
 cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf
 AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids"
 EOF
-
-# setup server authentication
-echo "##################################################"
-echo "### setting up server authentication..."
 monkeysphere-authentication setup
 get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
 
@@ -230,6 +235,7 @@ echo y | monkeysphere-authentication add-id-certifier "$TEMPDIR"/admin/.gnupg/pu
 # FIXME: should we run "diagnostics" here to test setup?
 
 
+######################################################################
 ### TESTUSER SETUP
 
 # generate an auth subkey for the test user that expires in 2 days
@@ -253,6 +259,7 @@ echo "### update server authorized_keys file for this testuser..."
 monkeysphere-authentication update-users $(whoami)
 
 
+######################################################################
 ### TESTS
 
 # connect to test sshd, using monkeysphere-ssh-proxycommand to verify
@@ -297,6 +304,9 @@ chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids
 
 # FIXME: addtest: revoke the host key and check ssh failure
 
+
+######################################################################
+
 trap - EXIT
 
 echo "##################################################"