diff options
Diffstat (limited to 'tests/basic')
| -rwxr-xr-x | tests/basic | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/basic b/tests/basic index f808387..15afa77 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!) @@ -270,7 +272,7 @@ monkeysphere-host set-expire 1 echo echo "##################################################" echo "### certifying server host key..." -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import +< "$HOST_KEY_FILE" gpgadmin --import echo y | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID" # FIXME: add revoker? @@ -507,7 +509,7 @@ echo echo "##################################################" echo "### add servicename, certify by admin, import by user..." monkeysphere-host add-servicename ssh://testhost2 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import +<"$HOST_KEY_FILE" gpgadmin --import printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID" echo @@ -520,7 +522,7 @@ ssh_test echo echo "##################################################" echo "### ssh connection test directly to 'testhost2' ..." -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg +gpg --import <"$HOST_KEY_FILE" gpg --check-trustdb target_hostname=testhost2 ssh_test @@ -528,7 +530,7 @@ echo echo "##################################################" echo "### ssh connection test for failure with 'testhost2' revoked..." monkeysphere-host revoke-servicename ssh://testhost2 -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg +gpg --import <"$HOST_KEY_FILE" gpg --check-trustdb target_hostname=testhost2 ssh_test 255 |