X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6c434e1fed8a4549674a0f6d4c21f48db2027f24..f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2:/proxy.c

diff --git a/proxy.c b/proxy.c
index ccb1b5ef..169be0d1 100644
--- a/proxy.c
+++ b/proxy.c
@@ -16,7 +16,9 @@
 
 #define do_proxy_dns(cfg) \
     (cfg->proxy_dns == FORCE_ON || \
-	 (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS))
+	 (cfg->proxy_dns == AUTO && \
+              cfg->proxy_type != PROXY_SOCKS4 && \
+              cfg->proxy_type != PROXY_SOCKS5))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -88,6 +90,7 @@ static void sk_proxy_close (Socket s)
     Proxy_Socket ps = (Proxy_Socket) s;
 
     sk_close(ps->sub_socket);
+    sk_addr_free(ps->remote_addr);
     sfree(ps);
 }
 
@@ -173,7 +176,7 @@ static void sk_proxy_set_frozen (Socket s, int is_frozen)
     sk_set_frozen(ps->sub_socket, is_frozen);
 }
 
-static char * sk_proxy_socket_error (Socket s)
+static const char * sk_proxy_socket_error (Socket s)
 {
     Proxy_Socket ps = (Proxy_Socket) s;
     if (ps->error != NULL || ps->sub_socket == NULL) {
@@ -184,7 +187,7 @@ static char * sk_proxy_socket_error (Socket s)
 
 /* basic proxy plug functions */
 
-static int plug_proxy_closing (Plug p, char *error_msg,
+static int plug_proxy_closing (Plug p, const char *error_msg,
 			       int error_code, int calling_back)
 {
     Proxy_Plug pp = (Proxy_Plug) p;
@@ -232,7 +235,7 @@ static void plug_proxy_sent (Plug p, int bufsize)
     plug_sent(ps->plug, bufsize);
 }
 
-static int plug_proxy_accepting (Plug p, void *sock)
+static int plug_proxy_accepting (Plug p, OSSocket sock)
 {
     Proxy_Plug pp = (Proxy_Plug) p;
     Proxy_Socket ps = pp->proxy_socket;
@@ -269,7 +272,8 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
     if (addr) {
 	sk_getaddr(addr, hostip, 64);
 	hostip_len = strlen(hostip);
-    }
+    } else
+	hostip_len = 0;		       /* placate gcc; shouldn't be required */
 
     hostname_len = strlen(hostname);
 
@@ -315,9 +319,9 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 	     * match (ie. a specific IP)
 	     */
 
-	    if (addr && stricmp(hostip, exclude_list + s) == 0)
+	    if (addr && strnicmp(hostip, exclude_list + s, e - s) == 0)
 		return 0; /* IP/hostname excluded. do not use proxy. */
-	    if (stricmp(hostname, exclude_list + s) == 0)
+	    if (strnicmp(hostname, exclude_list + s, e - s) == 0)
 		return 0; /* IP/hostname excluded. do not use proxy. */
 	}
 
@@ -376,13 +380,19 @@ Socket new_connection(SockAddr addr, char *hostname,
 	Proxy_Socket ret;
 	Proxy_Plug pplug;
 	SockAddr proxy_addr;
-	char *proxy_canonical_name, *err;
+	char *proxy_canonical_name;
+	Socket sret;
+
+	if ((sret = platform_new_connection(addr, hostname, port, privport,
+					    oobinline, nodelay, plug, cfg)) !=
+	    NULL)
+	    return sret;
 
-	ret = smalloc(sizeof(struct Socket_proxy_tag));
+	ret = snew(struct Socket_proxy_tag);
 	ret->fn = &socket_fn_table;
 	ret->cfg = *cfg;	       /* STRUCTURE COPY */
 	ret->plug = plug;
-	ret->remote_addr = addr;
+	ret->remote_addr = addr;       /* will need to be freed on close */
 	ret->remote_port = port;
 
 	ret->error = NULL;
@@ -399,11 +409,10 @@ Socket new_connection(SockAddr addr, char *hostname,
 	
 	if (cfg->proxy_type == PROXY_HTTP) {
 	    ret->negotiate = proxy_http_negotiate;
-	} else if (cfg->proxy_type == PROXY_SOCKS) {
-	    if (cfg->proxy_socks_version == 4)
-		ret->negotiate = proxy_socks4_negotiate;
-	    else
-		ret->negotiate = proxy_socks5_negotiate;
+	} else if (cfg->proxy_type == PROXY_SOCKS4) {
+            ret->negotiate = proxy_socks4_negotiate;
+	} else if (cfg->proxy_type == PROXY_SOCKS5) {
+            ret->negotiate = proxy_socks5_negotiate;
 	} else if (cfg->proxy_type == PROXY_TELNET) {
 	    ret->negotiate = proxy_telnet_negotiate;
 	} else {
@@ -413,14 +422,14 @@ Socket new_connection(SockAddr addr, char *hostname,
 
 	/* create the proxy plug to map calls from the actual
 	 * socket into our proxy socket layer */
-	pplug = smalloc(sizeof(struct Plug_proxy_tag));
+	pplug = snew(struct Plug_proxy_tag);
 	pplug->fn = &plug_fn_table;
 	pplug->proxy_socket = ret;
 
 	/* look-up proxy */
 	proxy_addr = sk_namelookup(cfg->proxy_host,
 				   &proxy_canonical_name);
-	if ((err = sk_addr_error(proxy_addr)) != NULL) {
+	if (sk_addr_error(proxy_addr) != NULL) {
 	    ret->error = "Proxy error: Unable to resolve proxy host name";
 	    return (Socket)ret;
 	}
@@ -435,8 +444,6 @@ Socket new_connection(SockAddr addr, char *hostname,
 	if (sk_socket_error(ret->sub_socket) != NULL)
 	    return (Socket) ret;
 
-	sk_addr_free(proxy_addr);
-
 	/* start the proxy negotiation process... */
 	sk_set_frozen(ret->sub_socket, 0);
 	ret->negotiate(ret, PROXY_CHANGE_NEW);
@@ -579,7 +586,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    /* get the status line */
 	    len = bufchain_size(&p->pending_input_data);
 	    assert(len > 0);	       /* or we wouldn't be here */
-	    data = smalloc(len);
+	    data = snewn(len, char);
 	    bufchain_fetch(&p->pending_input_data, data, len);
 
 	    eol = get_line_end(data, len);
@@ -627,7 +634,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 
 	    len = bufchain_size(&p->pending_input_data);
 	    assert(len > 0);	       /* or we wouldn't be here */
-	    data = smalloc(len);
+	    data = snewn(len, char);
 	    datap = data;
 	    bufchain_fetch(&p->pending_input_data, data, len);
 
@@ -695,6 +702,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
 	    namelen = 0;
 	    sk_addrcopy(p->remote_addr, addr);
 	} else {		       /* type == ADDRTYPE_NAME */
+	    assert(type == ADDRTYPE_NAME);
 	    sk_getaddr(p->remote_addr, hostname, lenof(hostname));
 	    namelen = strlen(hostname) + 1;   /* include the NUL */
 	    addr[0] = addr[1] = addr[2] = 0;
@@ -702,7 +710,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
 	}
 
 	length = strlen(p->cfg.proxy_username) + namelen + 9;
-	command = (char*) smalloc(length);
+	command = snewn(length, char);
 	strcpy(command + 8, p->cfg.proxy_username);
 
 	command[0] = 4; /* version 4 */
@@ -999,7 +1007,8 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 		len = 22;	       /* 4 hdr + 16 addr + 2 trailer */
 		command[3] = 4; /* IPv6 */
 		sk_addrcopy(p->remote_addr, command+4);
-	    } else if (type == ADDRTYPE_NAME) {
+	    } else {
+		assert(type == ADDRTYPE_NAME);
 		command[3] = 3;
 		sk_getaddr(p->remote_addr, command+5, 256);
 		command[4] = strlen(command+5);
@@ -1158,103 +1167,117 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
  * standardised or at all well-defined.)
  */
 
-int proxy_telnet_negotiate (Proxy_Socket p, int change)
+char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
 {
-    if (p->state == PROXY_CHANGE_NEW) {
-
-	int so = 0, eo = 0;
-
-	/* we need to escape \\, \%, \r, \n, \t, \x??, \0???, 
-	 * %%, %host, %port, %user, and %pass
-	 */
-
-	while (p->cfg.proxy_telnet_command[eo] != 0) {
-
-	    /* scan forward until we hit end-of-line, 
-	     * or an escape character (\ or %) */
-	    while (p->cfg.proxy_telnet_command[eo] != 0 &&
-		   p->cfg.proxy_telnet_command[eo] != '%' &&
-		   p->cfg.proxy_telnet_command[eo] != '\\') eo++;
-
-	    /* if we hit eol, break out of our escaping loop */
-	    if (p->cfg.proxy_telnet_command[eo] == 0) break;
-
-	    /* if there was any unescaped text before the escape
-	     * character, send that now */
-	    if (eo != so) {
-		sk_write(p->sub_socket, 
-			 p->cfg.proxy_telnet_command + so, eo - so);
-	    }
-
-	    so = eo++;
-
-	    /* if the escape character was the last character of
-	     * the line, we'll just stop and send it. */
-	    if (p->cfg.proxy_telnet_command[eo] == 0) break;
+    char *ret = NULL;
+    int retlen = 0, retsize = 0;
+    int so = 0, eo = 0;
+#define ENSURE(n) do { \
+    if (retsize < retlen + n) { \
+	retsize = retlen + n + 512; \
+	ret = sresize(ret, retsize, char); \
+    } \
+} while (0)
+
+    /* we need to escape \\, \%, \r, \n, \t, \x??, \0???, 
+     * %%, %host, %port, %user, and %pass
+     */
 
-	    if (p->cfg.proxy_telnet_command[so] == '\\') {
+    while (cfg->proxy_telnet_command[eo] != 0) {
 
-		/* we recognize \\, \%, \r, \n, \t, \x??. 
-		 * anything else, we just send unescaped (including the \). 
-		 */
+	/* scan forward until we hit end-of-line,
+	 * or an escape character (\ or %) */
+	while (cfg->proxy_telnet_command[eo] != 0 &&
+	       cfg->proxy_telnet_command[eo] != '%' &&
+	       cfg->proxy_telnet_command[eo] != '\\') eo++;
 
-		switch (p->cfg.proxy_telnet_command[eo]) {
+	/* if we hit eol, break out of our escaping loop */
+	if (cfg->proxy_telnet_command[eo] == 0) break;
 
-		  case '\\':
-		    sk_write(p->sub_socket, "\\", 1);
-		    eo++;
-		    break;
+	/* if there was any unescaped text before the escape
+	 * character, send that now */
+	if (eo != so) {
+	    ENSURE(eo - so);
+	    memcpy(ret + retlen, cfg->proxy_telnet_command + so, eo - so);
+	    retlen += eo - so;
+	}
 
-		  case '%':
-		    sk_write(p->sub_socket, "%%", 1);
-		    eo++;
-		    break;
+	so = eo++;
 
-		  case 'r':
-		    sk_write(p->sub_socket, "\r", 1);
-		    eo++;
-		    break;
+	/* if the escape character was the last character of
+	 * the line, we'll just stop and send it. */
+	if (cfg->proxy_telnet_command[eo] == 0) break;
 
-		  case 'n':
-		    sk_write(p->sub_socket, "\n", 1);
-		    eo++;
-		    break;
+	if (cfg->proxy_telnet_command[so] == '\\') {
 
-		  case 't':
-		    sk_write(p->sub_socket, "\t", 1);
-		    eo++;
-		    break;
+	    /* we recognize \\, \%, \r, \n, \t, \x??.
+	     * anything else, we just send unescaped (including the \).
+	     */
 
-		  case 'x':
-		  case 'X':
-		    {
+	    switch (cfg->proxy_telnet_command[eo]) {
+
+	      case '\\':
+		ENSURE(1);
+		ret[retlen++] = '\\';
+		eo++;
+		break;
+
+	      case '%':
+		ENSURE(1);
+		ret[retlen++] = '%';
+		eo++;
+		break;
+
+	      case 'r':
+		ENSURE(1);
+		ret[retlen++] = '\r';
+		eo++;
+		break;
+
+	      case 'n':
+		ENSURE(1);
+		ret[retlen++] = '\n';
+		eo++;
+		break;
+
+	      case 't':
+		ENSURE(1);
+		ret[retlen++] = '\t';
+		eo++;
+		break;
+
+	      case 'x':
+	      case 'X':
+		{
 		    /* escaped hexadecimal value (ie. \xff) */
 		    unsigned char v = 0;
 		    int i = 0;
 
 		    for (;;) {
 			eo++;
-			if (p->cfg.proxy_telnet_command[eo] >= '0' &&
-			    p->cfg.proxy_telnet_command[eo] <= '9')
-			    v += p->cfg.proxy_telnet_command[eo] - '0';
-			else if (p->cfg.proxy_telnet_command[eo] >= 'a' &&
-				 p->cfg.proxy_telnet_command[eo] <= 'f')
-			    v += p->cfg.proxy_telnet_command[eo] - 'a' + 10;
-			else if (p->cfg.proxy_telnet_command[eo] >= 'A' &&
-				 p->cfg.proxy_telnet_command[eo] <= 'F')
-			    v += p->cfg.proxy_telnet_command[eo] - 'A' + 10;
+			if (cfg->proxy_telnet_command[eo] >= '0' &&
+			    cfg->proxy_telnet_command[eo] <= '9')
+			    v += cfg->proxy_telnet_command[eo] - '0';
+			else if (cfg->proxy_telnet_command[eo] >= 'a' &&
+				 cfg->proxy_telnet_command[eo] <= 'f')
+			    v += cfg->proxy_telnet_command[eo] - 'a' + 10;
+			else if (cfg->proxy_telnet_command[eo] >= 'A' &&
+				 cfg->proxy_telnet_command[eo] <= 'F')
+			    v += cfg->proxy_telnet_command[eo] - 'A' + 10;
 			else {
 			    /* non hex character, so we abort and just
 			     * send the whole thing unescaped (including \x)
 			     */
-			    sk_write(p->sub_socket, "\\", 1);
+			    ENSURE(1);
+			    ret[retlen++] = '\\';
 			    eo = so + 1;
 			    break;
 			}
 
 			/* we only extract two hex characters */
 			if (i == 1) {
-			    sk_write(p->sub_socket, (char *)&v, 1);
+			    ENSURE(1);
+			    ret[retlen++] = v;
 			    eo++;
 			    break;
 			}
@@ -1262,69 +1285,102 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
 			i++;
 			v <<= 4;
 		    }
-		    }
-		    break;
-
-		  default:
-		    sk_write(p->sub_socket, 
-			     p->cfg.proxy_telnet_command + so, 2);
-		    eo++;
-		    break;
 		}
-	    } else {
-
-		/* % escape. we recognize %%, %host, %port, %user, %pass. 
-		 * anything else, we just send unescaped (including the %). 
-		 */
+		break;
 
-		if (p->cfg.proxy_telnet_command[eo] == '%') {
-		    sk_write(p->sub_socket, "%", 1);
-		    eo++;
-		}
-		else if (strnicmp(p->cfg.proxy_telnet_command + eo,
-				  "host", 4) == 0) {
-		    char dest[512];
-		    sk_getaddr(p->remote_addr, dest, lenof(dest));
-		    sk_write(p->sub_socket, dest, strlen(dest));
-		    eo += 4;
-		}
-		else if (strnicmp(p->cfg.proxy_telnet_command + eo,
-				  "port", 4) == 0) {
-		    char port[8];
-		    sprintf(port, "%i", p->remote_port);
-		    sk_write(p->sub_socket, port, strlen(port));
-		    eo += 4;
-		}
-		else if (strnicmp(p->cfg.proxy_telnet_command + eo,
-				  "user", 4) == 0) {
-		    sk_write(p->sub_socket, p->cfg.proxy_username, 
-			strlen(p->cfg.proxy_username));
-		    eo += 4;
-		}
-		else if (strnicmp(p->cfg.proxy_telnet_command + eo,
-				  "pass", 4) == 0) {
-		    sk_write(p->sub_socket, p->cfg.proxy_password, 
-			strlen(p->cfg.proxy_password));
-		    eo += 4;
-		}
-		else {
-		    /* we don't escape this, so send the % now, and
-		     * don't advance eo, so that we'll consider the
-		     * text immediately following the % as unescaped.
-		     */
-		    sk_write(p->sub_socket, "%", 1);
-		}
+	      default:
+		ENSURE(2);
+		memcpy(ret+retlen, cfg->proxy_telnet_command + so, 2);
+		retlen += 2;
+		eo++;
+		break;
 	    }
+	} else {
 
-	    /* resume scanning for additional escapes after this one. */
-	    so = eo;
-	}
+	    /* % escape. we recognize %%, %host, %port, %user, %pass.
+	     * anything else, we just send unescaped (including the %).
+	     */
 
-	/* if there is any unescaped text at the end of the line, send it */
-	if (eo != so) {
-	    sk_write(p->sub_socket, p->cfg.proxy_telnet_command + so, eo - so);
+	    if (cfg->proxy_telnet_command[eo] == '%') {
+		ENSURE(1);
+		ret[retlen++] = '%';
+		eo++;
+	    }
+	    else if (strnicmp(cfg->proxy_telnet_command + eo,
+			      "host", 4) == 0) {
+		char dest[512];
+		int destlen;
+		sk_getaddr(addr, dest, lenof(dest));
+		destlen = strlen(dest);
+		ENSURE(destlen);
+		memcpy(ret+retlen, dest, destlen);
+		retlen += destlen;
+		eo += 4;
+	    }
+	    else if (strnicmp(cfg->proxy_telnet_command + eo,
+			      "port", 4) == 0) {
+		char portstr[8], portlen;
+		portlen = sprintf(portstr, "%i", port);
+		ENSURE(portlen);
+		memcpy(ret + retlen, portstr, portlen);
+		retlen += portlen;
+		eo += 4;
+	    }
+	    else if (strnicmp(cfg->proxy_telnet_command + eo,
+			      "user", 4) == 0) {
+		int userlen = strlen(cfg->proxy_username);
+		ENSURE(userlen);
+		memcpy(ret+retlen, cfg->proxy_username, userlen);
+		retlen += userlen;
+		eo += 4;
+	    }
+	    else if (strnicmp(cfg->proxy_telnet_command + eo,
+			      "pass", 4) == 0) {
+		int passlen = strlen(cfg->proxy_password);
+		ENSURE(passlen);
+		memcpy(ret+retlen, cfg->proxy_password, passlen);
+		retlen += passlen;
+		eo += 4;
+	    }
+	    else {
+		/* we don't escape this, so send the % now, and
+		 * don't advance eo, so that we'll consider the
+		 * text immediately following the % as unescaped.
+		 */
+		ENSURE(1);
+		ret[retlen++] = '%';
+	    }
 	}
 
+	/* resume scanning for additional escapes after this one. */
+	so = eo;
+    }
+
+    /* if there is any unescaped text at the end of the line, send it */
+    if (eo != so) {
+	ENSURE(eo - so);
+	memcpy(ret + retlen, cfg->proxy_telnet_command + so, eo - so);
+	retlen += eo - so;
+    }
+
+    ENSURE(1);
+    ret[retlen] = '\0';
+    return ret;
+
+#undef ENSURE
+}
+
+int proxy_telnet_negotiate (Proxy_Socket p, int change)
+{
+    if (p->state == PROXY_CHANGE_NEW) {
+	char *formatted_cmd;
+
+	formatted_cmd = format_telnet_command(p->remote_addr, p->remote_port,
+					      &p->cfg);
+
+	sk_write(p->sub_socket, formatted_cmd, strlen(formatted_cmd));
+	sfree(formatted_cmd);
+
 	p->state = 1;
 	return 0;
     }