From 116b1b439413a724ebb3320633a64dd0f3ee1fe7 Mon Sep 17 00:00:00 2001
From: "millert@openbsd.org@openbsd.org" <millert@openbsd.org@openbsd.org>
Date: Tue, 24 Oct 2017 19:33:32 +0000
Subject: upstream commit

Add tests for URI parsing.  OK markus@

OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b
---
 regress/sftp-uri.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 regress/sftp-uri.sh

(limited to 'regress/sftp-uri.sh')

diff --git a/regress/sftp-uri.sh b/regress/sftp-uri.sh
new file mode 100644
index 000000000..4d19dd716
--- /dev/null
+++ b/regress/sftp-uri.sh
@@ -0,0 +1,63 @@
+#	$OpenBSD: sftp-uri.sh,v 1.1 2017/10/24 19:33:32 millert Exp $
+#	Placed in the Public Domain.
+
+tid="sftp-uri"
+
+#set -x
+
+COPY2=${OBJ}/copy2
+DIR=${COPY}.dd
+DIR2=${COPY}.dd2
+SRC=`dirname ${SCRIPT}`
+
+sftpclean() {
+	rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2}
+	mkdir ${DIR} ${DIR2}
+}
+
+start_sshd -oForceCommand="internal-sftp -d /"
+
+# Remove Port and User from ssh_config, we want to rely on the URI
+cp $OBJ/ssh_config $OBJ/ssh_config.orig
+egrep -v '^	+(Port|User)	+.*$' $OBJ/ssh_config.orig > $OBJ/ssh_config
+
+verbose "$tid: non-interactive fetch to local file"
+sftpclean
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config "sftp://${USER}@somehost:${PORT}/${DATA}" ${COPY} || fail "copy failed"
+cmp ${DATA} ${COPY} || fail "corrupted copy"
+
+verbose "$tid: non-interactive fetch to local dir"
+sftpclean
+cp ${DATA} ${COPY}
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config "sftp://${USER}@somehost:${PORT}/${COPY}" ${DIR} || fail "copy failed"
+cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
+
+verbose "$tid: put to remote directory (trailing slash)"
+sftpclean
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b /dev/stdin \
+    "sftp://${USER}@somehost:${PORT}/${DIR}/" > /dev/null 2>&1 << EOF
+	version
+	put ${DATA} copy
+EOF
+r=$?
+if [ $r -ne 0 ]; then
+	fail "sftp failed with $r"
+else
+	cmp ${DATA} ${DIR}/copy || fail "corrupted copy"
+fi
+
+verbose "$tid: put to remote directory (no slash)"
+sftpclean
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b /dev/stdin \
+    "sftp://${USER}@somehost:${PORT}/${DIR}" > /dev/null 2>&1 << EOF
+	version
+	put ${DATA} copy
+EOF
+r=$?
+if [ $r -ne 0 ]; then
+	fail "sftp failed with $r"
+else
+	cmp ${DATA} ${DIR}/copy || fail "corrupted copy"
+fi
+
+sftpclean
-- 
cgit v1.2.3


From 393436024d2e4b4c7a01f9cfa5854e7437896d11 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 25 Mar 2018 09:40:46 +1100
Subject: Replace /dev/stdin with "-".

For some reason sftp -b doesn't work with /dev/stdin on Cygwin, as noted
and suggested by vinschen at redhat.com.
---
 regress/sftp-uri.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'regress/sftp-uri.sh')

diff --git a/regress/sftp-uri.sh b/regress/sftp-uri.sh
index 4d19dd716..7be104dfb 100644
--- a/regress/sftp-uri.sh
+++ b/regress/sftp-uri.sh
@@ -34,7 +34,7 @@ cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
 
 verbose "$tid: put to remote directory (trailing slash)"
 sftpclean
-${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b /dev/stdin \
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b - \
     "sftp://${USER}@somehost:${PORT}/${DIR}/" > /dev/null 2>&1 << EOF
 	version
 	put ${DATA} copy
@@ -48,7 +48,7 @@ fi
 
 verbose "$tid: put to remote directory (no slash)"
 sftpclean
-${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b /dev/stdin \
+${SFTP} -q -S "$SSH" -F $OBJ/ssh_config -b - \
     "sftp://${USER}@somehost:${PORT}/${DIR}" > /dev/null 2>&1 << EOF
 	version
 	put ${DATA} copy
-- 
cgit v1.2.3