projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e0eab1b
)
testing: make final ssh command more verbose; supplying a default empty password...
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 26 Oct 2008 04:42:35 +0000
(
00:42
-0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 26 Oct 2008 04:42:35 +0000
(
00:42
-0400)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index 722b837096a0a13e6a39f327bfd61b0e87177849..b1f3493c4aae90a446abb114599a3dacd3e40df8 100755
(executable)
--- 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 \
# 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
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
gpgadmin --armor --export "$HOSTKEYID" | \
GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
-# connect to test sshd, using monkeysphere
to verify the identit
y
-#
before connection.
+# connect to test sshd, using monkeysphere
-ssh-proxycommand to verif
y
+#
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}"
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!