projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce45ef5
)
tweaks to tests/basic for new monkeysphere-host ui
author
Jameson Rollins
<jrollins@finestructure.net>
Sat, 16 Jan 2010 00:37:45 +0000
(19:37 -0500)
committer
Jameson Rollins
<jrollins@finestructure.net>
Sat, 16 Jan 2010 00:37:45 +0000
(19:37 -0500)
tests/basic
patch
|
blob
|
history
diff --git
a/tests/basic
b/tests/basic
index 6fe323798052523612d3db2964933fabf0847d32..8cf093320a1cdeaa5a8aa1bf328269765f1a7970 100755
(executable)
--- 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)
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!)
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
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 "##################################################"
echo
echo "##################################################"
@@
-270,7
+272,7
@@
monkeysphere-host set-expire 1
echo
echo "##################################################"
echo "### certifying server host key..."
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?
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..."
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
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' ..."
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..."
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
gpg --check-trustdb
target_hostname=testhost2 ssh_test 255