summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/cfgmatch.sh66
2 files changed, 38 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index c7db4a5d..82aedc3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile
accept multiple paths per line and making their defaults include
known_hosts2; ok markus
+ - djm@cvs.openbsd.org 2011/05/23 03:31:31
+ [regress/cfgmatch.sh]
+ include testing of multiple/overridden AuthorizedKeysFiles
+ refactor to simply daemon start/stop and get rid of racy constructs
20110520
- (djm) [session.c] call setexeccon() before executing passwd for pw
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index 96badd51..29234e56 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: cfgmatch.sh,v 1.4 2006/12/13 08:36:36 dtucker Exp $
+# $OpenBSD: cfgmatch.sh,v 1.5 2011/05/23 03:31:31 djm Exp $
# Placed in the Public Domain.
tid="sshd_config match"
@@ -7,6 +7,28 @@ pidfile=$OBJ/remote_pid
fwdport=3301
fwd="-L $fwdport:127.0.0.1:$PORT"
+echo "ExitOnForwardFailure=yes" >> ssh_config
+echo "ExitOnForwardFailure=yes" >> ssh_proxy
+
+start_client()
+{
+ rm -f $pidfile
+ ${SSH} -q -$p $fwd "$@" somehost \
+ exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' \
+ >>$TEST_SSH_LOGFILE 2>&1 &
+ client_pid=$!
+ # Wait for remote end
+ n=0
+ while test ! -f $pidfile ; do
+ sleep 1
+ n=`expr $n + 1`
+ if test $n -gt 60; then
+ kill $client_pid
+ fatal "timeout waiting for background ssh"
+ fi
+ done
+}
+
stop_client()
{
pid=`cat $pidfile`
@@ -14,11 +36,15 @@ stop_client()
kill $pid
sleep 1
fi
+ wait
}
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
-
+grep -v AuthorizedKeysFile $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
+echo "AuthorizedKeysFile /dev/null" >>$OBJ/sshd_proxy
echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_config
+echo "Match user $USER" >>$OBJ/sshd_proxy
+echo "AuthorizedKeysFile /dev/null $OBJ/authorized_keys_%u" >>$OBJ/sshd_proxy
echo "Match Address 127.0.0.1" >>$OBJ/sshd_config
echo "PermitOpen 127.0.0.1:$PORT" >>$OBJ/sshd_config
@@ -32,12 +58,8 @@ start_sshd
# Test Match + PermitOpen in sshd_config. This should be permitted
for p in 1 2; do
- rm -f $pidfile
trace "match permitopen localhost proto $p"
- ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "match permitopen proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_config
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \
fail "match permitopen permit proto $p"
stop_client
@@ -45,12 +67,8 @@ done
# Same but from different source. This should not be permitted
for p in 1 2; do
- rm -f $pidfile
trace "match permitopen proxy proto $p"
- ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "match permitopen proxy proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_proxy
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \
fail "match permitopen deny proto $p"
stop_client
@@ -62,12 +80,8 @@ cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
echon 'permitopen="127.0.0.1:'$PORT'" ' >>$OBJ/authorized_keys_$USER
cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
for p in 1 2; do
- rm -f $pidfile
trace "match permitopen proxy w/key opts proto $p"
- ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "match permitopen w/key opt proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_proxy
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \
fail "match permitopen deny w/key opt proto $p"
stop_client
@@ -76,12 +90,8 @@ done
# Test both sshd_config and key options permitting the same dst/port pair.
# Should be permitted.
for p in 1 2; do
- rm -f $pidfile
trace "match permitopen localhost proto $p"
- ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "match permitopen proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_config
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \
fail "match permitopen permit proto $p"
stop_client
@@ -94,12 +104,8 @@ echo "PermitOpen 127.0.0.1:1 127.0.0.1:2" >>$OBJ/sshd_proxy
# Test that a Match overrides a PermitOpen in the global section
for p in 1 2; do
- rm -f $pidfile
trace "match permitopen proxy w/key opts proto $p"
- ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "match override permitopen proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_proxy
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \
fail "match override permitopen proto $p"
stop_client
@@ -113,12 +119,8 @@ echo "PermitOpen 127.0.0.1:1 127.0.0.1:2" >>$OBJ/sshd_proxy
# Test that a rule that doesn't match doesn't override, plus test a
# PermitOpen entry that's not at the start of the list
for p in 1 2; do
- rm -f $pidfile
trace "nomatch permitopen proxy w/key opts proto $p"
- ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \
- exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\
- fail "nomatch override permitopen proto $p sshd failed"
- sleep 1;
+ start_client -F $OBJ/ssh_proxy
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \
fail "nomatch override permitopen proto $p"
stop_client