X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=9114f3254adfac0b85d84772fb9e190dd8f89f28;hb=72f145629c3c626a30aa08e6100f298cd31a30c2;hp=bcade42efead44942cdd5eec2303a8afcec9068e;hpb=44ca5172d76fb84802c85057a3c0eaf0e6d8956d;p=monkeysphere.git diff --git a/tests/basic b/tests/basic index bcade42..9114f32 100755 --- a/tests/basic +++ b/tests/basic @@ -90,13 +90,16 @@ trap failed_cleanup EXIT ## set up some variables to ensure that we're operating strictly in ## the tests, not system-wide: -# make temp dir -# FIXME: I believe that /tmp can not be used as the temp dir here, -# since the permissions on /tmp are usually such that they will not -# pass the monkeysphere/ssh path permission checking. at least this -# is my experience. -#TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX") -TEMPDIR=$(mktemp -d "${TESTDIR}/tmp/monkeyspheretest.XXXXXXX") +# set up temp dir + +# NOTE: /tmp can not be used as the temp dir here, since the +# permissions on /tmp are usually such that they will not pass the +# monkeysphere/ssh path permission checking. If you need to use a +# different location than the current source, please set $TMPDIR +# somewhere with tighter permissions. + +mkdir -p "$TESTDIR"/tmp +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. @@ -163,22 +166,21 @@ EOF # import host key echo "##################################################" -echo "### testing host key importing..." +echo "### import host key..." ssh-keygen -b 1024 -t rsa -N '' -f "$TEMPDIR"/ssh_host_rsa_key -monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key +monkeysphere-host import-key testhost < "$TEMPDIR"/ssh_host_rsa_key + +echo "##################################################" +echo "### getting host key fingerprint..." +HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ ) +echo "$HOSTKEYID" # change host key expiration echo "##################################################" echo "### setting host key expiration..." monkeysphere-host set-expire 1 -monkeysphere-host show-key # FIXME: how do we check that the expiration has really been set? -echo "##################################################" -echo "### getting host key fingerprint..." -HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ ) -echo "$HOSTKEYID" - # certify host key with the "Admin's Key". # (this would normally be done via keyservers) echo "##################################################" @@ -212,8 +214,11 @@ echo "##################################################" echo "### adding admin as certifier..." monkeysphere-authentication add-id-certifier -y "$TEMPDIR"/admin/.gnupg/pubkey.gpg -# FIXME: should we run "diagnostics" here to test setup? +echo "##################################################" +echo "### list certifiers..." +monkeysphere-authentication list-certifiers +# FIXME: should we run "diagnostics" here to test setup? ###################################################################### ### TESTUSER SETUP @@ -231,13 +236,13 @@ gpgadmin --armor --export "$HOSTKEYID" | gpg --import # teach the "server" about the testuser's key echo "##################################################" echo "### export testuser key to server..." -gpg --export testuser | monkeysphere-authentication expert gpg-cmd --import +gpg --export testuser | monkeysphere-authentication gpg-cmd --import # update authorized_keys for user echo "##################################################" echo "### update server authorized_keys file for this testuser..." monkeysphere-authentication update-users $(whoami) -# FIXME: NOT FAILING PROPERLY FOR: +# FIXME: this is maybe not failing properly for: # ms: improper group or other writability on path '/tmp'.