tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2009/02/12 03:00:56

Browse Source 
[canohost.c canohost.h channels.c channels.h clientloop.c readconf.c]
     [readconf.h serverloop.c ssh.c]
     support remote port forwarding with a zero listen port (-R0:...) to
     dyamically allocate a listen port at runtime (this is actually
     specified in rfc4254); bz#1003 ok markus@
This commit is contained in:
Damien Miller 2009-02-14 16:28:21 +11:00
parent fdd66fc750
commit 4bf648f776
10 changed files with 88 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -4,6 +4,12 @@
[sftp.c] [sftp.c]
Initialize a few variables to prevent spurious "may be used Initialize a few variables to prevent spurious "may be used
uninitialized" warnings from newer gcc's. ok djm@ uninitialized" warnings from newer gcc's. ok djm@
- djm@cvs.openbsd.org 2009/02/12 03:00:56
[canohost.c canohost.h channels.c channels.h clientloop.c readconf.c]
[readconf.h serverloop.c ssh.c]
support remote port forwarding with a zero listen port (-R0:...) to
dyamically allocate a listen port at runtime (this is actually
specified in rfc4254); bz#1003 ok markus@
20090212 20090212
- (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
@ -5130,5 +5136,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5186 2009/02/14 05:26:19 djm Exp $ $Id: ChangeLog,v 1.5187 2009/02/14 05:28:21 djm Exp $

4
canohost.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: canohost.c,v 1.63 2008/06/12 00:03:49 dtucker Exp $ */ /* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm 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
@ -342,7 +342,7 @@ get_remote_name_or_ip(u_int utmp_len, int use_dns)
/* Returns the local/remote port for the socket. */ /* Returns the local/remote port for the socket. */
static int int
get_sock_port(int sock, int local) get_sock_port(int sock, int local)
{ {
struct sockaddr_storage from; struct sockaddr_storage from;

4
canohost.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: canohost.h,v 1.9 2006/03/25 22:22:42 djm Exp $ */ /* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -23,5 +23,7 @@ char *get_local_name(int);
int get_remote_port(void); int get_remote_port(void);
int get_local_port(void); int get_local_port(void);
int get_sock_port(int, int);
void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *);

52
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.294 2009/01/22 09:49:57 djm Exp $ */ /* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm 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
@ -2460,7 +2460,8 @@ channel_set_af(int af)
} }
static int static int
channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_port, channel_setup_fwd_listener(int type, const char *listen_addr,
u_short listen_port, int *allocated_listen_port,
const char *host_to_connect, u_short port_to_connect, int gateway_ports) const char *host_to_connect, u_short port_to_connect, int gateway_ports)
{ {
Channel *c; Channel *c;
@ -2468,6 +2469,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
struct addrinfo hints, *ai, *aitop; struct addrinfo hints, *ai, *aitop;
const char *host, *addr; const char *host, *addr;
char ntop[NI_MAXHOST], strport[NI_MAXSERV]; char ntop[NI_MAXHOST], strport[NI_MAXSERV];
in_port_t *lport_p;
host = (type == SSH_CHANNEL_RPORT_LISTENER) ? host = (type == SSH_CHANNEL_RPORT_LISTENER) ?
listen_addr : host_to_connect; listen_addr : host_to_connect;
@ -2536,10 +2538,29 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
} }
return 0; return 0;
} }
if (allocated_listen_port != NULL)
*allocated_listen_port = 0;
for (ai = aitop; ai; ai = ai->ai_next) { for (ai = aitop; ai; ai = ai->ai_next) {
if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) switch (ai->ai_family) {
case AF_INET:
lport_p = &((struct sockaddr_in *)ai->ai_addr)->
sin_port;
break;
case AF_INET6:
lport_p = &((struct sockaddr_in6 *)ai->ai_addr)->
sin6_port;
break;
default:
continue; continue;
}
/*
* If allocating a port for -R forwards, then use the
* same port for all address families.
*/
if (type == SSH_CHANNEL_RPORT_LISTENER && listen_port == 0 &&
allocated_listen_port != NULL && *allocated_listen_port > 0)
*lport_p = htons(*allocated_listen_port);
if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, sizeof(ntop), if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, sizeof(ntop),
strport, sizeof(strport), NI_NUMERICHOST|NI_NUMERICSERV) != 0) { strport, sizeof(strport), NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
error("channel_setup_fwd_listener: getnameinfo failed"); error("channel_setup_fwd_listener: getnameinfo failed");
@ -2555,7 +2576,8 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
channel_set_reuseaddr(sock); channel_set_reuseaddr(sock);
debug("Local forwarding listening on %s port %s.", ntop, strport); debug("Local forwarding listening on %s port %s.",
ntop, strport);
/* Bind the socket to the address. */ /* Bind the socket to the address. */
if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
@ -2574,6 +2596,19 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
close(sock); close(sock);
continue; continue;
} }
/*
* listen_port == 0 requests a dynamically allocated port -
* record what we got.
*/
if (type == SSH_CHANNEL_RPORT_LISTENER && listen_port == 0 &&
allocated_listen_port != NULL &&
*allocated_listen_port == 0) {
*allocated_listen_port = get_sock_port(sock, 1);
debug("Allocated listen port %d",
*allocated_listen_port);
}
/* Allocate a channel number for the socket. */ /* Allocate a channel number for the socket. */
c = channel_new("port listener", type, sock, sock, -1, c = channel_new("port listener", type, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
@ -2616,17 +2651,18 @@ channel_setup_local_fwd_listener(const char *listen_host, u_short listen_port,
const char *host_to_connect, u_short port_to_connect, int gateway_ports) const char *host_to_connect, u_short port_to_connect, int gateway_ports)
{ {
return channel_setup_fwd_listener(SSH_CHANNEL_PORT_LISTENER, return channel_setup_fwd_listener(SSH_CHANNEL_PORT_LISTENER,
listen_host, listen_port, host_to_connect, port_to_connect, listen_host, listen_port, NULL, host_to_connect, port_to_connect,
gateway_ports); gateway_ports);
} }
/* protocol v2 remote port fwd, used by sshd */ /* protocol v2 remote port fwd, used by sshd */
int int
channel_setup_remote_fwd_listener(const char *listen_address, channel_setup_remote_fwd_listener(const char *listen_address,
u_short listen_port, int gateway_ports) u_short listen_port, int *allocated_listen_port, int gateway_ports)
{ {
return channel_setup_fwd_listener(SSH_CHANNEL_RPORT_LISTENER, return channel_setup_fwd_listener(SSH_CHANNEL_RPORT_LISTENER,
listen_address, listen_port, NULL, 0, gateway_ports); listen_address, listen_port, allocated_listen_port,
NULL, 0, gateway_ports);
} }
/* /*

4
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.97 2009/01/22 09:46:01 djm Exp $ */ /* $OpenBSD: channels.h,v 1.98 2009/02/12 03:00:56 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -245,7 +245,7 @@ int channel_request_remote_forwarding(const char *, u_short,
int channel_setup_local_fwd_listener(const char *, u_short, int channel_setup_local_fwd_listener(const char *, u_short,
const char *, u_short, int); const char *, u_short, int);
void channel_request_rforward_cancel(const char *host, u_short port); void channel_request_rforward_cancel(const char *host, u_short port);
int channel_setup_remote_fwd_listener(const char *, u_short, int); int channel_setup_remote_fwd_listener(const char *, u_short, int *, int);
int channel_cancel_rport_listener(const char *, u_short); int channel_cancel_rport_listener(const char *, u_short);
/* x11 forwarding */ /* x11 forwarding */

4
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.208 2009/01/22 10:02:34 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm 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
@ -849,7 +849,7 @@ process_cmdline(void)
} }
channel_request_rforward_cancel(cancel_host, cancel_port); channel_request_rforward_cancel(cancel_host, cancel_port);
} else { } else {
if (!parse_forward(&fwd, s, dynamic ? 1 : 0)) { if (!parse_forward(&fwd, s, dynamic, remote)) {
logit("Bad forwarding specification."); logit("Bad forwarding specification.");
goto out; goto out;
} }

13
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.175 2009/01/22 10:02:34 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.176 2009/02/12 03:00:56 djm 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
@ -735,7 +735,8 @@ parse_int:
} }
if (parse_forward(&fwd, fwdarg, if (parse_forward(&fwd, fwdarg,
opcode == oDynamicForward ? 1 : 0) == 0) opcode == oDynamicForward ? 1 : 0,
opcode == oRemoteForward ? 1 : 0) == 0)
fatal("%.200s line %d: Bad forwarding specification.", fatal("%.200s line %d: Bad forwarding specification.",
filename, linenum); filename, linenum);
@ -1220,7 +1221,7 @@ fill_default_options(Options * options)
* returns number of arguments parsed or zero on error * returns number of arguments parsed or zero on error
*/ */
int int
parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd) parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd, int remotefwd)
{ {
int i; int i;
char *p, *cp, *fwdarg[4]; char *p, *cp, *fwdarg[4];
@ -1283,12 +1284,16 @@ parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd)
goto fail_free; goto fail_free;
} }
if (fwd->listen_port <= 0) if (fwd->listen_port < 0 || (!remotefwd && fwd->listen_port == 0))
goto fail_free; goto fail_free;
if (fwd->connect_host != NULL && if (fwd->connect_host != NULL &&
strlen(fwd->connect_host) >= NI_MAXHOST) strlen(fwd->connect_host) >= NI_MAXHOST)
goto fail_free; goto fail_free;
if (fwd->listen_host != NULL &&
strlen(fwd->listen_host) >= NI_MAXHOST)
goto fail_free;
return (i); return (i);

4
readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.77 2009/01/22 10:02:34 djm Exp $ */ /* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -134,7 +134,7 @@ typedef struct {
void initialize_options(Options *); void initialize_options(Options *);
void fill_default_options(Options *); void fill_default_options(Options *);
int read_config_file(const char *, const char *, Options *, int); int read_config_file(const char *, const char *, Options *, int);
int parse_forward(Forward *, const char *, int); int parse_forward(Forward *, const char *, int, int);
int int
process_config_line(Options *, const char *, char *, const char *, int, int *); process_config_line(Options *, const char *, char *, const char *, int, int *);

9
serverloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: serverloop.c,v 1.155 2009/01/22 10:02:34 djm Exp $ */ /* $OpenBSD: serverloop.c,v 1.156 2009/02/12 03:00:56 djm 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
@ -1095,7 +1095,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
{ {
char *rtype; char *rtype;
int want_reply; int want_reply;
int success = 0; int success = 0, allocated_listen_port = 0;
rtype = packet_get_string(NULL); rtype = packet_get_string(NULL);
want_reply = packet_get_char(); want_reply = packet_get_char();
@ -1119,7 +1119,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
if (!options.allow_tcp_forwarding || if (!options.allow_tcp_forwarding ||
no_port_forwarding_flag no_port_forwarding_flag
#ifndef NO_IPPORT_RESERVED_CONCEPT #ifndef NO_IPPORT_RESERVED_CONCEPT
|| (listen_port < IPPORT_RESERVED && pw->pw_uid != 0) || (listen_port != 0 &&
listen_port < IPPORT_RESERVED && pw->pw_uid != 0)
#endif #endif
) { ) {
success = 0; success = 0;
@ -1149,6 +1150,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
if (want_reply) { if (want_reply) {
packet_start(success ? packet_start(success ?
SSH2_MSG_REQUEST_SUCCESS : SSH2_MSG_REQUEST_FAILURE); SSH2_MSG_REQUEST_SUCCESS : SSH2_MSG_REQUEST_FAILURE);
if (success && allocated_listen_port > 0)
packet_put_int(allocated_listen_port);
packet_send(); packet_send();
packet_write_wait(); packet_write_wait();
} }

15
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.323 2009/01/22 10:02:34 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.324 2009/02/12 03:00:56 djm 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
@ -453,7 +453,7 @@ main(int ac, char **av)
break; break;
case 'L': case 'L':
if (parse_forward(&fwd, optarg, 0)) if (parse_forward(&fwd, optarg, 0, 0))
add_local_forward(&options, &fwd); add_local_forward(&options, &fwd);
else { else {
fprintf(stderr, fprintf(stderr,
@ -464,7 +464,7 @@ main(int ac, char **av)
break; break;
case 'R': case 'R':
if (parse_forward(&fwd, optarg, 0)) { if (parse_forward(&fwd, optarg, 0, 1)) {
add_remote_forward(&options, &fwd); add_remote_forward(&options, &fwd);
} else { } else {
fprintf(stderr, fprintf(stderr,
@ -475,7 +475,7 @@ main(int ac, char **av)
break; break;
case 'D': case 'D':
if (parse_forward(&fwd, optarg, 1)) { if (parse_forward(&fwd, optarg, 1, 0)) {
add_local_forward(&options, &fwd); add_local_forward(&options, &fwd);
} else { } else {
fprintf(stderr, fprintf(stderr,
@ -837,9 +837,16 @@ ssh_confirm_remote_forward(int type, u_int32_t seq, void *ctxt)
{ {
Forward *rfwd = (Forward *)ctxt; Forward *rfwd = (Forward *)ctxt;
/* XXX verbose() on failure? */
debug("remote forward %s for: listen %d, connect %s:%d", debug("remote forward %s for: listen %d, connect %s:%d",
type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure",
rfwd->listen_port, rfwd->connect_host, rfwd->connect_port); rfwd->listen_port, rfwd->connect_host, rfwd->connect_port);
if (type == SSH2_MSG_REQUEST_SUCCESS && rfwd->listen_port == 0) {
logit("Allocated port %u for remote forward to %s:%d",
packet_get_int(),
rfwd->connect_host, rfwd->connect_port);
}
if (type == SSH2_MSG_REQUEST_FAILURE) { if (type == SSH2_MSG_REQUEST_FAILURE) {
if (options.exit_on_forward_failure) if (options.exit_on_forward_failure)
fatal("Error: remote port forwarding failed for " fatal("Error: remote port forwarding failed for "