X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=gateway.c;h=5a0eac15eef06856915204c1deb5fc535e872d9b;hb=a4e71d4928748f021df297111c57572f5bc0ae66;hp=a84ea5e70004701cfa8a016935be472da0b1100b;hpb=4218c1d3050714d80816c43867b9e25a73cbf097;p=privoxy.git diff --git a/gateway.c b/gateway.c index a84ea5e7..5a0eac15 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.18 2006/07/18 14:48:46 david__schmidt Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.20 2007/05/14 10:23:48 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -34,6 +34,15 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.18 2006/07/18 14:48:46 david__sch * * Revisions : * $Log: gateway.c,v $ + * Revision 1.20 2007/05/14 10:23:48 fabiankeil + * - Use strlcpy() instead of strcpy(). + * - Use the same buffer for socks requests and socks responses. + * - Fix bogus warning about web_server_addr being used uninitialized. + * + * Revision 1.19 2007/01/25 14:09:45 fabiankeil + * - Save errors in socks4_connect() to csp->error_message. + * - Silence some gcc43 warnings, hopefully the right way. + * * Revision 1.18 2006/07/18 14:48:46 david__schmidt * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) * with what was really the latest development (the v_3_0_branch branch) @@ -135,6 +144,7 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.18 2006/07/18 14:48:46 david__sch #include #include +#include "assert.h" #ifdef _WIN32 #include @@ -153,6 +163,7 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.18 2006/07/18 14:48:46 david__sch #include "errlog.h" #include "jbsockets.h" #include "gateway.h" +#include "miscutil.h" const char gateway_h_rcs[] = GATEWAY_H_VERSION; @@ -173,7 +184,8 @@ struct socks_op { unsigned char cd; /* command code */ unsigned char dstport[2]; /* destination port */ unsigned char dstip[4]; /* destination address */ - unsigned char userid; /* first byte of userid */ + char userid; /* first byte of userid */ + char padding[3]; /* make sure sizeof(struct socks_op) is endian-independent. */ /* more bytes of the userid follow, terminated by a NULL */ }; @@ -272,10 +284,9 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, struct client_state *csp) { int web_server_addr; - char cbuf[BUFFER_SIZE]; - char sbuf[BUFFER_SIZE]; - struct socks_op *c = (struct socks_op *)cbuf; - struct socks_reply *s = (struct socks_reply *)sbuf; + char buf[BUFFER_SIZE]; + struct socks_op *c = (struct socks_op *)buf; + struct socks_reply *s = (struct socks_reply *)buf; size_t n; size_t csiz; jb_socket sfd; @@ -305,9 +316,9 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, /* build a socks request for connection to the web server */ - strcpy((char *)&(c->userid), socks_userid); + strlcpy(&(c->userid), socks_userid, sizeof(buf) - sizeof(struct socks_op)); - csiz = sizeof(*c) + sizeof(socks_userid) - 1; + csiz = sizeof(*c) + sizeof(socks_userid) - sizeof(c->userid) - sizeof(c->padding); switch (fwd->type) { @@ -323,7 +334,7 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, case SOCKS_4A: web_server_addr = 0x00000001; n = csiz + strlen(target_host) + 1; - if (n > sizeof(cbuf)) + if (n > sizeof(buf)) { errno = EINVAL; errstr = "buffer cbuf too small."; @@ -332,7 +343,18 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, } else { - strcpy(cbuf + csiz, target_host); + strlcpy(buf + csiz, target_host, sizeof(buf) - sizeof(struct socks_op) - csiz); + /* + * What we forward to the socks4a server should have the + * size of socks_op, plus the length of the userid plus + * its \0 byte (which we don't have to add because the + * first byte of the userid is counted twice as it's also + * part of sock_op) minus the padding bytes (which are part + * of the userid as well), plus the length of the target_host + * (which is stored csiz bytes after the beginning of the buffer), + * plus another \0 byte. + */ + assert(n == sizeof(struct socks_op) + strlen(&(c->userid)) - sizeof(c->padding) + strlen(buf + csiz) + 1); csiz = n; } break; @@ -341,6 +363,7 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, log_error(LOG_LEVEL_FATAL, "socks4_connect: SOCKS4 impossible internal error - bad SOCKS type."); /* Not reached */ + return(JB_INVALID_SOCKET); } if (err) @@ -351,7 +374,6 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, c->vn = 4; c->cd = 1; - /* XXX: these casts surpress gcc43 warnings, but are they correct? */ c->dstport[0] = (unsigned char)((target_port >> 8 ) & 0xff); c->dstport[1] = (unsigned char)((target_port ) & 0xff); c->dstip[0] = (unsigned char)((web_server_addr >> 24 ) & 0xff); @@ -365,7 +387,7 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, if (sfd == JB_INVALID_SOCKET) { /* - * XXX: connect_to could fill in the exact reason. + * XXX: connect_to should fill in the exact reason. * Most likely resolving the IP of the forwarder failed. */ errstr = "connect_to failed: see logfile for details"; @@ -378,7 +400,7 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, err = 1; close_socket(sfd); } - else if (read_socket(sfd, sbuf, sizeof(sbuf)) != sizeof(*s)) + else if (read_socket(sfd, buf, sizeof(buf)) != sizeof(*s)) { errstr = "SOCKS4 negotiation read failed."; log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr); @@ -414,9 +436,9 @@ static jb_socket socks4_connect(const struct forward_spec * fwd, break; default: errno = ENOENT; - snprintf(cbuf, sizeof(cbuf), - "SOCKS request rejected for reason code %d.", s->cd); - errstr = cbuf; + snprintf(buf, sizeof(buf), + "SOCKS request rejected for reason code %d.", s->cd); + errstr = buf; } log_error(LOG_LEVEL_CONNECT, "socks4_connect: %s", errstr);