diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-01 13:59:02 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-01 13:59:02 -0500 |
| commit | 44dfeaec9209521ca6a65e85c1276bad4bdf5c01 (patch) | |
| tree | 91e0b849a3a114a612dd1b303ce71d4c127dc30a /tests/basic | |
| parent | 0ae461de6b7bf10d3b085dfd9a5d6d29ffd29116 (diff) | |
some tweaks to the man pages
Diffstat (limited to 'tests/basic')
| -rwxr-xr-x | tests/basic | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/basic b/tests/basic index b5afb23..99a881b 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,12 +206,15 @@ 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 @@ -226,6 +236,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 @@ -249,6 +260,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 @@ -293,6 +305,9 @@ chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids # FIXME: addtest: revoke the host key and check ssh failure + +###################################################################### + trap - EXIT echo "##################################################" |