diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-05-12 08:37:42 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-07-30 03:18:09 +0200 |
| commit | 8eb8899d612440a9b608bee7f916081d3d0b7812 (patch) | |
| tree | b469ef61f3e6293eeaee66f3ca2011a40a832b5c | |
| parent | upstream: better error messages (diff) | |
| download | openssh-8eb8899d612440a9b608bee7f916081d3d0b7812.tar.xz openssh-8eb8899d612440a9b608bee7f916081d3d0b7812.zip | |
upstream: test ChrootDirectory in Match block
OpenBSD-Regress-ID: a6150262f39065939f025e546af2a346ffe674c1
| -rw-r--r-- | regress/sftp-chroot.sh | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh index a7766fe63..8a3014894 100644 --- a/regress/sftp-chroot.sh +++ b/regress/sftp-chroot.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-chroot.sh,v 1.8 2021/09/01 00:50:27 dtucker Exp $ +# $OpenBSD: sftp-chroot.sh,v 1.9 2023/05/12 06:37:42 djm Exp $ # Placed in the Public Domain. tid="sftp in chroot" @@ -19,10 +19,29 @@ fi $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \ fatal "create $PRIVDATA failed" -start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /" +echo "ForceCommand internal-sftp -d /" >> $OBJ/sshd_config + +start_sshd -oChrootDirectory=$CHROOT verbose "test $tid: get" ${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ >>$TEST_REGRESS_LOGFILE 2>&1 || \ fatal "Fetch ${FILENAME} failed" cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" + +stop_sshd + +verbose "test $tid: match" +cat << EOF >> $OBJ/sshd_config +Match All + ChrootDirectory $CHROOT +EOF +start_sshd +$SUDO sh -c "echo orpheanbeholder > $PRIVDATA" || \ + fatal "create $PRIVDATA failed" +${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ + >>$TEST_REGRESS_LOGFILE 2>&1 || \ + fatal "Fetch ${FILENAME} failed" +cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" + +stop_sshd |