mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-08-20 01:08:33 +02:00
af4e4113b2
- Updated code to dynamic load Lsa functions until RS5 SDK includes them - Add conpty support in openssh - Fixed Wierd characters (?25l) are seen, when logged in from ssh client - Backspace doesn't work in powershell window - Changes to support ssh-shellhost as an alternative shell - Added support to have ssh-shellhost work as a standby shell (ssh-shellhost -c "cmdline") simply executes cmdline via CreateProcess - Added E2E test cases and fixed unittests broken from prior changes - Added PTY launch interface that supports both conpty and ssh-shellhost pty. - Implemented PTY control channel in ssh-shellhost that supports Window resize events. - Fixed regression with starting a PTY session with an explicit command - modified ssh-shellhost pty argument to ---pty to remove ambiguity in cases when both -p and -c are present in commandline. Ex. ssh-shellhost.exe -c "myprogram -p -c argument"
138 lines
4.2 KiB
Bash
138 lines
4.2 KiB
Bash
# $OpenBSD: cfgmatch.sh,v 1.11 2017/10/04 18:50:23 djm Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="sshd_config match"
|
|
|
|
pidfile=$OBJ/remote_pid
|
|
fwdport=3301
|
|
fwd="-L $fwdport:127.0.0.1:$PORT"
|
|
|
|
echo "ExitOnForwardFailure=yes" >> $OBJ/ssh_config
|
|
echo "ExitOnForwardFailure=yes" >> $OBJ/ssh_proxy
|
|
|
|
start_client()
|
|
{
|
|
rm -f $pidfile
|
|
${SSH} -q $fwd "$@" somehost \
|
|
exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' \
|
|
>>$TEST_REGRESS_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
|
|
if [ "$os" == "windows" ]; then
|
|
# We can't kill windows process from cygwin / wsl so use "stop-process"
|
|
powershell.exe /c "stop-process -id $client_pid"
|
|
else
|
|
kill $client_pid
|
|
fi
|
|
fatal "timeout waiting for background ssh"
|
|
fi
|
|
done
|
|
}
|
|
|
|
stop_client()
|
|
{
|
|
pid=`cat $pidfile`
|
|
if [ "$os" == "windows" ]; then
|
|
# We can't kill windows process from cygwin / wsl so use "stop-process"
|
|
powershell.exe /c "stop-process -id $pid"
|
|
powershell.exe /c "stop-process -name sleep"
|
|
else
|
|
if [ ! -z "$pid" ]; then
|
|
kill $pid
|
|
fi
|
|
wait
|
|
fi
|
|
}
|
|
|
|
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
|
|
echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_config
|
|
echo "Match Address 127.0.0.1" >>$OBJ/sshd_config
|
|
echo "PermitOpen 127.0.0.1:2 127.0.0.1:3 127.0.0.1:$PORT" >>$OBJ/sshd_config
|
|
|
|
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_proxy
|
|
if [ "$os" == "windows" ]; then
|
|
# If User is domainuser then it will be in "domain/user" so convert it to "domain\user"
|
|
echo "Match user ${USER//\//\\}" >>$OBJ/sshd_proxy
|
|
else
|
|
echo "Match user $USER" >>$OBJ/sshd_proxy
|
|
fi
|
|
|
|
echo "AuthorizedKeysFile /dev/null $OBJ/authorized_keys_%u" >>$OBJ/sshd_proxy
|
|
echo "Match Address 127.0.0.1" >>$OBJ/sshd_proxy
|
|
echo "PermitOpen 127.0.0.1:2 127.0.0.1:3 127.0.0.1:$PORT" >>$OBJ/sshd_proxy
|
|
|
|
start_sshd
|
|
|
|
#set -x
|
|
|
|
# Test Match + PermitOpen in sshd_config. This should be permitted
|
|
trace "match permitopen localhost"
|
|
start_client -F $OBJ/ssh_config
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true || \
|
|
fail "match permitopen permit"
|
|
stop_client
|
|
|
|
# Same but from different source. This should not be permitted
|
|
trace "match permitopen proxy"
|
|
start_client -F $OBJ/ssh_proxy
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true && \
|
|
fail "match permitopen deny"
|
|
stop_client
|
|
|
|
# Retry previous with key option, should also be denied.
|
|
cp /dev/null $OBJ/authorized_keys_$USER
|
|
for t in ${SSH_KEYTYPES}; do
|
|
printf 'permitopen="127.0.0.1:'$PORT'" ' >> $OBJ/authorized_keys_$USER
|
|
cat $OBJ/$t.pub >> $OBJ/authorized_keys_$USER
|
|
done
|
|
trace "match permitopen proxy w/key opts"
|
|
start_client -F $OBJ/ssh_proxy
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true && \
|
|
fail "match permitopen deny w/key opt"
|
|
stop_client
|
|
|
|
# Test both sshd_config and key options permitting the same dst/port pair.
|
|
# Should be permitted.
|
|
trace "match permitopen localhost"
|
|
start_client -F $OBJ/ssh_config
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true || \
|
|
fail "match permitopen permit"
|
|
stop_client
|
|
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
echo "PermitOpen 127.0.0.1:1 127.0.0.1:$PORT 127.0.0.2:2" >>$OBJ/sshd_proxy
|
|
if [ "$os" == "windows" ]; then
|
|
# If User is domainuser then it will be in "domain/user" so convert it to "domain\user"
|
|
echo "Match user ${USER//\//\\}" >>$OBJ/sshd_proxy
|
|
else
|
|
echo "Match user $USER" >>$OBJ/sshd_proxy
|
|
fi
|
|
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
|
|
trace "match permitopen proxy w/key opts"
|
|
start_client -F $OBJ/ssh_proxy
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true && \
|
|
fail "match override permitopen"
|
|
stop_client
|
|
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
echo "PermitOpen 127.0.0.1:1 127.0.0.1:$PORT 127.0.0.2:2" >>$OBJ/sshd_proxy
|
|
echo "Match User NoSuchUser" >>$OBJ/sshd_proxy
|
|
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
|
|
trace "nomatch permitopen proxy w/key opts"
|
|
start_client -F $OBJ/ssh_proxy
|
|
${SSH} -q -p $fwdport -F $OBJ/ssh_config somehost true || \
|
|
fail "nomatch override permitopen"
|
|
stop_client
|