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: regression tests for scp SFTP protocol support; mostly by 

Jakub Jelen in GHPR#194 ok markus

OpenBSD-Regress-ID: 36f1458525bcb111741ec8547eaf58b13cddc715
This commit is contained in:
djm@openbsd.org 2021-08-03 01:05:24 +00:00 committed by Damien Miller
parent e4673b7f67
commit af5d8094d8
2 changed files with 149 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
regress/scp-uri.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp-uri.sh,v 1.2 2017/12/11 11:41:56 dtucker Exp $ # $OpenBSD: scp-uri.sh,v 1.3 2021/08/03 01:05:24 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="scp-uri" tid="scp-uri"
@ -12,7 +12,6 @@ DIR2=${COPY}.dd2
SRC=`dirname ${SCRIPT}` SRC=`dirname ${SCRIPT}`
cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
chmod 755 ${OBJ}/scp-ssh-wrapper.scp chmod 755 ${OBJ}/scp-ssh-wrapper.scp
scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
export SCP # used in scp-ssh-wrapper.scp export SCP # used in scp-ssh-wrapper.scp
scpclean() { scpclean() {
@ -24,29 +23,37 @@ scpclean() {
cp $OBJ/ssh_config $OBJ/ssh_config.orig cp $OBJ/ssh_config $OBJ/ssh_config.orig
egrep -v '^ +(Port|User) +.*$' $OBJ/ssh_config.orig > $OBJ/ssh_config egrep -v '^ +(Port|User) +.*$' $OBJ/ssh_config.orig > $OBJ/ssh_config
verbose "$tid: simple copy local file to remote file" for mode in scp sftp ; do
if test $mode = scp ; then
scpopts="-M scp -q -S ${OBJ}/scp-ssh-wrapper.scp"
tag="$tid"
else
scpopts="-M sftp -D ${SFTPSERVER}"
tag="$tid: sftp mode"
fi
verbose "$tag: simple copy local file to remote file"
scpclean scpclean
$SCP $scpopts ${DATA} "scp://${USER}@somehost:${PORT}/${COPY}" || fail "copy failed" $SCP $scpopts ${DATA} "scp://${USER}@somehost:${PORT}/${COPY}" || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tid: simple copy remote file to local file" verbose "$tag: simple copy remote file to local file"
scpclean scpclean
$SCP $scpopts "scp://${USER}@somehost:${PORT}/${DATA}" ${COPY} || fail "copy failed" $SCP $scpopts "scp://${USER}@somehost:${PORT}/${DATA}" ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tid: simple copy local file to remote dir" verbose "$tag: simple copy local file to remote dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
$SCP $scpopts ${COPY} "scp://${USER}@somehost:${PORT}/${DIR}" || fail "copy failed" $SCP $scpopts ${COPY} "scp://${USER}@somehost:${PORT}/${DIR}" || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy" cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tid: simple copy remote file to local dir" verbose "$tag: simple copy remote file to local dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
$SCP $scpopts "scp://${USER}@somehost:${PORT}/${COPY}" ${DIR} || fail "copy failed" $SCP $scpopts "scp://${USER}@somehost:${PORT}/${COPY}" ${DIR} || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy" cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tid: recursive local dir to remote dir" verbose "$tag: recursive local dir to remote dir"
scpclean scpclean
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
@ -55,7 +62,7 @@ for i in $(cd ${DIR} && echo *); do
cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy" cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
done done
verbose "$tid: recursive remote dir to local dir" verbose "$tag: recursive remote dir to local dir"
scpclean scpclean
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
@ -65,6 +72,7 @@ for i in $(cd ${DIR} && echo *); do
done done
# TODO: scp -3 # TODO: scp -3
done
scpclean scpclean
rm -f ${OBJ}/scp-ssh-wrapper.exe rm -f ${OBJ}/scp-ssh-wrapper.exe

38
regress/scp.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: scp.sh,v 1.11 2019/07/19 03:45:44 djm Exp $ # $OpenBSD: scp.sh,v 1.12 2021/08/03 01:05:24 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="scp" tid="scp"
@ -19,7 +19,6 @@ DIR2=${COPY}.dd2
SRC=`dirname ${SCRIPT}` SRC=`dirname ${SCRIPT}`
cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
chmod 755 ${OBJ}/scp-ssh-wrapper.scp chmod 755 ${OBJ}/scp-ssh-wrapper.scp
scpopts="-q -S ${OBJ}/scp-ssh-wrapper.scp"
export SCP # used in scp-ssh-wrapper.scp export SCP # used in scp-ssh-wrapper.scp
scpclean() { scpclean() {
@ -28,61 +27,69 @@ scpclean() {
chmod 755 ${DIR} ${DIR2} chmod 755 ${DIR} ${DIR2}
} }
verbose "$tid: simple copy local file to local file" for mode in scp sftp ; do
if test $mode = scp ; then
scpopts="-M scp -q -S ${OBJ}/scp-ssh-wrapper.scp"
tag="$tid"
else
scpopts="-M sftp -D ${SFTPSERVER}"
tag="$tid: sftp mode"
fi
verbose "tid: simple copy local file to local file"
scpclean scpclean
$SCP $scpopts ${DATA} ${COPY} || fail "copy failed" $SCP $scpopts ${DATA} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tid: simple copy local file to remote file" verbose "$tag: simple copy local file to remote file"
scpclean scpclean
$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed" $SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tid: simple copy remote file to local file" verbose "$tag: simple copy remote file to local file"
scpclean scpclean
$SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed" $SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed"
cmp ${DATA} ${COPY} || fail "corrupted copy" cmp ${DATA} ${COPY} || fail "corrupted copy"
verbose "$tid: simple copy local file to remote dir" verbose "$tag: simple copy local file to remote dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
$SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed" $SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy" cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tid: simple copy local file to local dir" verbose "$tag: simple copy local file to local dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
$SCP $scpopts ${COPY} ${DIR} || fail "copy failed" $SCP $scpopts ${COPY} ${DIR} || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy" cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tid: simple copy remote file to local dir" verbose "$tag: simple copy remote file to local dir"
scpclean scpclean
cp ${DATA} ${COPY} cp ${DATA} ${COPY}
$SCP $scpopts somehost:${COPY} ${DIR} || fail "copy failed" $SCP $scpopts somehost:${COPY} ${DIR} || fail "copy failed"
cmp ${COPY} ${DIR}/copy || fail "corrupted copy" cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
verbose "$tid: recursive local dir to remote dir" verbose "$tag: recursive local dir to remote dir"
scpclean scpclean
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
verbose "$tid: recursive local dir to local dir" verbose "$tag: recursive local dir to local dir"
scpclean scpclean
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
$SCP $scpopts -r ${DIR} ${DIR2} || fail "copy failed" $SCP $scpopts -r ${DIR} ${DIR2} || fail "copy failed"
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
verbose "$tid: recursive remote dir to local dir" verbose "$tag: recursive remote dir to local dir"
scpclean scpclean
rm -rf ${DIR2} rm -rf ${DIR2}
cp ${DATA} ${DIR}/copy cp ${DATA} ${DIR}/copy
$SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
verbose "$tid: shell metacharacters" verbose "$tag: shell metacharacters"
scpclean scpclean
(cd ${DIR} && \ (cd ${DIR} && \
touch '`touch metachartest`' && \ touch '`touch metachartest`' && \
@ -90,7 +97,7 @@ $SCP $scpopts *metachar* ${DIR2} 2>/dev/null; \
[ ! -f metachartest ] ) || fail "shell metacharacters" [ ! -f metachartest ] ) || fail "shell metacharacters"
if [ ! -z "$SUDO" ]; then if [ ! -z "$SUDO" ]; then
verbose "$tid: skipped file after scp -p with failed chown+utimes" verbose "$tag: skipped file after scp -p with failed chown+utimes"
scpclean scpclean
cp -p ${DATA} ${DIR}/copy cp -p ${DATA} ${DIR}/copy
cp -p ${DATA} ${DIR}/copy2 cp -p ${DATA} ${DIR}/copy2
@ -103,7 +110,7 @@ if [ ! -z "$SUDO" ]; then
fi fi
for i in 0 1 2 3 4 5 6 7; do for i in 0 1 2 3 4 5 6 7; do
verbose "$tid: disallow bad server #$i" verbose "$tag: disallow bad server #$i"
SCPTESTMODE=badserver_$i SCPTESTMODE=badserver_$i
export DIR SCPTESTMODE export DIR SCPTESTMODE
scpclean scpclean
@ -125,12 +132,13 @@ for i in 0 1 2 3 4 5 6 7; do
rm -f ${DIR2}/extrafile rm -f ${DIR2}/extrafile
done done
verbose "$tid: detect non-directory target" verbose "$tag: detect non-directory target"
scpclean scpclean
echo a > ${COPY} echo a > ${COPY}
echo b > ${COPY2} echo b > ${COPY2}
$SCP $scpopts ${DATA} ${COPY} ${COPY2} $SCP $scpopts ${DATA} ${COPY} ${COPY2}
cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target" cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target"
done
scpclean scpclean
rm -f ${OBJ}/scp-ssh-wrapper.scp rm -f ${OBJ}/scp-ssh-wrapper.scp