diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x[-rw-r--r--] | tests/basic | 36 | ||||
| -rw-r--r-- | tests/home/admin/.gnupg/pubring.gpg (renamed from tests/admin/pubring.gpg) | bin | 421 -> 421 bytes | |||
| -rw-r--r-- | tests/home/admin/.gnupg/random_seed (renamed from tests/admin/random_seed) | bin | 600 -> 600 bytes | |||
| -rw-r--r-- | tests/home/admin/.gnupg/secring.gpg (renamed from tests/admin/secring.gpg) | bin | 753 -> 753 bytes | |||
| -rw-r--r-- | tests/home/admin/.gnupg/trustdb.gpg (renamed from tests/admin/trustdb.gpg) | bin | 1280 -> 1280 bytes |
5 files changed, 26 insertions, 10 deletions
diff --git a/tests/basic b/tests/basic index 7d354f9..ff897d2 100644..100755 --- a/tests/basic +++ b/tests/basic @@ -23,7 +23,9 @@ gpgadmin() { # cleanup: cleanup() { - rm -f ./ssh-socket + # FIXME: stop the sshd process + + rm -f "$SOCKET" # FIXME: how should we clear out the temporary $VARLIB? @@ -33,20 +35,26 @@ cleanup() { ## 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 ? +TESTDIR=$(pwd) +export MONKEYSPHERE_SYSDATADIR="$TESTDIR"/var +export MONKEYSPHERE_SYSCONFIGDIR="$TESTDIR"/etc +export SOCKET="$TESTDIR"/ssh-socket + +### SERVER TESTS # 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_SHARE="$TESTDIR"/../src -# create a new host key, certify it with the "Admin's Key". +# create a new host key echo | monkeysphere-server gen-key --expire 2d HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\ ) +# certify it with the "Admin's Key". +# (this would normally be done via keyservers) monkeysphere-server gpg-authentication-cmd "--armor --export $HOSTKEYID" | gpgadmin --import gpgadmin --sign-key "$HOSTKEYID" @@ -57,13 +65,22 @@ 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 +monkeysphere-server add-identity-certifier ./home/admin/.gnupg/pubkey.gpg + +# write the sshd_config +cat <<EOF > "$TESTDIR"/etc/ssh/sshd_config +HostKey ${TESTDIR}/etc/ssh/ssh_host_rsa_key +EOF # launch sshd with the new host key. -mkfifo ./ssh-socket +mkfifo "$SOCKET" + +/usr/sbin/sshd -f "$TESTDIR"/etc/ssh/sshd_config -i <>"$SOCKET" -sshd -f ./sshd_config -i <>./ssh-socket + + +### TESTUSER TESTS # connect to sample sshd host key, using monkeysphere to verify the # identity before connection. @@ -75,4 +92,3 @@ sshd -f ./sshd_config -i <>./ssh-socket ## FIXME: implement! - diff --git a/tests/admin/pubring.gpg b/tests/home/admin/.gnupg/pubring.gpg Binary files differindex ce19633..ce19633 100644 --- a/tests/admin/pubring.gpg +++ b/tests/home/admin/.gnupg/pubring.gpg diff --git a/tests/admin/random_seed b/tests/home/admin/.gnupg/random_seed Binary files differindex 753251b..753251b 100644 --- a/tests/admin/random_seed +++ b/tests/home/admin/.gnupg/random_seed diff --git a/tests/admin/secring.gpg b/tests/home/admin/.gnupg/secring.gpg Binary files differindex a46dd5e..a46dd5e 100644 --- a/tests/admin/secring.gpg +++ b/tests/home/admin/.gnupg/secring.gpg diff --git a/tests/admin/trustdb.gpg b/tests/home/admin/.gnupg/trustdb.gpg Binary files differindex 77ef133..77ef133 100644 --- a/tests/admin/trustdb.gpg +++ b/tests/home/admin/.gnupg/trustdb.gpg |