tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix failing bash test

Browse Source
This commit is contained in:
tgauth@bu.edu 2024-01-08 16:00:54 -05:00
parent e98172c2eb
commit b39454951f
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
regress/forcecommand.sh
View File

@ -18,9 +18,15 @@ authorized_keys() {
trace "test config with sftp" trace "test config with sftp"
authorized_keys authorized_keys
rm -f $OBJ/ssh_proxy.tmp rm -f $OBJ/ssh_proxy.tmp
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \ if [ "$os" == "windows" ]; then
${SFTP} -S ${SSH} -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \ echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
fail "sftp failed" ${SFTP} -S "$TEST_SHELL_PATH ${SSH}" -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \
fail "sftp failed"
else
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S ${SSH} -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \
fail "sftp failed"
fi
test -f "$OBJ/ssh_proxy.tmp" || fail "sftp did not download file" test -f "$OBJ/ssh_proxy.tmp" || fail "sftp did not download file"
rm -f $OBJ/ssh_proxy.tmp rm -f $OBJ/ssh_proxy.tmp
@ -37,16 +43,21 @@ ${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command config"
authorized_keys authorized_keys
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
echo "ForceCommand false" >> $OBJ/sshd_proxy
trace "force command overriding subsystem" trace "force command overriding subsystem"
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S ${SSH} -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \
fail "sftp succeeded"
if [ "$os" == "windows" ]; then if [ "$os" == "windows" ]; then
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S "$TEST_SHELL_PATH ${SSH}" -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \
fail "sftp succeeded"
# If User is domainuser then it will be in "domain/user" so convert it to "domain\user" # If User is domainuser then it will be in "domain/user" so convert it to "domain\user"
echo "Match user ${USER//\//\\}" >>$OBJ/sshd_proxy echo "Match user ${USER//\//\\}" >>$OBJ/sshd_proxy
else else
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S ${SSH} -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \
fail "sftp succeeded"
echo "Match User $USER" >>$OBJ/sshd_proxy echo "Match User $USER" >>$OBJ/sshd_proxy
fi fi
echo " ForceCommand true" >> $OBJ/sshd_proxy echo " ForceCommand true" >> $OBJ/sshd_proxy
@ -55,17 +66,29 @@ trace "forced command with match"
${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command match" ${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command match"
trace "force command in match overriding subsystem" trace "force command in match overriding subsystem"
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \ if [ "$os" == "windows" ]; then
${SFTP} -S ${SSH} -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \ echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
fail "sftp succeeded" ${SFTP} -S "$TEST_SHELL_PATH ${SSH}" -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \
fail "sftp succeeded"
else
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S ${SSH} -F $OBJ/ssh_proxy -oLoglevel=quiet somehost && \
fail "sftp succeeded"
fi
trace "force command to sftpserver" trace "force command to sftpserver"
grep -vi subsystem $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy grep -vi subsystem $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
echo "Subsystem sftp /bin/false" >> $OBJ/sshd_proxy echo "Subsystem sftp /bin/false" >> $OBJ/sshd_proxy
echo "ForceCommand ${SFTPSERVER}" >> $OBJ/sshd_proxy echo "ForceCommand ${SFTPSERVER}" >> $OBJ/sshd_proxy
rm -f $OBJ/ssh_proxy.tmp rm -f $OBJ/ssh_proxy.tmp
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \ if [ "$os" == "windows" ]; then
${SFTP} -S ${SSH} -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \ echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
fail "sftp failed" ${SFTP} -S "$TEST_SHELL_PATH ${SSH}" -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \
fail "sftp failed"
else
echo "@get $OBJ/ssh_proxy $OBJ/ssh_proxy.tmp" | \
${SFTP} -S ${SSH} -b - -qF $OBJ/ssh_proxy somehost 2>/dev/null || \
fail "sftp failed"
fi
test -f "$OBJ/ssh_proxy.tmp" || fail "sftp did not download file" test -f "$OBJ/ssh_proxy.tmp" || fail "sftp did not download file"
rm -f $OBJ/ssh_proxy.tmp rm -f $OBJ/ssh_proxy.tmp