diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/dynamic-forward.sh | 37 |
2 files changed, 39 insertions, 1 deletions
@@ -13,6 +13,7 @@ | |||
13 | - markus@cvs.openbsd.org 2003/06/26 20:08:33 | 13 | - markus@cvs.openbsd.org 2003/06/26 20:08:33 |
14 | [readconf.c] | 14 | [readconf.c] |
15 | do not dump core for 'ssh -o proxycommand host'; ok deraadt@ | 15 | do not dump core for 'ssh -o proxycommand host'; ok deraadt@ |
16 | - (dtucker) [regress/dynamic-forward.sh] Import new regression test. | ||
16 | 17 | ||
17 | 20030624 | 18 | 20030624 |
18 | - (dtucker) Have configure refer the user to config.log and | 19 | - (dtucker) Have configure refer the user to config.log and |
@@ -599,4 +600,4 @@ | |||
599 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 600 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
600 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 601 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
601 | 602 | ||
602 | $Id: ChangeLog,v 1.2827 2003/06/28 02:40:12 dtucker Exp $ | 603 | $Id: ChangeLog,v 1.2828 2003/06/28 02:42:09 dtucker Exp $ |
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh new file mode 100644 index 000000000..90a2ab225 --- /dev/null +++ b/regress/dynamic-forward.sh | |||
@@ -0,0 +1,37 @@ | |||
1 | # $OpenBSD: dynamic-forward.sh,v 1.1 2003/06/26 14:23:10 markus Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="dynamic forwarding" | ||
5 | |||
6 | PORT=4242 | ||
7 | FWDPORT=4243 | ||
8 | |||
9 | if [ -x `which nc` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then | ||
10 | proxycmd="nc -x 127.0.0.1:$FWDPORT -X" | ||
11 | elif [ -x `which connect` ]; then | ||
12 | proxycmd="connect -S 127.0.0.1:$FWDPORT -" | ||
13 | else | ||
14 | echo "skipped (no suitable ProxyCommand found)" | ||
15 | exit 0 | ||
16 | fi | ||
17 | trace "will use ProxyCommand $proxycmd" | ||
18 | |||
19 | start_sshd | ||
20 | |||
21 | for p in 1 2; do | ||
22 | for s in 4; do | ||
23 | for h in 127.0.0.1 localhost; do | ||
24 | trace "testing ssh protocol $p socks version $s host $h" | ||
25 | trace "start dynamic forwarding, fork to background" | ||
26 | ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT somehost sleep 10 | ||
27 | |||
28 | trace "transfer over forwarded channel and check result" | ||
29 | ${SSH} -F $OBJ/ssh_config -o "ProxyCommand ${proxycmd}${s} $h $PORT" \ | ||
30 | somehost cat /bin/ls > $OBJ/ls.copy | ||
31 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | ||
32 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | ||
33 | |||
34 | sleep 10 | ||
35 | done | ||
36 | done | ||
37 | done | ||