# piped commands should return the code of the first non-zero return
set -o pipefail
+# make sure the TESTDIR is an absolute path, not a relative one.
+export TESTDIR=$(cd $(dirname "$0") && pwd)
+
+source "$TESTDIR"/common
+
## make sure that the right tools are installed to run the test. the
## test has *more* requirements than plain ol' monkeysphere:
which socat >/dev/null || { echo "You must have socat installed to run this test." ; exit 1; }
# gpg command for test admin user
gpgadmin() {
+ chmod 0700 "$TEMPDIR"/admin
GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
}
fi
}
-failed_cleanup() {
- # FIXME: can we be more verbose here?
- echo 'FAILED!'
- read -p "press enter to cleanup and remove tmp:"
-
- cleanup
-}
-
-get_gpg_prng_arg() {
- if (gpg --quick-random --version >/dev/null 2>&1) ; then
- echo quick-random
- elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
- echo debug-quick-random
- fi
-}
-
-cleanup() {
- echo "### removing temp dir..."
- rm -rf "$TEMPDIR"
-
- if [ "$SSHD_PID" ] ; then
- echo "### killing off lingering sshd..."
- kill "$SSHD_PID"
- fi
-
- wait
-}
-
SSHD_PID=
## setup trap
## set up some variables to ensure that we're operating strictly in
## the tests, not system-wide:
-export TESTDIR=$(dirname "$0")
+# 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.
-# make temp dir
-TEMPDIR="$TESTDIR"/tmp
-if [ -e "$TEMPDIR" ] ; then
- echo "tempdir '$TEMPDIR' already exists."
- exit 1
-fi
+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.
# *anything* with any running X11 session.
export DISPLAY=monkeys
-######################################################################
-### TEST KEY CONVERSION
-
-mkdir -p "$TEMPDIR"
-
-echo "##################################################"
-echo "### test key conversion..."
-export GNUPGHOME="$TEMPDIR"
-# generate a key
-gpg --batch --quick-random --gen-key <<EOF
-Key-Type: RSA
-Key-Length: 1024
-Key-Usage: sign
-Name-Real: testtest
-Expire-Date: 0
-
-%commit
-%echo done
-EOF
-# get the the key timestamp
-timestamp=$(gpg --list-key --with-colons --fixed-list-mode | \
- grep ^pub: | cut -d: -f6)
-# export the key to a file
-gpg --export-secret-key | openpgp2ssh > \
- "$TEMPDIR"/test.pem
-# reconvert key, and compare to key in gpg keyring
-diff -u \
- <(gpg --export-secret-key | hd) \
- <(PEM2OPENPGP_USAGE_FLAGS=sign,certify \
- PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest < \
- "$TEMPDIR"/test.pem | hd )
-
-# clear out the temp dir
-rm -rf "$TEMPDIR"
-mkdir -p "$TEMPDIR"
######################################################################
### CONFIGURE ENVIRONMENTS
# copy in admin and testuser home to tmp
echo "##################################################"
-echo "### copying admin and testuser homes..."
-cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
+echo "### configuring testuser home..."
cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
-
# set up environment for testuser
export TESTHOME="$TEMPDIR"/testuser
export GNUPGHOME="$TESTHOME"/.gnupg
+chmod 0700 "$GNUPGHOME"
export SSH_ASKPASS="$TESTHOME"/.ssh/askpass
export MONKEYSPHERE_HOME="$TESTHOME"/.monkeysphere
cat <<EOF >> "$TESTHOME"/.ssh/config
EOF
get_gpg_prng_arg >> "$GNUPGHOME"/gpg.conf
+echo "##################################################"
+echo "### configuring admin home..."
+cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
+
# set up sshd
echo "##################################################"
echo "### configuring sshd..."
######################################################################
### SERVER HOST SETUP
-# create a new host key
-echo "##################################################"
-echo "### testing host key generation..."
-mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host
-# add gpg.conf with quick-random
-get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
-echo | monkeysphere-host expert gen-key --length 1024 testhost
-
-# remove the host home for the next test
-rm -rf "$MONKEYSPHERE_SYSCONFIGDIR"/host
-
# import host key
echo "##################################################"
echo "### testing host key importing..."
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 "### setup monkeysphere authentication..."
cp "$TESTDIR"/etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/
cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf
-AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids"
+AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authorized_user_ids"
EOF
monkeysphere-authentication setup
get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
# add admin as identity certifier for testhost
echo "##################################################"
echo "### adding admin as certifier..."
-echo y | monkeysphere-authentication add-id-certifier "$TEMPDIR"/admin/.gnupg/pubkey.gpg
+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
# teach the "server" about the testuser's key
echo "##################################################"
echo "### export testuser key to server..."
-gpg --export testuser | monkeysphere-authentication gpg-cmd --import
+gpg --export testuser | monkeysphere-authentication expert 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:
+# ms: improper group or other writability on path '/tmp'.
######################################################################
### TESTS
-# connect to test sshd, using monkeysphere-ssh-proxycommand to verify
+# connect to test sshd, using monkeysphere ssh-proxycommand to verify
# the identity before connection. This should work in both directions!
echo "##################################################"
echo "### ssh connection test for success..."
projects / monkeysphere.git / blobdiff