X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=82edf43899a8baf5dd66e484b721570c525b426e;hb=4fa5881562a06c1fefa0302defbc878bb9c8131b;hp=c7c4b07fe8b79cdd95220a7f81238221dba45935;hpb=29c9d56d32df40c947b8cb2e67987b682b5184fe;p=monkeysphere.git diff --git a/tests/basic b/tests/basic index c7c4b07..82edf43 100755 --- a/tests/basic +++ b/tests/basic @@ -1,6 +1,8 @@ #!/usr/bin/env bash # Tests to ensure that the monkeysphere is working +# +# unset MONKEYSPHERE_TEST_NO_EXAMINE to examine # Authors: # Daniel Kahn Gillmor @@ -26,16 +28,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? @@ -51,6 +53,8 @@ gpgadmin() { # test ssh connection # first argument is expected return code from ssh connection ssh_test() { + local RETURN=0 + umask 0077 CODE=${1:-0} @@ -65,26 +69,21 @@ ssh_test() { sleep 1 done - set +e - # 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" - RETURN="$?" + "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true" \ + || RETURN="$?" # kill the sshd process if it's still running kill "$SSHD_PID" SSHD_PID= - set -e - - 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 } @@ -114,7 +113,7 @@ 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" @@ -131,6 +130,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 @@ -140,22 +143,6 @@ 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 -fi ###################################################################### ### CONFIGURE ENVIRONMENTS @@ -164,7 +151,8 @@ fi echo echo "##################################################" echo "### configuring testuser home..." -cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/ +(cd "$TESTDIR"/home && find testuser | cpio -pdu "$TEMPDIR") + # set up environment for testuser export TESTHOME="$TEMPDIR"/testuser export GNUPGHOME="$TESTHOME"/.gnupg @@ -184,7 +172,7 @@ get_gpg_prng_arg >> "$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 @@ -293,7 +281,6 @@ monkeysphere-authentication update-users $(whoami) # FIXME: this is maybe not failing properly for: # ms: improper group or other writability on path '/tmp'. - ###################################################################### ### TESTS @@ -341,20 +328,68 @@ ssh_test 255 chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids monkeysphere-authentication update-users $(whoami) +# test symlinks +echo +echo "##################################################" +echo "### make authorized_user_ids a symlink and updating..." +mkdir "$TESTHOME"/.monkeysphere.linktest +mv "$TESTHOME"/.monkeysphere{,.linktest}/authorized_user_ids +ln -s "$TESTHOME"/.monkeysphere{.linktest,}/authorized_user_ids +monkeysphere-authentication update-users $(whoami) +echo +echo "##################################################" +echo "### ssh connection test for server authentication 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 server authentication denial..." +ssh_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 server authentication denial..." +# ssh_test 255 +# chmod o-w "$TESTHOME"/.monkeysphere +mv "$TESTHOME"/.monkeysphere{.linktest,}/authorized_user_ids +rmdir "$TESTHOME"/.monkeysphere.linktest + # 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 # 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 users..." +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 "### revoking 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 +echo +echo "##################################################" +echo "### ssh connection test for server with revoked key..." ssh_test 255