mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
edf8578117
Excerpts from the release notes: Potentially incompatible changes -------------------------------- * ssh-keygen(1): generate Ed25519 keys by default. [NOTE: This change was already merged into FreeBSD.] * sshd(8): the Subsystem directive now accurately preserves quoting of subsystem commands and arguments. New features ------------ * ssh(1): add keystroke timing obfuscation to the client. * ssh(1), sshd(8): Introduce a transport-level ping facility. * sshd(8): allow override of Sybsystem directives in sshd Match blocks. Full release notes at https://www.openssh.com/txt/release-9.5 Relnotes: Yes Sponsored by: The FreeBSD Foundation
91 lines
2.2 KiB
Bash
91 lines
2.2 KiB
Bash
# $OpenBSD: match-subsystem.sh,v 1.1 2023/09/06 23:36:09 djm Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="sshd_config match subsystem"
|
|
|
|
cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
|
|
|
|
try_subsystem() {
|
|
_id=$1
|
|
_subsystem=$2
|
|
_expect=$3
|
|
${SSHD} -tf $OBJ/sshd_proxy || fatal "$_id: bad config"
|
|
${SSH} -sF $OBJ/ssh_proxy somehost $_subsystem
|
|
_exit=$?
|
|
trace "$_id subsystem $_subsystem"
|
|
if [ $_exit -ne $_expect ] ; then
|
|
fail "$_id: subsystem $_subsystem exit $_exit expected $_expect"
|
|
fi
|
|
return $?
|
|
}
|
|
|
|
# Simple case: subsystem in main config.
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Subsystem xxx /bin/sh -c "exit 23"
|
|
_EOF
|
|
try_subsystem "main config" xxx 23
|
|
|
|
# No clobber in main config.
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Subsystem xxx /bin/sh -c "exit 23"
|
|
Subsystem xxx /bin/sh -c "exit 24"
|
|
_EOF
|
|
try_subsystem "main config no clobber" xxx 23
|
|
|
|
# Subsystem in match all block
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Match all
|
|
Subsystem xxx /bin/sh -c "exit 21"
|
|
_EOF
|
|
try_subsystem "match all" xxx 21
|
|
|
|
# No clobber in match all block
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Match all
|
|
Subsystem xxx /bin/sh -c "exit 21"
|
|
Subsystem xxx /bin/sh -c "exit 24"
|
|
_EOF
|
|
try_subsystem "match all no clobber" xxx 21
|
|
|
|
# Subsystem in match user block
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Match user *
|
|
Subsystem xxx /bin/sh -c "exit 20"
|
|
_EOF
|
|
try_subsystem "match user" xxx 20
|
|
|
|
# No clobber in match user block
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Match user *
|
|
Subsystem xxx /bin/sh -c "exit 20"
|
|
Subsystem xxx /bin/sh -c "exit 24"
|
|
Match all
|
|
Subsystem xxx /bin/sh -c "exit 24"
|
|
_EOF
|
|
try_subsystem "match user no clobber" xxx 20
|
|
|
|
# Override main with match all
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Subsystem xxx /bin/sh -c "exit 23"
|
|
Match all
|
|
Subsystem xxx /bin/sh -c "exit 19"
|
|
_EOF
|
|
try_subsystem "match all override" xxx 19
|
|
|
|
# Override main with match user
|
|
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
|
|
cat >> $OBJ/sshd_proxy << _EOF
|
|
Subsystem xxx /bin/sh -c "exit 23"
|
|
Match user *
|
|
Subsystem xxx /bin/sh -c "exit 18"
|
|
_EOF
|
|
try_subsystem "match user override" xxx 18
|
|
|