mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-18 16:14:34 +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
63 lines
1.5 KiB
Bash
63 lines
1.5 KiB
Bash
# $OpenBSD: scp3.sh,v 1.4 2023/01/13 04:47:34 dtucker Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="scp3"
|
|
|
|
set -x
|
|
|
|
COPY2=${OBJ}/copy2
|
|
DIR=${COPY}.dd
|
|
DIR2=${COPY}.dd2
|
|
|
|
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}
|
|
mkdir ${DIR} ${DIR2}
|
|
chmod 755 ${DIR} ${DIR2}
|
|
}
|
|
|
|
for mode in scp sftp ; do
|
|
scpopts="-F${OBJ}/ssh_proxy -S ${SSH} -q"
|
|
tag="$tid: $mode mode"
|
|
if test $mode = scp ; then
|
|
scpopts="$scpopts -O"
|
|
else
|
|
scpopts="-s -D ${SFTPSERVER}"
|
|
fi
|
|
|
|
verbose "$tag: simple copy remote file to remote file"
|
|
scpclean
|
|
$SCP $scpopts -3 hostA:${DATA} hostB:${COPY} || fail "copy failed"
|
|
cmp ${DATA} ${COPY} || fail "corrupted copy"
|
|
|
|
verbose "$tag: simple copy remote file to remote dir"
|
|
scpclean
|
|
cp ${DATA} ${COPY}
|
|
$SCP $scpopts -3 hostA:${COPY} hostB:${DIR} || fail "copy failed"
|
|
cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
|
|
|
|
verbose "$tag: recursive remote dir to remote dir"
|
|
scpclean
|
|
rm -rf ${DIR2}
|
|
cp ${DATA} ${DIR}/copy
|
|
$SCP $scpopts -3r hostA:${DIR} hostB:${DIR2} || fail "copy failed"
|
|
diff -r ${DIR} ${DIR2} || fail "corrupted copy"
|
|
diff -r ${DIR2} ${DIR} || fail "corrupted copy"
|
|
|
|
verbose "$tag: detect non-directory target"
|
|
scpclean
|
|
echo a > ${COPY}
|
|
echo b > ${COPY2}
|
|
$SCP $scpopts -3 hostA:${DATA} hostA:${COPY} hostB:${COPY2}
|
|
cmp ${COPY} ${COPY2} >/dev/null && fail "corrupt target"
|
|
done
|
|
|
|
scpclean
|
|
rm -f ${OBJ}/scp-ssh-wrapper.exe
|