diff options
| author | Jameson Rollins <jrollins@finestructure.net> | 2010-01-15 19:37:45 -0500 |
|---|---|---|
| committer | Jameson Rollins <jrollins@finestructure.net> | 2010-01-15 19:37:45 -0500 |
| commit | 11349dccbc0cb233bd8206897f278f6241c39117 (patch) | |
| tree | 2c72bc4e7afda5a964e4f49d4a2a1f99a3314164 /tests | |
| parent | ce45ef5702e072e869fa9d1b703f99dc740eb000 (diff) | |
tweaks to tests/basic for new monkeysphere-host ui
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/basic b/tests/basic index 6fe3237..8cf0933 100755 --- a/tests/basic +++ b/tests/basic @@ -133,6 +133,8 @@ export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR" export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami) +HOST_KEY_FILE="$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg + export MONKEYSPHERE_CHECK_KEYSERVER=false # example.org does not respond to the HKP port, so this should cause # any keyserver connection attempts that do happen (they shouldn't!) @@ -250,7 +252,7 @@ echo echo "##################################################" echo "### import host key..." ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key -monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key testhost +monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key ssh://testhost echo echo "##################################################" @@ -270,7 +272,7 @@ monkeysphere-host set-expire 1 echo echo "##################################################" echo "### certifying server host key..." -< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import +< "$HOST_KEY_FILE" gpgadmin --import echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID" # FIXME: add revoker? @@ -500,8 +502,8 @@ target_hostname=testhost2 ssh_test 255 echo echo "##################################################" echo "### add hostname, certify by admin, import by user..." -monkeysphere-host add-hostname testhost2 -< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import +monkeysphere-host add-hostname ssh://testhost2 +<"$HOST_KEY_FILE" gpgadmin --import printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID" echo @@ -514,15 +516,15 @@ ssh_test echo echo "##################################################" echo "### ssh connection test directly to 'testhost2' ..." -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg +gpg --import <"$HOST_KEY_FILE" gpg --check-trustdb target_hostname=testhost2 ssh_test echo echo "##################################################" echo "### ssh connection test for failure with 'testhost2' revoked..." -monkeysphere-host revoke-hostname testhost2 -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg +monkeysphere-host revoke-hostname ssh://testhost2 +gpg --import <"$HOST_KEY_FILE" gpg --check-trustdb target_hostname=testhost2 ssh_test 255 |