mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-04-17 20:55:50 +00:00
upstream commit
test reverse dynamic forwarding with SOCKS Upstream-Regress-ID: 95cf290470f7e5e2f691e4bc6ba19b91eced2f79
This commit is contained in:
parent
1b9f321605
commit
6a9481258a
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: dynamic-forward.sh,v 1.12 2017/04/30 23:34:55 djm Exp $
|
# $OpenBSD: dynamic-forward.sh,v 1.13 2017/09/21 19:18:12 markus Exp $
|
||||||
# Placed in the Public Domain.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
tid="dynamic forwarding"
|
tid="dynamic forwarding"
|
||||||
@ -17,42 +17,45 @@ trace "will use ProxyCommand $proxycmd"
|
|||||||
|
|
||||||
start_sshd
|
start_sshd
|
||||||
|
|
||||||
n=0
|
for d in D R; do
|
||||||
error="1"
|
n=0
|
||||||
trace "start dynamic forwarding, fork to background"
|
error="1"
|
||||||
while [ "$error" -ne 0 -a "$n" -lt 3 ]; do
|
trace "start dynamic forwarding, fork to background"
|
||||||
n=`expr $n + 1`
|
|
||||||
${SSH} -F $OBJ/ssh_config -f -D $FWDPORT -q \
|
while [ "$error" -ne 0 -a "$n" -lt 3 ]; do
|
||||||
-oExitOnForwardFailure=yes somehost exec sh -c \
|
n=`expr $n + 1`
|
||||||
\'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
|
${SSH} -F $OBJ/ssh_config -f -$d $FWDPORT -q \
|
||||||
error=$?
|
-oExitOnForwardFailure=yes somehost exec sh -c \
|
||||||
|
\'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
|
||||||
|
error=$?
|
||||||
|
if [ "$error" -ne 0 ]; then
|
||||||
|
trace "forward failed attempt $n err $error"
|
||||||
|
sleep $n
|
||||||
|
fi
|
||||||
|
done
|
||||||
if [ "$error" -ne 0 ]; then
|
if [ "$error" -ne 0 ]; then
|
||||||
trace "forward failed attempt $n err $error"
|
fatal "failed to start dynamic forwarding"
|
||||||
sleep $n
|
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
if [ "$error" -ne 0 ]; then
|
|
||||||
fatal "failed to start dynamic forwarding"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for s in 4 5; do
|
for s in 4 5; do
|
||||||
for h in 127.0.0.1 localhost; do
|
for h in 127.0.0.1 localhost; do
|
||||||
trace "testing ssh socks version $s host $h"
|
trace "testing ssh socks version $s host $h (-$d)"
|
||||||
${SSH} -F $OBJ/ssh_config \
|
${SSH} -F $OBJ/ssh_config \
|
||||||
-o "ProxyCommand ${proxycmd}${s} $h $PORT" \
|
-o "ProxyCommand ${proxycmd}${s} $h $PORT" \
|
||||||
somehost cat ${DATA} > ${COPY}
|
somehost cat ${DATA} > ${COPY}
|
||||||
test -f ${COPY} || fail "failed copy ${DATA}"
|
test -f ${COPY} || fail "failed copy ${DATA}"
|
||||||
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
|
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -f $OBJ/remote_pid ]; then
|
if [ -f $OBJ/remote_pid ]; then
|
||||||
remote=`cat $OBJ/remote_pid`
|
remote=`cat $OBJ/remote_pid`
|
||||||
trace "terminate remote shell, pid $remote"
|
trace "terminate remote shell, pid $remote"
|
||||||
if [ $remote -gt 1 ]; then
|
if [ $remote -gt 1 ]; then
|
||||||
kill -HUP $remote
|
kill -HUP $remote
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
fail "no pid file: $OBJ/remote_pid"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
fail "no pid file: $OBJ/remote_pid"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user