tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2009/01/14 01:38:06 

[channels.c]
     support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482;
     "looks ok" markus@
This commit is contained in:
Damien Miller 2009-01-28 16:24:41 +11:00
parent ccf7e224ab
commit 1781f53d75
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -42,6 +42,10 @@
values and not the sanity checked versions that we acutally use; values and not the sanity checked versions that we acutally use;
bz#1540 reported by john.smith AT arrows.demon.co.uk bz#1540 reported by john.smith AT arrows.demon.co.uk
ok markus@ ok markus@
- djm@cvs.openbsd.org 2009/01/14 01:38:06
[channels.c]
support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482;
"looks ok" markus@
20090107 20090107
- (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@ -5051,5 +5055,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.5170 2009/01/28 05:23:06 djm Exp $ $Id: ChangeLog,v 1.5171 2009/01/28 05:24:41 djm Exp $

44
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.291 2009/01/01 21:14:35 djm Exp $ */ /* $OpenBSD: channels.c,v 1.292 2009/01/14 01:38:06 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
@ -980,7 +980,7 @@ static int
channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset) channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
{ {
char *p, *host; char *p, *host;
u_int len, have, i, found; u_int len, have, i, found, need;
char username[256]; char username[256];
struct { struct {
u_int8_t version; u_int8_t version;
@ -996,9 +996,19 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
if (have < len) if (have < len)
return 0; return 0;
p = buffer_ptr(&c->input); p = buffer_ptr(&c->input);
need = 1;
/* SOCKS4A uses an invalid IP address 0.0.0.x */
if (p[4] == 0 && p[5] == 0 && p[6] == 0 && p[7] != 0) {
debug2("channel %d: socks4a request", c->self);
/* ... and needs an extra string (the hostname) */
need = 2;
}
/* Check for terminating NUL on the string(s) */
for (found = 0, i = len; i < have; i++) { for (found = 0, i = len; i < have; i++) {
if (p[i] == '\0') { if (p[i] == '\0') {
found = 1; found++;
if (found == need)
break; break;
} }
if (i > 1024) { if (i > 1024) {
@ -1008,7 +1018,7 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
return -1; return -1;
} }
} }
if (!found) if (found < need)
return 0; return 0;
buffer_get(&c->input, (char *)&s4_req.version, 1); buffer_get(&c->input, (char *)&s4_req.version, 1);
buffer_get(&c->input, (char *)&s4_req.command, 1); buffer_get(&c->input, (char *)&s4_req.command, 1);
@ -1018,23 +1028,41 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
p = buffer_ptr(&c->input); p = buffer_ptr(&c->input);
len = strlen(p); len = strlen(p);
debug2("channel %d: decode socks4: user %s/%d", c->self, p, len); debug2("channel %d: decode socks4: user %s/%d", c->self, p, len);
len++; /* trailing '\0' */
if (len > have) if (len > have)
fatal("channel %d: decode socks4: len %d > have %d", fatal("channel %d: decode socks4: len %d > have %d",
c->self, len, have); c->self, len, have);
strlcpy(username, p, sizeof(username)); strlcpy(username, p, sizeof(username));
buffer_consume(&c->input, len); buffer_consume(&c->input, len);
buffer_consume(&c->input, 1); /* trailing '\0' */
if (need == 1) { /* SOCKS4: one string */
host = inet_ntoa(s4_req.dest_addr); host = inet_ntoa(s4_req.dest_addr);
strlcpy(c->path, host, sizeof(c->path)); strlcpy(c->path, host, sizeof(c->path));
} else { /* SOCKS4A: two strings */
have = buffer_len(&c->input);
p = buffer_ptr(&c->input);
len = strlen(p);
debug2("channel %d: decode socks4a: host %s/%d",
c->self, p, len);
len++; /* trailing '\0' */
if (len > have)
fatal("channel %d: decode socks4a: len %d > have %d",
c->self, len, have);
if (strlcpy(c->path, p, sizeof(c->path)) >= sizeof(c->path)) {
error("channel %d: hostname \"%.100s\" too long",
c->self, p);
return -1;
}
buffer_consume(&c->input, len);
}
c->host_port = ntohs(s4_req.dest_port); c->host_port = ntohs(s4_req.dest_port);
debug2("channel %d: dynamic request: socks4 host %s port %u command %u", debug2("channel %d: dynamic request: socks4 host %s port %u command %u",
c->self, host, c->host_port, s4_req.command); c->self, c->path, c->host_port, s4_req.command);
if (s4_req.command != 1) { if (s4_req.command != 1) {
debug("channel %d: cannot handle: socks4 cn %d", debug("channel %d: cannot handle: %s cn %d",
c->self, s4_req.command); c->self, need == 1 ? "SOCKS4" : "SOCKS4A", s4_req.command);
return -1; return -1;
} }
s4_rsp.version = 0; /* vn: 0 for reply */ s4_rsp.version = 0; /* vn: 0 for reply */