X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=blobdiff_plain;f=tests%2Fbasic;h=ad9fb12eaa642d4121cc385fe0d1af12998b8c76;hp=dfbe8346a59404d67921b266091d0593bed72131;hb=c4b0a1e409cab69558aaa0fd47f7076ed6481e3e;hpb=3c279d569194643a5acf2316d0f9e3783cc5aeb1 diff --git a/tests/basic b/tests/basic index dfbe834..ad9fb12 100755 --- a/tests/basic +++ b/tests/basic @@ -10,7 +10,7 @@ # Jameson Rollins # Micah Anderson # -# Copyright: 2008-2009 +# Copyright: © 2008-2010 # License: GPL v3 or later # these tests should all be able to run as a non-privileged user. @@ -90,6 +90,17 @@ ssh_test() { fi } +# invoke this instead of ssh_test() if you want this test to be +# skipped when the working directory has bad permissions. +ssh_good_perm_test() { + if [ "$TEMPDIR_PERMISSIONS_SAFE" = no ] ; then + echo "WARNING!!! Test SKIPPED because we are running in an unsafe working directory." + else + ssh_test "$@" + fi +} + + SSHD_PID= ## setup trap @@ -122,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!) @@ -148,7 +161,7 @@ export DISPLAY=monkeys ## we cannot do proper directory permissions checking if the current ## working directory has unsatisfactory permissions: -if ( . "$MONKEYSPHERE_SYSSHAREDIR"/common && check_key_file_permissions $(whoami) "$TEMPDIR" ) ; then +if "$MONKEYSPHERE_SYSSHAREDIR"/checkperms $(whoami) "$TEMPDIR"; then echo "Permissions on temporary directory '$TEMPDIR' are OK for permissions checks." TEMPDIR_PERMISSIONS_SAFE=yes else @@ -168,9 +181,15 @@ else EOF - # FIXME: what should we do with this knowledge to make sure that - # the appropriate tests are handled properly? + # FIXME: what else should we do with this knowledge to make sure + # that the appropriate tests are handled properly? TEMPDIR_PERMISSIONS_SAFE=no + + # this is a new option (as of 0.26) to disable filesystem + # permission checks. + + # it should operate by analogy with StrictModes from sshd_config(5) + export MONKEYSPHERE_STRICT_MODES=false fi @@ -233,13 +252,13 @@ echo 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 "### 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 @@ -253,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? @@ -304,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 @@ -323,6 +342,12 @@ monkeysphere-authentication update-users $(whoami) ###################################################################### ### 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 @@ -353,7 +378,7 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod g-w "$TESTHOME"/.monkeysphere/authorized_user_ids echo echo "##################################################" @@ -363,7 +388,7 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids monkeysphere-authentication update-users $(whoami) @@ -391,7 +416,7 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere.linktest echo echo "##################################################" @@ -410,7 +435,7 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere.linktest # FIXME: implement check of link path, and uncomment this test # echo @@ -421,7 +446,7 @@ chmod o-w "$TESTHOME"/.monkeysphere.linktest # echo # echo "##################################################" # echo "### ssh connection test for failure..." -# ssh_test 255 +# ssh_good_perm_test 255 # chmod o-w "$TESTHOME"/.monkeysphere rm "$TESTHOME"/.monkeysphere/authorized_user_ids mv "$TESTHOME"/.monkeysphere/authorized_user_ids{.bak,} @@ -444,12 +469,12 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere.linktest echo echo "##################################################" echo "### make .monkeysphere directory a relative symlink and updating..." -ln -sfn .monkeysphere{.linktest,} +ln -sfn .monkeysphere.linktest "$TESTHOME"/.monkeysphere monkeysphere-authentication update-users $(whoami) echo echo "##################################################" @@ -463,7 +488,7 @@ monkeysphere-authentication update-users $(whoami) echo echo "##################################################" echo "### ssh connection test for failure..." -ssh_test 255 +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere.linktest rm "$TESTHOME"/.monkeysphere mv "$TESTHOME"/.monkeysphere{.bak,} @@ -482,39 +507,37 @@ echo "### ssh connection test directly to 'testhost2' without new name..." target_hostname=testhost2 ssh_test 255 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 -printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID" +echo "### add servicename, certify by admin, import by user..." +monkeysphere-host add-servicename ssh://testhost2 +<"$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 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-servicename ssh://testhost2 +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 @@ -528,10 +551,23 @@ ssh_test 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 +monkeysphere-host revoke-key "$SSHHOSTKEYID" | gpg --import echo echo "##################################################" echo "### ssh connection test for failure..."