19261079b7
Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
125 lines
4.4 KiB
Bash
125 lines
4.4 KiB
Bash
# $OpenBSD: hostkey-rotate.sh,v 1.9 2020/10/07 06:38:16 djm Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="hostkey rotate"
|
|
|
|
rm -f $OBJ/hkr.* $OBJ/ssh_proxy.orig $OBJ/ssh_proxy.orig
|
|
|
|
grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig
|
|
mv $OBJ/ssh_proxy $OBJ/ssh_proxy.orig
|
|
grep -vi 'globalknownhostsfile' $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy
|
|
echo "UpdateHostkeys=yes" >> $OBJ/ssh_proxy
|
|
echo "GlobalKnownHostsFile=none" >> $OBJ/ssh_proxy
|
|
rm $OBJ/known_hosts
|
|
|
|
# The "primary" key type is ed25519 since it's supported even when built
|
|
# without OpenSSL. The secondary is RSA if it's supported.
|
|
primary="ssh-ed25519"
|
|
secondary="$primary"
|
|
|
|
trace "prepare hostkeys"
|
|
nkeys=0
|
|
all_algs=""
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
|
${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k"
|
|
echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig
|
|
nkeys=`expr $nkeys + 1`
|
|
test "x$all_algs" = "x" || all_algs="${all_algs},"
|
|
all_algs="${all_algs}$k"
|
|
case "$k" in
|
|
ssh-rsa) secondary="ssh-rsa" ;;
|
|
esac
|
|
done
|
|
|
|
dossh() {
|
|
# All ssh should succeed in this test
|
|
${SSH} -F $OBJ/ssh_proxy "$@" x true || fail "ssh $@ failed"
|
|
}
|
|
|
|
expect_nkeys() {
|
|
_expected=$1
|
|
_message=$2
|
|
_n=`wc -l $OBJ/known_hosts | awk '{ print $1 }'` || fatal "wc failed"
|
|
[ "x$_n" = "x$_expected" ] || fail "$_message (got $_n wanted $_expected)"
|
|
}
|
|
|
|
check_key_present() {
|
|
_type=$1
|
|
_kfile=$2
|
|
test "x$_kfile" = "x" && _kfile="$OBJ/hkr.${_type}.pub"
|
|
_kpub=`awk "/$_type /"' { print $2 }' < $_kfile` || \
|
|
fatal "awk failed"
|
|
fgrep "$_kpub" $OBJ/known_hosts > /dev/null
|
|
}
|
|
|
|
cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
|
|
|
|
# Connect to sshd with StrictHostkeyChecking=no
|
|
verbose "learn hostkey with StrictHostKeyChecking=no"
|
|
>$OBJ/known_hosts
|
|
dossh -oHostKeyAlgorithms=$primary -oStrictHostKeyChecking=no
|
|
# Verify no additional keys learned
|
|
expect_nkeys 1 "unstrict connect keys"
|
|
check_key_present $primary || fail "unstrict didn't learn key"
|
|
|
|
# Connect to sshd as usual
|
|
verbose "learn additional hostkeys"
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs
|
|
# Check that other keys learned
|
|
expect_nkeys $nkeys "learn hostkeys"
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
|
check_key_present $k || fail "didn't learn keytype $k"
|
|
done
|
|
|
|
# Check each key type
|
|
for k in $SSH_HOSTKEY_TYPES; do
|
|
verbose "learn additional hostkeys, type=$k"
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs
|
|
expect_nkeys $nkeys "learn hostkeys $k"
|
|
check_key_present $k || fail "didn't learn $k correctly"
|
|
done
|
|
|
|
# Change one hostkey (non primary) and relearn
|
|
if [ "$primary" != "$secondary" ]; then
|
|
verbose "learn changed non-primary hostkey type=${secondary}"
|
|
mv $OBJ/hkr.${secondary}.pub $OBJ/hkr.${secondary}.pub.old
|
|
rm -f $OBJ/hkr.${secondary}
|
|
${SSHKEYGEN} -qt ${secondary} -f $OBJ/hkr.${secondary} -N '' || \
|
|
fatal "ssh-keygen $secondary"
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs
|
|
# Check that the key was replaced
|
|
expect_nkeys $nkeys "learn hostkeys"
|
|
check_key_present ${secondary} $OBJ/hkr.${secondary}.pub.old && \
|
|
fail "old key present"
|
|
check_key_present ${secondary} || fail "didn't learn changed key"
|
|
fi
|
|
|
|
# Add new hostkey (primary type) to sshd and connect
|
|
verbose "learn new primary hostkey"
|
|
${SSHKEYGEN} -qt ${primary} -f $OBJ/hkr.${primary}-new -N '' || fatal "ssh-keygen ed25519"
|
|
( cat $OBJ/sshd_proxy.orig ; echo HostKey $OBJ/hkr.${primary}-new ) \
|
|
> $OBJ/sshd_proxy
|
|
# Check new hostkey added
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary},$all_algs
|
|
expect_nkeys `expr $nkeys + 1` "learn hostkeys"
|
|
check_key_present ${primary} || fail "current key missing"
|
|
check_key_present ${primary} $OBJ/hkr.${primary}-new.pub || fail "new key missing"
|
|
|
|
# Remove old hostkey (primary type) from sshd
|
|
verbose "rotate primary hostkey"
|
|
cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
|
|
mv $OBJ/hkr.${primary}.pub $OBJ/hkr.${primary}.pub.old
|
|
mv $OBJ/hkr.${primary}-new.pub $OBJ/hkr.${primary}.pub
|
|
mv $OBJ/hkr.${primary}-new $OBJ/hkr.${primary}
|
|
# Check old hostkey removed
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary},$all_algs
|
|
expect_nkeys $nkeys "learn hostkeys"
|
|
check_key_present ${primary} $OBJ/hkr.${primary}.pub.old && fail "old key present"
|
|
check_key_present ${primary} || fail "didn't learn changed key"
|
|
|
|
# Connect again, forcing rotated key
|
|
verbose "check rotate primary hostkey"
|
|
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=${primary}
|
|
expect_nkeys 1 "learn hostkeys"
|
|
check_key_present ${primary} || fail "didn't learn changed key"
|