X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=3f948560bbc0c809c1e6f3db2e4576275ce01928;hb=8473500c66d561b6b8a317d93199f5e653dd8980;hp=7d354f9a92d39fc7f351ccbb8be1bb2edb8b06fc;hpb=e98366cd478343b9c39ced4984874cd611ccb4ad;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
old mode 100644
new mode 100755
index 7d354f9..3f94856
--- a/tests/basic
+++ b/tests/basic
@@ -13,42 +13,73 @@
 # (2008-09-13).  Please exercise with caution!
 
 # these tests assume a commonly-trusted "Admin's key", a fake key
-# permanently stored in ./admin:
-
+# permanently stored in ./home/admin/.gnupg:
 gpgadmin() {
-    GNUPGHOME=./admin gpg "$@"
+    GNUPGHOME="$TESTDIR"/home/admin/.gnupg gpg "$@"
 }
 
 
 # cleanup:
-
 cleanup() {
-    rm -f ./ssh-socket
+    # FIXME: stop the sshd process
+
+    echo
+    echo "### removing temp dir..."
+    rm -rf "$TEMPDIR"
 
     # FIXME: how should we clear out the temporary $VARLIB?
 
     # FIXME: clear out ssh client config file and known hosts.
 }
 
+## setup trap
+#trap cleanup EXIT
+
 ## set up some variables to ensure that we're operating strictly in
 ## the tests, not system-wide:
 
-# FIXME: can we override $VARLIB ?
-# FIXME: can we override $ETC ?
+export TESTDIR=$(pwd)
+
+# make temp dir
+TEMPDIR="$TESTDIR"/tmp
+if [ -e "$TEMPDIR" ] ; then
+    echo "tempdir '$TEMPDIR' already exists."
+    exit 1
+fi
+mkdir "$TEMPDIR"
 
 # Use the local copy of executables first, instead of system ones.
 # This should help us test without installing.
-export PATH=$(pwd)/../src:$(pwd)/../src/keytrans:$PATH
-export MONKEYSPHERE_SHARE=$(pwd)/../src
+export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
+
+export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
+export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
+export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src
+export MONKEYSPHERE_MONKEYSPHERE_USER="$USER"
+export MONKEYSPHERE_CHECK_KEYSERVER=false
+
+SSHD_CONFIG="$TEMPDIR"/sshd_config
+export SOCKET="$TEMPDIR"/ssh-socket
+
+### SERVER TESTS
 
-# create a new host key, certify it with the "Admin's Key".
+# create the temp gnupghome directories
+mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/gnupg-host
+mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
 
-echo | monkeysphere-server gen-key --expire 2d
+# add the quick-random option to the gpg host config
+echo "quick-random" >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host.conf
+
+# create a new host key
+echo "### generating server key..."
+echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
 
 HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\  )
 
+# certify it with the "Admin's Key".
+# (this would normally be done via keyservers)
+echo "### certifying server key..."
 monkeysphere-server gpg-authentication-cmd "--armor --export $HOSTKEYID" | gpgadmin --import
-
 gpgadmin --sign-key "$HOSTKEYID"
 
 # FIXME: how can we test publish-key without flooding junk into the
@@ -57,22 +88,39 @@ gpgadmin --sign-key "$HOSTKEYID"
 # indicate that the "Admin's" key is an identity certifier for the
 # host
 
-monkeysphere-server add-identity-certifier ./admin/pubkey.gpg
+echo "### adding admin as certifier..."
+monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
 
-# launch sshd with the new host key.
+# initialize base sshd_config
+cp etc/ssh/sshd_config "$TEMPDIR"/sshd_config
+# write the sshd_config
+cat <<EOF >> "$SSHD_CONFIG"
+HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
+EOF
 
-mkfifo ./ssh-socket
+# launch test sshd with the new host key.
+echo "### starting sshd..."
+socat EXEC:'/usr/sbin/sshd -f '"$SSHD_CONFIG"' -i -d -d -d -D -e' "UNIX-LISTEN:${SOCKET}" &
 
-sshd -f ./sshd_config -i <>./ssh-socket
 
-# connect to sample sshd host key, using monkeysphere to verify the
-# identity before connection.
+### TESTUSER TESTS
 
-## FIXME: implement!
+# copy testuser home directory into temp dir
+cp -r "$TESTDIR"/home/testuser "$TEMPDIR"/
+
+# generate an auth subkey for the test user
+echo "### generating key for testuser..."
+MONKEYSPHERE_GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
+    monkeysphere gen-subkey --expire 0
+
+# connect to test sshd, using monkeysphere to verify the identity
+# before connection.
+echo "### connecting to sshd socket..."
+PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}"
+ssh -oProxyCommand="$PROXY_COMMAND" testhost
 
 # create a new client side key, certify it with the "CA", use it to
 # log in.
 
 ## FIXME: implement!
-
-