projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug in setup where gpg was called instead of gpg_core. This
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index e30f31b7f758dfe757bcfa3a8c9ce42dec16bf19..4d2266ebf5a6b22dd40fd2c19030b7f788c94e97 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-23,6
+23,9
@@
which socat >/dev/null || { echo "You must have socat installed to run this test
## FIXME: other checks?
## FIXME: other checks?
+######################################################################
+### FUNCTIONS
+
# gpg command for test admin user
gpgadmin() {
GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
# gpg command for test admin user
gpgadmin() {
GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
@@
-103,7
+106,9
@@
SSHD_PID=
trap failed_cleanup EXIT
trap failed_cleanup EXIT
+######################################################################
### SETUP VARIABLES
### SETUP VARIABLES
+
## set up some variables to ensure that we're operating strictly in
## the tests, not system-wide:
## set up some variables to ensure that we're operating strictly in
## the tests, not system-wide:
@@
-138,6
+143,7
@@
export SOCKET="$TEMPDIR"/ssh-socket
export DISPLAY=monkeys
export DISPLAY=monkeys
+######################################################################
### CONFIGURE ENVIRONMENTS
# copy in admin and testuser home to tmp
### CONFIGURE ENVIRONMENTS
# copy in admin and testuser home to tmp
@@
-172,6
+178,7
@@
AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authentication/authorized_keys/%u
EOF
EOF
+######################################################################
### SERVER HOST SETUP
# set up monkeysphere host
### SERVER HOST SETUP
# set up monkeysphere host
@@
-199,26
+206,24
@@
echo "### certifying server host key..."
GNUPGHOME="$MONKEYSPHERE_SYSCONFIGDIR"/host gpg --armor --export "$HOSTKEYID" | gpgadmin --import
echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
GNUPGHOME="$MONKEYSPHERE_SYSCONFIGDIR"/host gpg --armor --export "$HOSTKEYID" | gpgadmin --import
echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+# FIXME: add revoker?
+
# FIXME: how can we test publish-key without flooding junk into the
# keyservers?
# FIXME: should we run "diagnostics" here to test setup?
# FIXME: how can we test publish-key without flooding junk into the
# keyservers?
# FIXME: should we run "diagnostics" here to test setup?
+######################################################################
### SERVER AUTHENTICATION SETUP
# set up monkeysphere authentication
echo "##################################################"
### SERVER AUTHENTICATION SETUP
# set up monkeysphere authentication
echo "##################################################"
-echo "### configuring monkeysphere authentication..."
-mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/{authorized_keys,core,sphere,tmp}
+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"
EOF
cp "$TESTDIR"/etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/
cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf
AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids"
EOF
-
-# setup server authentication
-echo "##################################################"
-echo "### setting up server authentication..."
monkeysphere-authentication setup
get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
monkeysphere-authentication setup
get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
@@
-230,6
+235,7
@@
echo y | monkeysphere-authentication add-id-certifier "$TEMPDIR"/admin/.gnupg/pu
# FIXME: should we run "diagnostics" here to test setup?
# FIXME: should we run "diagnostics" here to test setup?
+######################################################################
### TESTUSER SETUP
# generate an auth subkey for the test user that expires in 2 days
### TESTUSER SETUP
# generate an auth subkey for the test user that expires in 2 days
@@
-253,6
+259,7
@@
echo "### update server authorized_keys file for this testuser..."
monkeysphere-authentication update-users $(whoami)
monkeysphere-authentication update-users $(whoami)
+######################################################################
### TESTS
# connect to test sshd, using monkeysphere-ssh-proxycommand to verify
### TESTS
# connect to test sshd, using monkeysphere-ssh-proxycommand to verify
@@
-297,6
+304,9
@@
chmod o-w "$TESTHOME"/.monkeysphere/authorized_user_ids
# FIXME: addtest: revoke the host key and check ssh failure
# FIXME: addtest: revoke the host key and check ssh failure
+
+######################################################################
+
trap - EXIT
echo "##################################################"
trap - EXIT
echo "##################################################"