mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
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
167 lines
5.3 KiB
Bash
167 lines
5.3 KiB
Bash
# $OpenBSD: cert-file.sh,v 1.8 2019/11/26 23:43:10 djm Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="ssh with certificates"
|
|
|
|
rm -f $OBJ/user_ca_key* $OBJ/user_key*
|
|
rm -f $OBJ/cert_user_key*
|
|
|
|
# Create a CA key
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key1 ||\
|
|
fatal "ssh-keygen failed"
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key2 ||\
|
|
fatal "ssh-keygen failed"
|
|
|
|
# Make some keys and certificates.
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key1 || \
|
|
fatal "ssh-keygen failed"
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key2 || \
|
|
fatal "ssh-keygen failed"
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key3 || \
|
|
fatal "ssh-keygen failed"
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key4 || \
|
|
fatal "ssh-keygen failed"
|
|
${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_key5 || \
|
|
fatal "ssh-keygen failed"
|
|
|
|
# Move the certificate to a different address to better control
|
|
# when it is offered.
|
|
${SSHKEYGEN} -q -s $OBJ/user_ca_key1 -I "regress user key for $USER" \
|
|
-z $$ -n ${USER} $OBJ/user_key1 ||
|
|
fatal "couldn't sign user_key1 with user_ca_key1"
|
|
mv $OBJ/user_key1-cert.pub $OBJ/cert_user_key1_1.pub
|
|
${SSHKEYGEN} -q -s $OBJ/user_ca_key2 -I "regress user key for $USER" \
|
|
-z $$ -n ${USER} $OBJ/user_key1 ||
|
|
fatal "couldn't sign user_key1 with user_ca_key2"
|
|
mv $OBJ/user_key1-cert.pub $OBJ/cert_user_key1_2.pub
|
|
${SSHKEYGEN} -q -s $OBJ/user_ca_key1 -I "regress user key for $USER" \
|
|
-z $$ -n ${USER} $OBJ/user_key3 ||
|
|
fatal "couldn't sign user_key3 with user_ca_key1"
|
|
rm $OBJ/user_key3.pub # to test use of private key w/o public half.
|
|
${SSHKEYGEN} -q -s $OBJ/user_ca_key1 -I "regress user key for $USER" \
|
|
-z $$ -n ${USER} $OBJ/user_key4 ||
|
|
fatal "couldn't sign user_key4 with user_ca_key1"
|
|
rm $OBJ/user_key4 $OBJ/user_key4.pub # to test no matching pub/private key case.
|
|
|
|
trace 'try with identity files'
|
|
opts="-F $OBJ/ssh_proxy -oIdentitiesOnly=yes"
|
|
opts2="$opts -i $OBJ/user_key1 -i $OBJ/user_key2"
|
|
echo "cert-authority $(cat $OBJ/user_ca_key1.pub)" > $OBJ/authorized_keys_$USER
|
|
|
|
# Make a clean config that doesn't have any pre-added identities.
|
|
cat $OBJ/ssh_proxy | grep -v IdentityFile > $OBJ/no_identity_config
|
|
|
|
# XXX: verify that certificate used was what we expect. Needs exposure of
|
|
# keys via environment variable or similar.
|
|
|
|
# Key with no .pub should work - finding the equivalent *-cert.pub.
|
|
verbose "identity cert with no plain public file"
|
|
${SSH} -F $OBJ/no_identity_config -oIdentitiesOnly=yes \
|
|
-i $OBJ/user_key3 somehost exit 52
|
|
[ $? -ne 52 ] && fail "ssh failed"
|
|
|
|
# CertificateFile matching private key with no .pub file should work.
|
|
verbose "CertificateFile with no plain public file"
|
|
${SSH} -F $OBJ/no_identity_config -oIdentitiesOnly=yes \
|
|
-oCertificateFile=$OBJ/user_key3-cert.pub \
|
|
-i $OBJ/user_key3 somehost exit 52
|
|
[ $? -ne 52 ] && fail "ssh failed"
|
|
|
|
# Just keys should fail
|
|
verbose "plain keys"
|
|
${SSH} $opts2 somehost exit 52
|
|
r=$?
|
|
if [ $r -eq 52 ]; then
|
|
fail "ssh succeeded with no certs"
|
|
fi
|
|
|
|
# Keys with untrusted cert should fail.
|
|
verbose "untrusted cert"
|
|
opts3="$opts2 -oCertificateFile=$OBJ/cert_user_key1_2.pub"
|
|
${SSH} $opts3 somehost exit 52
|
|
r=$?
|
|
if [ $r -eq 52 ]; then
|
|
fail "ssh succeeded with bad cert"
|
|
fi
|
|
|
|
# Good cert with bad key should fail.
|
|
verbose "good cert, bad key"
|
|
opts3="$opts -i $OBJ/user_key2"
|
|
opts3="$opts3 -oCertificateFile=$OBJ/cert_user_key1_1.pub"
|
|
${SSH} $opts3 somehost exit 52
|
|
r=$?
|
|
if [ $r -eq 52 ]; then
|
|
fail "ssh succeeded with no matching key"
|
|
fi
|
|
|
|
# Keys with one trusted cert, should succeed.
|
|
verbose "single trusted"
|
|
opts3="$opts2 -oCertificateFile=$OBJ/cert_user_key1_1.pub"
|
|
${SSH} $opts3 somehost exit 52
|
|
r=$?
|
|
if [ $r -ne 52 ]; then
|
|
fail "ssh failed with trusted cert and key"
|
|
fi
|
|
|
|
# Multiple certs and keys, with one trusted cert, should succeed.
|
|
verbose "multiple trusted"
|
|
opts3="$opts2 -oCertificateFile=$OBJ/cert_user_key1_2.pub"
|
|
opts3="$opts3 -oCertificateFile=$OBJ/cert_user_key1_1.pub"
|
|
${SSH} $opts3 somehost exit 52
|
|
r=$?
|
|
if [ $r -ne 52 ]; then
|
|
fail "ssh failed with multiple certs"
|
|
fi
|
|
|
|
#next, using an agent in combination with the keys
|
|
SSH_AUTH_SOCK=/nonexistent ${SSHADD} -l > /dev/null 2>&1
|
|
if [ $? -ne 2 ]; then
|
|
fatal "ssh-add -l did not fail with exit code 2"
|
|
fi
|
|
|
|
trace "start agent"
|
|
eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` > /dev/null
|
|
r=$?
|
|
if [ $r -ne 0 ]; then
|
|
fatal "could not start ssh-agent: exit code $r"
|
|
fi
|
|
|
|
# add private keys to agent
|
|
${SSHADD} -k $OBJ/user_key2 > /dev/null 2>&1
|
|
if [ $? -ne 0 ]; then
|
|
fatal "ssh-add did not succeed with exit code 0"
|
|
fi
|
|
${SSHADD} -k $OBJ/user_key1 > /dev/null 2>&1
|
|
if [ $? -ne 0 ]; then
|
|
fatal "ssh-add did not succeed with exit code 0"
|
|
fi
|
|
|
|
# try ssh with the agent and certificates
|
|
opts="-F $OBJ/ssh_proxy"
|
|
# with no certificates, should fail
|
|
${SSH} $opts somehost exit 52
|
|
if [ $? -eq 52 ]; then
|
|
fail "ssh connect with agent in succeeded with no cert"
|
|
fi
|
|
|
|
#with an untrusted certificate, should fail
|
|
opts="$opts -oCertificateFile=$OBJ/cert_user_key1_2.pub"
|
|
${SSH} $opts somehost exit 52
|
|
if [ $? -eq 52 ]; then
|
|
fail "ssh connect with agent in succeeded with bad cert"
|
|
fi
|
|
|
|
#with an additional trusted certificate, should succeed
|
|
opts="$opts -oCertificateFile=$OBJ/cert_user_key1_1.pub"
|
|
${SSH} $opts somehost exit 52
|
|
if [ $? -ne 52 ]; then
|
|
fail "ssh connect with agent in failed with good cert"
|
|
fi
|
|
|
|
trace "kill agent"
|
|
${SSHAGENT} -k > /dev/null
|
|
|
|
#cleanup
|
|
rm -f $OBJ/user_ca_key* $OBJ/user_key*
|
|
rm -f $OBJ/cert_user_key*
|