X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=blobdiff_plain;f=tests%2Fbasic;h=9b9eb05cc578ec4ca92a8dabaa02e27095084df6;hp=9c5b280a7134b22a32c4e0336db84ced3ddf5f5c;hb=HEAD;hpb=d8692549051e028ea0e10dc224d2073ad3773949 diff --git a/tests/basic b/tests/basic index 9c5b280..9b9eb05 100755 --- a/tests/basic +++ b/tests/basic @@ -1,13 +1,16 @@ #!/usr/bin/env bash # Tests to ensure that the monkeysphere is working +# +# unset MONKEYSPHERE_TEST_NO_EXAMINE to get a prompt to examine the +# test state after failure. # Authors: # Daniel Kahn Gillmor # 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. @@ -26,16 +29,16 @@ source "$TESTDIR"/common ## make sure that the right tools are installed to run the test. the ## test has *more* requirements than plain ol' monkeysphere: +[ -f /usr/sbin/sshd ] || { echo "You must have sshd installed to run this test." ; exit 1; } which socat >/dev/null || { echo "You must have socat installed to run this test." ; exit 1; } perl -MCrypt::OpenSSL::RSA -e 1 2>/dev/null || { echo "You must have the perl module Crypt::OpenSSL::RSA installed to run this test. On debian-derived systems, you can set this up with: apt-get install libcrypt-openssl-rsa-perl" ; exit 1; } - -perl -MDigest::SHA1 -e 1 2>/dev/null || { echo "You must have the perl module Digest::SHA1 installed to run this test. +perl -MDigest::SHA -e 1 2>/dev/null || { echo "You must have the perl module Digest::SHA installed to run this test. On debian-derived systems, you can set this up with: - apt-get install libdigest-sha1-perl" ; exit 1; } + apt-get install libdigest-sha-perl" ; exit 1; } ## FIXME: other checks? @@ -44,13 +47,15 @@ On debian-derived systems, you can set this up with: # gpg command for test admin user gpgadmin() { - chmod 0700 "$TEMPDIR"/admin + chmod 0700 "$TEMPDIR"/admin "$TEMPDIR"/admin/.gnupg GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg --no-tty "$@" } # test ssh connection # first argument is expected return code from ssh connection ssh_test() { + local RETURN=0 + umask 0077 CODE=${1:-0} @@ -68,23 +73,34 @@ ssh_test() { # make a client connection to the socket echo "##### starting ssh client..." ssh-agent bash -c \ - "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true" \ + "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config ${target_hostname:-testhost.example} true" \ || RETURN="$?" # kill the sshd process if it's still running - kill "$SSHD_PID" + kill "$SSHD_PID" || true + wait SSHD_PID= - echo "##### return $RETURN" if [ "$RETURN" = "$CODE" ] ; then - echo "##### ssh connection test returned as desired" + echo "##### ssh connection test PASSED. returned: $RETURN" return 0 else - echo "##### ssh connection test failed. expected return code $CODE" + echo "##### ssh connection test FAILED. returned: $RETURN, expected: $CODE" return 1 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 @@ -110,13 +126,15 @@ TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX") # Use the local copy of executables first, instead of system ones. # This should help us test without installing. -export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH" +export PATH="$TESTDIR"/../src:"$PATH" export MONKEYSPHERE_SYSDATADIR="$TEMPDIR" export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR" export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami) +HOST_KEY_FILE="$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.pgp + 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!) @@ -127,6 +145,10 @@ export MONKEYSPHERE_LOG_LEVEL=DEBUG export MONKEYSPHERE_CORE_KEYLENGTH=1024 export MONKEYSPHERE_PROMPT=false +# unset SUBKEYS_FOR_AGENT variable which, if set, would confuse the +# into trying to use the user's key, instead of the testuser's key +unset MONKEYSPHERE_SUBKEYS_FOR_AGENT + export SSHD_CONFIG="$TEMPDIR"/sshd_config export SOCKET="$TEMPDIR"/ssh-socket @@ -136,23 +158,42 @@ export SOCKET="$TEMPDIR"/ssh-socket # *anything* with any running X11 session. export DISPLAY=monkeys -## make sure that the version number matches the debian changelog -## (don't bother if this is being run from the tests). - -if [ -f "$TESTDIR"/../packaging/debian/changelog ]; then - echo - echo "##################################################" - echo "### checking version string match..." - repver=$(monkeysphere version) - debver=$(head -n1 "$TESTDIR"/../packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/') - if [ "$repver" = "$debver" ] ; then - echo "Versions match!" - else - printf "reported version string (%s) does not match debian changelog (%s)\n" "$repver" "$debver" - exit 1 - fi + +## we cannot do proper directory permissions checking if the current +## working directory has unsatisfactory permissions: +if "$MONKEYSPHERE_SYSSHAREDIR"/checkperms $(whoami) "$TEMPDIR"; then + echo "Permissions on temporary directory '$TEMPDIR' are OK for permissions checks." + TEMPDIR_PERMISSIONS_SAFE=yes +else + cat <> "$GNUPGHOME"/gpg.conf echo echo "##################################################" echo "### configuring admin home..." -cp -a "$TESTDIR"/home/admin "$TEMPDIR"/ +(cd "$TESTDIR"/home && find admin | cpio -pdu "$TEMPDIR") # set up sshd echo @@ -193,6 +235,14 @@ HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u EOF +# disable sshd's strict permissions settings so that some tests can +# complete when running under a dubious path: +if [ "$TEMPDIR_PERMISSIONS_SAFE" != yes ] ; then + cat <> "$SSHD_CONFIG" +StrictModes no +EOF +fi + ###################################################################### ### SERVER HOST SETUP @@ -202,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.example echo echo "##################################################" echo "### getting host key fingerprint..." -HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ ) -echo "$HOSTKEYID" +SSHHOSTKEYID=$( monkeysphere-host show-keys | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ ) +echo "$SSHHOSTKEYID" # change host key expiration echo @@ -222,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? @@ -247,7 +297,7 @@ EOF monkeysphere-authentication setup get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf -# add admin as identity certifier for testhost +# add admin as identity certifier for testhost.example echo echo "##################################################" echo "### adding admin as certifier..." @@ -273,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 @@ -289,10 +339,15 @@ monkeysphere-authentication update-users $(whoami) # FIXME: this is maybe not failing properly for: # ms: improper group or other writability on path '/tmp'. - ###################################################################### ### 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.example ) <( 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 @@ -300,6 +355,14 @@ echo "##################################################" echo "### ssh connection test for success..." ssh_test +# Make sure it works if there is "armor" written in gpg.conf +# add other weirdnesses here as they come up. +echo +echo "##################################################" +echo "### testing functionality in the face of unusual gpg.conf settings..." +echo 'armor' >> "$GNUPGHOME"/gpg.conf +ssh_test + # remove the testuser's authorized_user_ids file, update, and make # sure that the ssh authentication FAILS echo @@ -309,7 +372,7 @@ mv "$TESTHOME"/.monkeysphere/authorized_user_ids{,.bak} monkeysphere-authentication update-users $(whoami) echo echo "##################################################" -echo "### ssh connection test for server authentication denial..." +echo "### ssh connection test for failure..." ssh_test 255 mv "$TESTHOME"/.monkeysphere/authorized_user_ids{.bak,} @@ -322,8 +385,8 @@ chmod g+w "$TESTHOME"/.monkeysphere/authorized_user_ids monkeysphere-authentication update-users $(whoami) echo echo "##################################################" -echo "### ssh connection test for server authentication denial..." -ssh_test 255 +echo "### ssh connection test for failure..." +ssh_good_perm_test 255 chmod g-w "$TESTHOME"/.monkeysphere/authorized_user_ids echo echo "##################################################" @@ -332,25 +395,190 @@ chmod o+w "$TESTHOME"/.monkeysphere/authorized_user_ids monkeysphere-authentication update-users $(whoami) echo echo "##################################################" -echo "### ssh connection test for server authentication denial..." -ssh_test 255 +echo "### ssh connection test for failure..." +ssh_good_perm_test 255 chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids monkeysphere-authentication update-users $(whoami) +# test symlinks +echo +echo "##################################################" +echo "### setup for symlink tests..." +cp -a "$TESTHOME"/.monkeysphere{,.linktest} + +echo +echo "##################################################" +echo "### make authorized_user_ids an absolute symlink and updating..." +mv "$TESTHOME"/.monkeysphere/authorized_user_ids{,.bak} +ln -s "$TESTHOME"/.monkeysphere{.linktest,}/authorized_user_ids +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for success..." +ssh_test +echo +echo "##################################################" +echo "### create bad permissions on link dir and updating..." +chmod o+w "$TESTHOME"/.monkeysphere.linktest +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for failure..." +ssh_good_perm_test 255 +chmod o-w "$TESTHOME"/.monkeysphere.linktest +echo +echo "##################################################" +echo "### make authorized_user_ids a relative symlink and updating..." +ln -sf ../.monkeysphere.linktest/authorized_user_ids "$TESTHOME"/.monkeysphere/authorized_user_ids +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for success..." +ssh_test +echo +echo "##################################################" +echo "### create bad permissions on link dir updating..." +chmod o+w "$TESTHOME"/.monkeysphere.linktest +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for failure..." +ssh_good_perm_test 255 +chmod o-w "$TESTHOME"/.monkeysphere.linktest +# FIXME: implement check of link path, and uncomment this test +# echo +# echo "##################################################" +# echo "### create bad permissions on link dir and updating..." +# chmod o+w "$TESTHOME"/.monkeysphere +# monkeysphere-authentication update-users $(whoami) +# echo +# echo "##################################################" +# echo "### ssh connection test for failure..." +# ssh_good_perm_test 255 +# chmod o-w "$TESTHOME"/.monkeysphere +rm "$TESTHOME"/.monkeysphere/authorized_user_ids +mv "$TESTHOME"/.monkeysphere/authorized_user_ids{.bak,} + +echo +echo "##################################################" +echo "### make .monkeysphere directory an absolute symlink and updating..." +mv "$TESTHOME"/.monkeysphere{,.bak} +ln -s "$TESTHOME"/.monkeysphere{.linktest,} +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for success..." +ssh_test +echo +echo "##################################################" +echo "### create bad permissions on link dir and updating..." +chmod o+w "$TESTHOME"/.monkeysphere.linktest +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for failure..." +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 "$TESTHOME"/.monkeysphere +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for success..." +ssh_test +echo +echo "##################################################" +echo "### create bad permissions on link dir updating..." +chmod o+w "$TESTHOME"/.monkeysphere.linktest +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for failure..." +ssh_good_perm_test 255 +chmod o-w "$TESTHOME"/.monkeysphere.linktest +rm "$TESTHOME"/.monkeysphere +mv "$TESTHOME"/.monkeysphere{.bak,} + +# ensure we're back to normal: +echo +echo "##################################################" +echo "### making sure we are back to normal..." +monkeysphere-authentication update-users $(whoami) +ssh_test + + +echo +echo "##################################################" +echo "### ssh connection test directly to 'testhost2.example' without new name..." +target_hostname=testhost2.example ssh_test 255 +echo +echo "##################################################" +echo "### add servicename, certify by admin, import by user..." +monkeysphere-host add-servicename ssh://testhost2.example +<"$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.example' added..." +gpgadmin --export "$SSHHOSTKEYID" | gpg --import +gpg --check-trustdb +ssh_test + +echo +echo "##################################################" +echo "### ssh connection test directly to 'testhost2.example' ..." +gpg --import <"$HOST_KEY_FILE" +gpg --check-trustdb +target_hostname=testhost2.example ssh_test + +echo +echo "##################################################" +echo "### ssh connection test for failure with 'testhost2.example' revoked..." +monkeysphere-host revoke-servicename ssh://testhost2.example +gpg --import <"$HOST_KEY_FILE" +gpg --check-trustdb +target_hostname=testhost2.example ssh_test 255 + # FIXME: addtest: remove admin as id-certifier and check ssh failure -# FIXME: addtest: add hostname on host key -# FIXME: addtest: revoke hostname on host key and check ssh failure +# FIXME: addtest: how do we test that set-expire makes sense after new +# servicenames have been added? -# addtest: revoke the host key and check ssh failure # test to make sure things are OK after the previous tests: +echo +echo "##################################################" +echo "### settings reset, updating..." +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for success..." ssh_test + echo echo "##################################################" -echo "### ssh connection test for server with revoked key..." +echo "### Testing TLS setup..." + +openssl req -config "$TESTDIR"/openssl.cnf -x509 -newkey rsa:1024 -subj '/DC=example/DC=testhost/CN=testhost.example/' -days 3 -keyout "$TEMPDIR"/tls_key.pem -nodes >"$TEMPDIR"/tls_cert.pem +monkeysphere-host import-key "$TEMPDIR"/tls_key.pem https://testhost.example + +# 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..." ssh_test 255