X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=15afa77fe1dd4bf7817395f61930677e0b7e6e1a;hb=17315937bc0af145ef7dfb749096faad49f208aa;hp=0ae398b6acc2feeff33fceb4f748bca400422384;hpb=5530ebf34aeff13473b70f0704f037ed127a3c0d;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index 0ae398b..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!)
@@ -255,8 +257,8 @@ monkeysphere-host import-key "$TEMPDIR"/ssh_host_rsa_key ssh://testhost
 echo
 echo "##################################################"
 echo "### getting host key fingerprint..."
-HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
-echo "$HOSTKEYID"
+SSHHOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\  )
+echo "$SSHHOSTKEYID"
 
 # change host key expiration
 echo
@@ -270,8 +272,8 @@ monkeysphere-host set-expire 1
 echo
 echo "##################################################"
 echo "### certifying server host key..."
-< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import
-echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+< "$HOST_KEY_FILE" gpgadmin --import
+echo y | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
 
 # FIXME: add revoker?
 
@@ -321,7 +323,7 @@ monkeysphere gen-subkey
 echo
 echo "##################################################"
 echo "### export server key to testuser..."
-gpgadmin --armor --export "$HOSTKEYID" | gpg --import
+gpgadmin --armor --export "$SSHHOSTKEYID" | gpg --import
 
 # teach the "server" about the testuser's key
 echo
@@ -507,20 +509,20 @@ echo
 echo "##################################################"
 echo "### add servicename, certify by admin, import by user..."
 monkeysphere-host add-servicename ssh://testhost2
-< "$MONKEYSPHERE_SYSCONFIGDIR"/ssh_host_rsa_key.pub.gpg gpgadmin --import
-printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+<"$HOST_KEY_FILE" gpgadmin --import
+printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
 
 echo
 echo "##################################################"
 echo "### ssh connection test with hostname 'testhost2' added..."
-gpgadmin --export "$HOSTKEYID" | gpg --import
+gpgadmin --export "$SSHHOSTKEYID" | gpg --import
 gpg --check-trustdb
 ssh_test
 
 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
 
@@ -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"/ssh_host_rsa_key.pub.gpg
+gpg --import <"$HOST_KEY_FILE"
 gpg --check-trustdb
 target_hostname=testhost2 ssh_test 255
 
@@ -547,6 +549,19 @@ echo "##################################################"
 echo "### ssh connection test for success..."
 ssh_test
 
+echo
+echo "##################################################"
+echo "### Testing TLS setup..."
+
+openssl req -config "$TESTDIR"/openssl.cnf -x509 -newkey rsa:1024 -subj '/DC=net/DC=example/DC=testhost/CN=testhost.example.net/' -days 3 -keyout "$TEMPDIR"/tls_key.pem -nodes >"$TEMPDIR"/tls_cert.pem
+monkeysphere-host import-key "$TEMPDIR"/tls_key.pem https://testhost
+
+# FIXME: how can we test this via an https client?  
+# We don't currently provide one.
+
+# FIXME: should we test other monkeysphere-host operations somehow now
+# that we have more than one key in the host keyring?
+
 echo
 echo "##################################################"
 echo "### revoking ssh host key..."