[openssh-commits] [openssh] 81/87: upstream: test for %C containing ProxyJump user/port/extra

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 21b22540cb19cc17eecb07546302358ff61d8496
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 30 04:16:47 2026 +0000

    upstream: test for %C containing ProxyJump user/port/extra
    
    Anthropic ANT-2026-S9DT2E2E
    
    OpenBSD-Regress-ID: 6fcfbc3d101707d72435c9e98e7cd9da19bc0c43
---
 regress/proxyjump.sh | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/regress/proxyjump.sh b/regress/proxyjump.sh
index af472e963..b87ff131f 100644
--- a/regress/proxyjump.sh
+++ b/regress/proxyjump.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: proxyjump.sh,v 1.1 2026/03/30 07:19:02 djm Exp $
+#	$OpenBSD: proxyjump.sh,v 1.2 2026/10/30 04:16:47 djm Exp $
 #	Placed in the Public Domain.
 
 tid="proxyjump"
@@ -34,6 +34,29 @@ for jspec in \
 	if [ "$f" != "$expected" ]; then
 		fail "ssh -J $jspec: expected $expected, got $f"
 	fi
+	f=`${SSH} -GF /dev/null -J "$jspec" -oControlPath=/%j somehost | \
+		awk '/^controlpath /{print $2}'`
+	if [ "$f" != "/$expected" ]; then
+		fail "ssh -J $jspec: expected %j $expected, got $f"
+	fi
+done
+
+verbose "connection hash"
+seen=""
+for jspec in \
+	"jump1" \
+	"user at jump1" \
+	"jump1:2222" \
+	"jump1:2223" \
+	"jump2,jump1" \
+	"jump3,jump1" \
+	; do
+	f=`${SSH} -GF /dev/null -J "$jspec" -oControlPath=/%C somehost | \
+		awk '/^controlpath /{print $2}'`
+	case "$seen" in
+	*" $f "*)	fail "ssh -J $jspec: %C is not unique" ;;
+	esac
+	seen="$seen $f "
 done
 
 verbose "precedence"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.