tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: add regression tests for scp for out-of-destination path file 

creation by Harry Sintonen via Jakub Jelen in bz3007

OpenBSD-Regress-ID: 01ae5fbc6ce400b2df5a84dc3152a9e31f354c07
This commit is contained in:
djm@openbsd.org 2019-07-19 03:45:44 +00:00 committed by Damien Miller
parent bca0582063
commit b4a7c9d2b5
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
regress/scp-ssh-wrapper.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $OpenBSD: scp-ssh-wrapper.sh,v 1.3 2014/01/26 10:49:17 djm Exp $ # $OpenBSD: scp-ssh-wrapper.sh,v 1.4 2019/07/19 03:45:44 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
printname () { printname () {
@ -51,6 +51,18 @@ badserver_4)
echo "C755 2 file" echo "C755 2 file"
echo "X" echo "X"
;; ;;
badserver_5)
echo "D0555 0 "
echo "X"
;;
badserver_6)
echo "D0555 0 ."
echo "X"
;;
badserver_7)
echo "C0755 2 extrafile"
echo "X"
;;
*) *)
set -- $arg set -- $arg
shift shift

14
regress/scp.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp.sh,v 1.10 2014/01/26 10:49:17 djm Exp $ # $OpenBSD: scp.sh,v 1.11 2019/07/19 03:45:44 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="scp" tid="scp"
@ -25,6 +25,7 @@ export SCP # used in scp-ssh-wrapper.scp
scpclean() { scpclean() {
rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
mkdir ${DIR} ${DIR2} mkdir ${DIR} ${DIR2}
chmod 755 ${DIR} ${DIR2}
} }
verbose "$tid: simple copy local file to local file" verbose "$tid: simple copy local file to local file"
@ -101,7 +102,7 @@ if [ ! -z "$SUDO" ]; then
$SUDO rm ${DIR2}/copy $SUDO rm ${DIR2}/copy
fi fi
for i in 0 1 2 3 4; do for i in 0 1 2 3 4 5 6 7; do
verbose "$tid: disallow bad server #$i" verbose "$tid: disallow bad server #$i"
SCPTESTMODE=badserver_$i SCPTESTMODE=badserver_$i
export DIR SCPTESTMODE export DIR SCPTESTMODE
@ -113,6 +114,15 @@ for i in 0 1 2 3 4; do
scpclean scpclean
$SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null $SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
[ -d ${DIR}/dotpathdir ] && fail "allows dir creation outside of subdir" [ -d ${DIR}/dotpathdir ] && fail "allows dir creation outside of subdir"
scpclean
$SCP -pr $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
[ ! -w ${DIR2} ] && fail "allows target root attribute change"
scpclean
$SCP $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
[ -e ${DIR2}/extrafile ] && fail "allows unauth object creation"
rm -f ${DIR2}/extrafile
done done
verbose "$tid: detect non-directory target" verbose "$tid: detect non-directory target"