mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 18:02:20 +00:00
625f6bc398
commit to add scp to the test sshd's path causes the t-envpass test to fail when the test scp is given using a fully qualified path. Put this in a helper function and only call it from the scp tests. OpenBSD-Regress-ID: 7533dc1c4265c1de716abb062957994195b36df4
196 lines
5.8 KiB
Bash
196 lines
5.8 KiB
Bash
# $OpenBSD: scp.sh,v 1.18 2023/01/13 04:47:34 dtucker Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="scp"
|
|
|
|
#set -x
|
|
|
|
COPY2=${OBJ}/copy2
|
|
DIR=${COPY}.dd
|
|
DIR2=${COPY}.dd2
|
|
COPY3=${OBJ}/copy.glob[123]
|
|
DIR3=${COPY}.dd.glob[456]
|
|
DIFFOPT="-rN"
|
|
|
|
# Figure out if diff does not understand "-N"
|
|
if ! diff -N ${SRC}/scp.sh ${SRC}/scp.sh 2>/dev/null; then
|
|
DIFFOPT="-r"
|
|
fi
|
|
|
|
maybe_add_scp_path_to_sshd
|
|
|
|
SRC=`dirname ${SCRIPT}`
|
|
cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.scp
|
|
chmod 755 ${OBJ}/scp-ssh-wrapper.scp
|
|
export SCP # used in scp-ssh-wrapper.scp
|
|
|
|
scpclean() {
|
|
rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} ${COPY3} ${DIR3}
|
|
mkdir ${DIR} ${DIR2} ${DIR3}
|
|
chmod 755 ${DIR} ${DIR2} ${DIR3}
|
|
}
|
|
|
|
for mode in scp sftp ; do
|
|
tag="$tid: $mode mode"
|
|
if test $mode = scp ; then
|
|
scpopts="-O -q -S ${OBJ}/scp-ssh-wrapper.scp"
|
|
else
|
|
scpopts="-s -D ${SFTPSERVER}"
|
|
fi
|
|
verbose "$tag: simple copy local file to local file"
|
|
scpclean
|
|
$SCP $scpopts ${DATA} ${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy local file to remote file"
|
|
scpclean
|
|
$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy remote file to local file"
|
|
scpclean
|
|
$SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: copy local file to remote file in place"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts ${COPY} somehost:${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: copy remote file to local file in place"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts somehost:${COPY} ${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: copy local file to remote file clobber"
|
|
scpclean
|
|
cat ${DATA} ${DATA} > ${COPY}
|
|
$SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed"
|
|
ls -l $DATA $COPY
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: copy remote file to local file clobber"
|
|
scpclean
|
|
cat ${DATA} ${DATA} > ${COPY}
|
|
$SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy local file to remote dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy local file to local dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts ${COPY} ${DIR} || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy remote file to local dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts somehost:${COPY} ${DIR} || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tag: recursive local dir to remote dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
|
|
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
|
|
|
|
verbose "$tag: recursive local dir to local dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -r ${DIR} ${DIR2} || fail "copy failed"
|
|
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
|
|
|
|
verbose "$tag: recursive remote dir to local dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
|
|
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
|
|
|
|
verbose "$tag: unmatched glob file local->remote"
|
|
scpclean
|
|
$SCP $scpopts ${DATA} somehost:${COPY3} || fail "copy failed"
|
|
cmp ${DATA} ${COPY3} || fail "corrupted copy"
|
|
|
|
verbose "$tag: unmatched glob file remote->local"
|
|
# NB. no clean
|
|
$SCP $scpopts somehost:${COPY3} ${COPY2} || fail "copy failed"
|
|
cmp ${DATA} ${COPY2} || fail "corrupted copy"
|
|
|
|
verbose "$tag: unmatched glob dir recursive local->remote"
|
|
scpclean
|
|
rm -rf ${DIR3}
|
|
cp ${DATA} ${DIR}/copy
|
|
cp ${DATA} ${DIR}/copy.glob[1234]
|
|
$SCP $scpopts -r ${DIR} somehost:${DIR3} || fail "copy failed"
|
|
diff ${DIFFOPT} ${DIR} ${DIR3} || fail "corrupted copy"
|
|
|
|
verbose "$tag: unmatched glob dir recursive remote->local"
|
|
# NB. no clean
|
|
rm -rf ${DIR2}
|
|
$SCP $scpopts -r somehost:${DIR3} ${DIR2} || fail "copy failed"
|
|
diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
|
|
|
|
verbose "$tag: shell metacharacters"
|
|
scpclean
|
|
(cd ${DIR} && \
|
|
touch '`touch metachartest`' && \
|
|
$SCP $scpopts *metachar* ${DIR2} 2>/dev/null; \
|
|
[ ! -f metachartest ] ) || fail "shell metacharacters"
|
|
|
|
if [ ! -z "$SUDO" ]; then
|
|
verbose "$tag: skipped file after scp -p with failed chown+utimes"
|
|
scpclean
|
|
cp -p ${DATA} ${DIR}/copy
|
|
cp -p ${DATA} ${DIR}/copy2
|
|
cp ${DATA} ${DIR2}/copy
|
|
chmod 660 ${DIR2}/copy
|
|
$SUDO chown root ${DIR2}/copy
|
|
$SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1
|
|
$SUDO diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
|
|
$SUDO rm ${DIR2}/copy
|
|
fi
|
|
|
|
for i in 0 1 2 3 4 5 6 7; do
|
|
verbose "$tag: disallow bad server #$i"
|
|
SCPTESTMODE=badserver_$i
|
|
export DIR SCPTESTMODE
|
|
scpclean
|
|
$SCP $scpopts somehost:${DATA} ${DIR} >/dev/null 2>/dev/null
|
|
[ -d {$DIR}/rootpathdir ] && fail "allows dir relative to root dir"
|
|
[ -d ${DIR}/dotpathdir ] && fail "allows dir creation in non-recursive mode"
|
|
|
|
scpclean
|
|
$SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null
|
|
[ -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
|
|
|
|
verbose "$tag: detect non-directory target"
|
|
scpclean
|
|
echo a > ${COPY}
|
|
echo b > ${COPY2}
|
|
$SCP $scpopts ${DATA} ${COPY} ${COPY2}
|
|
cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target"
|
|
done
|
|
|
|
scpclean
|
|
rm -f ${OBJ}/scp-ssh-wrapper.scp
|