summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 00:42:35 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 00:42:35 -0400
commit0461219ac31b04250dd7ea0630ef6da4c6bc1065 (patch)
tree33bd0dce7ff6bec4bb592950b0d119ed880888b8 /tests
parente0eab1b5b18a6f7ab21de7f91166d3b640fbf0f8 (diff)
testing: make final ssh command more verbose; supplying a default empty password for gen-subkey.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/basic b/tests/basic
index 722b837..b1f3493 100755
--- a/tests/basic
+++ b/tests/basic
@@ -121,6 +121,7 @@ export SSHD_PID=$!
# generate an auth subkey for the test user
echo "### generating key for testuser..."
MONKEYSPHERE_GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
+SSH_ASKPASS=echo \
monkeysphere gen-subkey --expire 0
# add server key to testuser keychain
@@ -128,12 +129,10 @@ echo "### export server key to testuser..."
gpgadmin --armor --export "$HOSTKEYID" | \
GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
-# connect to test sshd, using monkeysphere to verify the identity
-# before connection.
+# connect to test sshd, using monkeysphere-ssh-proxycommand to verify
+# the identity before connection. This should work in both directions!
echo "### testuser connecting to sshd socket..."
PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}"
-GNUPGHOME="$TEMPDIR"/testuser/.gnupg ssh -oProxyCommand="$PROXY_COMMAND" testhost
+GNUPGHOME="$TEMPDIR"/testuser/.gnupg ssh -v -v -v -oProxyCommand="$PROXY_COMMAND" testhost
+
-# create a new client side key, certify it with the "CA", use it to
-# log in.
-## FIXME: implement!