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:
a40dd55
)
testing: change order of operations to make sure that authentication subkey is availa...
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 26 Oct 2008 06:40:29 +0000
(
02:40
-0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 26 Oct 2008 06:40:29 +0000
(
02:40
-0400)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index 3ef5c6c51695b2edb0019eb11dcfbd643ef5794c..9f4d02ecc638063746c7dba41e06d40a48a9fa40 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-127,12
+127,6
@@
HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
EOF
AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
EOF
-# teach the "server" about the testuser's key
-GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --export testuser | \
- monkeysphere-server gpg-authentication-cmd --import
-
-monkeysphere-server update-users testuser
-
# launch test sshd with the new host key.
echo "### starting sshd..."
socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
# launch test sshd with the new host key.
echo "### starting sshd..."
socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
@@
-152,6
+146,12
@@
monkeysphere gen-subkey --expire 0
echo "### export server key to testuser..."
gpgadmin --armor --export "$HOSTKEYID" | gpg --import
echo "### export server key to testuser..."
gpgadmin --armor --export "$HOSTKEYID" | gpg --import
+# teach the "server" about the testuser's key
+echo "### export testuser key to server..."
+gpg --export testuser | monkeysphere-server gpg-authentication-cmd --import
+echo "### update server authorized_keys file for testuser..."
+monkeysphere-server update-users testuser
+
# 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..."
# 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..."