From a7636d325dc645afb834483972007e0958de6a45 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 12 Oct 2008 12:18:11 -0400 Subject: some work on the test script. --- tests/admin/pubring.gpg | Bin 421 -> 0 bytes tests/admin/random_seed | Bin 600 -> 0 bytes tests/admin/secring.gpg | Bin 753 -> 0 bytes tests/admin/trustdb.gpg | Bin 1280 -> 0 bytes tests/basic | 36 ++++++++++++++++++++++++++---------- tests/home/admin/.gnupg/pubring.gpg | Bin 0 -> 421 bytes tests/home/admin/.gnupg/random_seed | Bin 0 -> 600 bytes tests/home/admin/.gnupg/secring.gpg | Bin 0 -> 753 bytes tests/home/admin/.gnupg/trustdb.gpg | Bin 0 -> 1280 bytes 9 files changed, 26 insertions(+), 10 deletions(-) delete mode 100644 tests/admin/pubring.gpg delete mode 100644 tests/admin/random_seed delete mode 100644 tests/admin/secring.gpg delete mode 100644 tests/admin/trustdb.gpg mode change 100644 => 100755 tests/basic create mode 100644 tests/home/admin/.gnupg/pubring.gpg create mode 100644 tests/home/admin/.gnupg/random_seed create mode 100644 tests/home/admin/.gnupg/secring.gpg create mode 100644 tests/home/admin/.gnupg/trustdb.gpg diff --git a/tests/admin/pubring.gpg b/tests/admin/pubring.gpg deleted file mode 100644 index ce19633..0000000 Binary files a/tests/admin/pubring.gpg and /dev/null differ diff --git a/tests/admin/random_seed b/tests/admin/random_seed deleted file mode 100644 index 753251b..0000000 Binary files a/tests/admin/random_seed and /dev/null differ diff --git a/tests/admin/secring.gpg b/tests/admin/secring.gpg deleted file mode 100644 index a46dd5e..0000000 Binary files a/tests/admin/secring.gpg and /dev/null differ diff --git a/tests/admin/trustdb.gpg b/tests/admin/trustdb.gpg deleted file mode 100644 index 77ef133..0000000 Binary files a/tests/admin/trustdb.gpg and /dev/null differ diff --git a/tests/basic b/tests/basic old mode 100644 new mode 100755 index 7d354f9..ff897d2 --- 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 < "$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/home/admin/.gnupg/pubring.gpg b/tests/home/admin/.gnupg/pubring.gpg new file mode 100644 index 0000000..ce19633 Binary files /dev/null and b/tests/home/admin/.gnupg/pubring.gpg differ diff --git a/tests/home/admin/.gnupg/random_seed b/tests/home/admin/.gnupg/random_seed new file mode 100644 index 0000000..753251b Binary files /dev/null and b/tests/home/admin/.gnupg/random_seed differ diff --git a/tests/home/admin/.gnupg/secring.gpg b/tests/home/admin/.gnupg/secring.gpg new file mode 100644 index 0000000..a46dd5e Binary files /dev/null and b/tests/home/admin/.gnupg/secring.gpg differ diff --git a/tests/home/admin/.gnupg/trustdb.gpg b/tests/home/admin/.gnupg/trustdb.gpg new file mode 100644 index 0000000..77ef133 Binary files /dev/null and b/tests/home/admin/.gnupg/trustdb.gpg differ -- cgit v1.2.3