RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-04 15:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Add a '%k' TOKEN that expands to the effective HostKey of

Browse Source 
the destination.  This allows, eg, keeping host keys in individual files
using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
(man page bits)

OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc
This commit is contained in:
dtucker@openbsd.org 2020-07-17 03:43:42 +00:00 committed by Damien Miller
parent c4f239944a
commit 8df5774a42
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.532 2020/07/17 03:23:10 dtucker Exp $ */ /* $OpenBSD: ssh.c,v 1.533 2020/07/17 03:43:42 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -176,6 +176,7 @@ char *forward_agent_sock_path = NULL;
/* Various strings used to to percent_expand() arguments */ /* Various strings used to to percent_expand() arguments */
static char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV]; static char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
static char uidstr[32], *host_arg, *conn_hash_hex; static char uidstr[32], *host_arg, *conn_hash_hex;
static const char *keyalias;
/* socket address the host resolves to */ /* socket address the host resolves to */
struct sockaddr_storage hostaddr; struct sockaddr_storage hostaddr;
@ -235,6 +236,7 @@ tilde_expand_paths(char **paths, u_int num_paths)
"C", conn_hash_hex, \ "C", conn_hash_hex, \
"L", shorthost, \ "L", shorthost, \
"i", uidstr, \ "i", uidstr, \
"k", keyalias, \
"l", thishost, \ "l", thishost, \
"n", host_arg, \ "n", host_arg, \
"p", portstr "p", portstr
@ -1380,6 +1382,7 @@ main(int ac, char **av)
snprintf(portstr, sizeof(portstr), "%d", options.port); snprintf(portstr, sizeof(portstr), "%d", options.port);
snprintf(uidstr, sizeof(uidstr), "%llu", snprintf(uidstr, sizeof(uidstr), "%llu",
(unsigned long long)pw->pw_uid); (unsigned long long)pw->pw_uid);
keyalias = options.host_key_alias ? options.host_key_alias : host_arg;
conn_hash_hex = ssh_connection_hash(thishost, host, portstr, conn_hash_hex = ssh_connection_hash(thishost, host, portstr,
options.user); options.user);

3
ssh_config
View File

@ -1,4 +1,4 @@
# $OpenBSD: ssh_config,v 1.34 2019/02/04 02:39:42 dtucker Exp $ # $OpenBSD: ssh_config,v 1.35 2020/07/17 03:43:42 dtucker Exp $
# This is the ssh client system-wide configuration file. See # This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for # ssh_config(5) for more information. This file provides defaults for
@ -43,3 +43,4 @@
# VisualHostKey no # VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com # ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h # RekeyLimit 1G 1h
# UserKnownHostsFile ~/.ssh/known_hosts.d/%k

5
ssh_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.329 2020/07/17 03:23:10 dtucker Exp $ .\" $OpenBSD: ssh_config.5,v 1.330 2020/07/17 03:43:42 dtucker Exp $
.Dd $Mdocdate: July 17 2020 $ .Dd $Mdocdate: July 17 2020 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -1850,6 +1850,9 @@ Local user's home directory.
The remote hostname. The remote hostname.
.It %i .It %i
The local user ID. The local user ID.
.It %k
The host key alias if specified, otherwise the orignal remote hostname given
on the command line.
.It %L .It %L
The local hostname. The local hostname.
.It %l .It %l

5
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.329 2020/03/13 04:01:56 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.330 2020/07/17 03:43:42 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -89,11 +89,14 @@ expand_proxy_command(const char *proxy_command, const char *user,
const char *host, const char *host_arg, int port) const char *host, const char *host_arg, int port)
{ {
char *tmp, *ret, strport[NI_MAXSERV]; char *tmp, *ret, strport[NI_MAXSERV];
const char *keyalias = options.host_key_alias ?
options.host_key_alias : host_arg;
snprintf(strport, sizeof strport, "%d", port); snprintf(strport, sizeof strport, "%d", port);
xasprintf(&tmp, "exec %s", proxy_command); xasprintf(&tmp, "exec %s", proxy_command);
ret = percent_expand(tmp, ret = percent_expand(tmp,
"h", host, "h", host,
"k", keyalias,
"n", host_arg, "n", host_arg,
"p", strport, "p", strport,
"r", options.user, "r", options.user,