projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more work on test suite.
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index 3f948560bbc0c809c1e6f3db2e4576275ce01928..83d69209d4265423d5c53048feed1fab56e51698 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-12,28
+12,30
@@
# NOTE: these tests have *not* themselves been tested yet
# (2008-09-13). Please exercise with caution!
# NOTE: these tests have *not* themselves been tested yet
# (2008-09-13). Please exercise with caution!
+# fail on fail
+set -e
+
# these tests assume a commonly-trusted "Admin's key", a fake key
# permanently stored in ./home/admin/.gnupg:
gpgadmin() {
GNUPGHOME="$TESTDIR"/home/admin/.gnupg gpg "$@"
}
# these tests assume a commonly-trusted "Admin's key", a fake key
# permanently stored in ./home/admin/.gnupg:
gpgadmin() {
GNUPGHOME="$TESTDIR"/home/admin/.gnupg gpg "$@"
}
-
# cleanup:
cleanup() {
# cleanup:
cleanup() {
- # FIXME: stop the sshd process
echo
echo
- echo "### removing temp dir..."
- rm -rf "$TEMPDIR"
+ read -p "press enter to cleanup and remove tmp:"
- # FIXME: how should we clear out the temporary $VARLIB?
+ echo "### stop sshd..."
+ kill "$SSHD_PID"
- # FIXME: clear out ssh client config file and known hosts.
+ echo "### removing temp dir..."
+ rm -rf "$TEMPDIR"
}
## setup trap
}
## setup trap
-
#
trap cleanup EXIT
+trap cleanup EXIT
## 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:
@@
-61,18
+63,24
@@
export MONKEYSPHERE_CHECK_KEYSERVER=false
SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
+
### SERVER TESTS
### SERVER TESTS
-#
create th
e temp gnupghome directories
+#
setup monkeyspher
e temp gnupghome directories
mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/gnupg-host
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/gnupg-host
mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication
-
-# add the quick-random option to the gpg host config
-echo "quick-random" >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host.conf
+cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/gnupg-authentication/gpg.conf
+primary-keyring ${MONKEYSPHERE_SYSDATADIR}/gnupg-authentication/pubring.gpg
+keyring ${MONKEYSPHERE_SYSDATADIR}/gnupg-host/pubring.gpg
+EOF
# create a new host key
echo "### generating server key..."
# create a new host key
echo "### generating server key..."
+# add gpg.conf with quick-random
+echo "quick-random" >> "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
echo | monkeysphere-server gen-key --length 1024 --expire 0 testhost
+# remove the gpg.conf
+rm "$MONKEYSPHERE_SYSCONFIGDIR"/gnupg-host/gpg.conf
HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\ )
HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\ )
@@
-80,19
+88,17
@@
HOSTKEYID=$( monkeysphere-server show-key | tail -n1 | cut -f3 -d\ )
# (this would normally be done via keyservers)
echo "### certifying server key..."
monkeysphere-server gpg-authentication-cmd "--armor --export $HOSTKEYID" | gpgadmin --import
# (this would normally be done via keyservers)
echo "### certifying server key..."
monkeysphere-server gpg-authentication-cmd "--armor --export $HOSTKEYID" | gpgadmin --import
-
gpgadmin
--sign-key "$HOSTKEYID"
+
echo y | gpgadmin --command-fd 0
--sign-key "$HOSTKEYID"
# FIXME: how can we test publish-key without flooding junk into the
# keyservers?
# FIXME: how can we test publish-key without flooding junk into the
# keyservers?
-# indicate that the "Admin's" key is an identity certifier for the
-# host
-
+# add admin as identity certifier for testhost
echo "### adding admin as certifier..."
echo "### adding admin as certifier..."
-monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
+
echo y |
monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
# initialize base sshd_config
# initialize base sshd_config
-cp etc/ssh/sshd_config "$
TEMPDIR"/sshd_config
+cp etc/ssh/sshd_config "$
SSHD_CONFIG"
# write the sshd_config
cat <<EOF >> "$SSHD_CONFIG"
HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
# write the sshd_config
cat <<EOF >> "$SSHD_CONFIG"
HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
@@
-101,12
+107,14
@@
EOF
# launch test sshd with the new host key.
echo "### starting sshd..."
# launch test sshd with the new host key.
echo "### starting sshd..."
-socat EXEC:
'/usr/sbin/sshd -f '"$SSHD_CONFIG"' -i -d -d -d -D -e' "UNIX-LISTEN:${SOCKET}"
&
+socat EXEC:
"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log
&
+export SSHD_PID=$!
### TESTUSER TESTS
# copy testuser home directory into temp dir
### TESTUSER TESTS
# copy testuser home directory into temp dir
+echo "### seting up testuser home..."
cp -r "$TESTDIR"/home/testuser "$TEMPDIR"/
# generate an auth subkey for the test user
cp -r "$TESTDIR"/home/testuser "$TEMPDIR"/
# generate an auth subkey for the test user
@@
-114,13
+122,17
@@
echo "### generating key for testuser..."
MONKEYSPHERE_GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
monkeysphere gen-subkey --expire 0
MONKEYSPHERE_GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
monkeysphere gen-subkey --expire 0
+# add server key to testuser keychain
+echo "### export server key to testuser..."
+gpgadmin --armor --export "$HOSTKEYID" | \
+ GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
+
# connect to test sshd, using monkeysphere to verify the identity
# before connection.
# connect to test sshd, using monkeysphere to verify the identity
# before connection.
-echo "### connecting to sshd socket..."
+echo "###
testuser
connecting to sshd socket..."
PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}"
PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}"
-ssh -oProxyCommand="$PROXY_COMMAND" testhost
+
GNUPGHOME="$TEMPDIR"/testuser/.gnupg
ssh -oProxyCommand="$PROXY_COMMAND" testhost
# create a new client side key, certify it with the "CA", use it to
# log in.
# create a new client side key, certify it with the "CA", use it to
# log in.
-
## FIXME: implement!
## FIXME: implement!