Merge remote branch 'dkg/master'

Conflicts:
	tests/basic

diff --combined tests/basic
index 8cf093320a1cdeaa5a8aa1bf328269765f1a7970,f808387ec9ccb65b93cf9bbe14b6829c131cfa42..15afa77fe1dd4bf7817395f61930677e0b7e6e1a
--- 1/tests/basic
--- 2/tests/basic
+++ b/tests/basic
@@@ -10,7 -10,7 +10,7 @@@
  #   Jameson Rollins <jrollins@fifthhorseman.net>
  #   Micah Anderson <micah@riseup.net> 
  #
- # Copyright: 2008-2009
+ # Copyright: © 2008-2010
  # License: GPL v3 or later
  
  # these tests should all be able to run as a non-privileged user.
@@@ -133,8 -133,6 +133,8 @@@ export MONKEYSPHERE_SYSCONFIGDIR="$TEMP
  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!)
@@@ -257,8 -255,8 +257,8 @@@ monkeysphere-host import-key "$TEMPDIR"
  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
@@@ -272,8 -270,8 +272,8 @@@ monkeysphere-host set-expire 
  echo
  echo "##################################################"
  echo "### certifying server host key..."
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +< "$HOST_KEY_FILE" gpgadmin --import
- echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ echo y | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
  
  # FIXME: add revoker?
  
@@@ -323,7 -321,7 +323,7 @@@ monkeysphere gen-subke
  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
@@@ -342,6 -340,12 +342,12 @@@ monkeysphere-authentication update-user
  ######################################################################
  ### TESTS
  
+ ## see whether keys-for-userid works from the client's perspective:
+ echo
+ echo "##################################################"
+ echo "### testing monkeysphere keys-for-userid ..."
+ diff -q <( monkeysphere keys-for-userid ssh://testhost ) <( cut -f1,2 -d' ' < "$TEMPDIR"/ssh_host_rsa_key.pub )
+ 
  # connect to test sshd, using monkeysphere ssh-proxycommand to verify
  # the identity before connection.  This should work in both directions!
  echo
@@@ -501,39 -505,37 +507,37 @@@ echo "### ssh connection test directly 
  target_hostname=testhost2 ssh_test 255
  echo
  echo "##################################################"
- echo "### add hostname, certify by admin, import by user..."
- monkeysphere-host add-hostname ssh://testhost2
+ echo "### add servicename, certify by admin, import by user..."
+ monkeysphere-host add-servicename ssh://testhost2
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +<"$HOST_KEY_FILE" gpgadmin --import
- printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ 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"/host_keys.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..."
- monkeysphere-host revoke-hostname ssh://testhost2
+ monkeysphere-host revoke-servicename ssh://testhost2
 -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg
 +gpg --import <"$HOST_KEY_FILE"
  gpg --check-trustdb
  target_hostname=testhost2 ssh_test 255
  
  # FIXME: addtest: remove admin as id-certifier and check ssh failure
  
  # FIXME: addtest: how do we test that set-expire makes sense after new
- # hostnames have been added?
- 
- # FIXME: addtest: revoke the host key and check ssh failure
+ # servicenames have been added?
  
  # test to make sure things are OK after the previous tests:
  echo
@@@ -547,7 -549,20 +551,20 @@@ ssh_tes
  
  echo
  echo "##################################################"
- echo "### revoking host key..."
+ 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..."
  # generate the revocation certificate and feed it directly to the test
  # user's keyring (we're not publishing to the keyservers)
  monkeysphere-host revoke-key | gpg --import