X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/65c78e88edd541366726a65911825cf88083a4d9..b7a189f38294c745ae4ea6efb55891c8196e275b:/proxy.c diff --git a/proxy.c b/proxy.c index b9ed5489..d43ad7b4 100644 --- a/proxy.c +++ b/proxy.c @@ -5,15 +5,19 @@ * code and the higher level backend. */ -#include - #include +#include +#include #define DEFINE_PLUG_METHOD_MACROS #include "putty.h" #include "network.h" #include "proxy.h" +#define do_proxy_dns \ + (cfg.proxy_dns == 2 || \ + (cfg.proxy_dns == 1 && cfg.proxy_type != PROXY_SOCKS)) + /* * Call this when proxy negotiation is complete, so that this * socket can begin working normally. @@ -22,43 +26,50 @@ void proxy_activate (Proxy_Socket p) { void *data; int len; - + long output_before, output_after; + p->state = PROXY_STATE_ACTIVE; - /* let's try to keep extra receive events from coming through */ + /* we want to ignore new receive events until we have sent + * all of our buffered receive data. + */ sk_set_frozen(p->sub_socket, 1); + /* how many bytes of output have we buffered? */ + output_before = bufchain_size(&p->pending_oob_output_data) + + bufchain_size(&p->pending_output_data); + /* and keep track of how many bytes do not get sent. */ + output_after = 0; + /* send buffered OOB writes */ while (bufchain_size(&p->pending_oob_output_data) > 0) { bufchain_prefix(&p->pending_oob_output_data, &data, &len); - sk_write_oob(p->sub_socket, data, len); + output_after += sk_write_oob(p->sub_socket, data, len); bufchain_consume(&p->pending_oob_output_data, len); } - bufchain_clear(&p->pending_oob_output_data); /* send buffered normal writes */ while (bufchain_size(&p->pending_output_data) > 0) { bufchain_prefix(&p->pending_output_data, &data, &len); - sk_write(p->sub_socket, data, len); + output_after += sk_write(p->sub_socket, data, len); bufchain_consume(&p->pending_output_data, len); } - bufchain_clear(&p->pending_output_data); + + /* if we managed to send any data, let the higher levels know. */ + if (output_after < output_before) + plug_sent(p->plug, output_after); /* if we were asked to flush the output during * the proxy negotiation process, do so now. */ if (p->pending_flush) sk_flush(p->sub_socket); - /* forward buffered recv data to the backend */ - while (bufchain_size(&p->pending_input_data) > 0) { - bufchain_prefix(&p->pending_input_data, &data, &len); - plug_receive(p->plug, 0, data, len); - bufchain_consume(&p->pending_input_data, len); - } - bufchain_clear(&p->pending_input_data); - - /* now set the underlying socket to whatever freeze state they wanted */ - sk_set_frozen(p->sub_socket, p->freeze); + /* if the backend wanted the socket unfrozen, try to unfreeze. + * our set_frozen handler will flush buffered receive data before + * unfreezing the actual underlying socket. + */ + if (!p->freeze) + sk_set_frozen((Socket)p, 0); } /* basic proxy socket functions */ @@ -135,6 +146,30 @@ static void sk_proxy_set_frozen (Socket s, int is_frozen) ps->freeze = is_frozen; return; } + + /* handle any remaining buffered recv data first */ + if (bufchain_size(&ps->pending_input_data) > 0) { + ps->freeze = is_frozen; + + /* loop while we still have buffered data, and while we are + * unfrozen. the plug_receive call in the loop could result + * in a call back into this function refreezing the socket, + * so we have to check each time. + */ + while (!ps->freeze && bufchain_size(&ps->pending_input_data) > 0) { + void *data; + int len; + bufchain_prefix(&ps->pending_input_data, &data, &len); + plug_receive(ps->plug, 0, data, len); + bufchain_consume(&ps->pending_input_data, len); + } + + /* if we're still frozen, we'll have to wait for another + * call from the backend to finish unbuffering the data. + */ + if (ps->freeze) return; + } + sk_set_frozen(ps->sub_socket, is_frozen); } @@ -209,6 +244,10 @@ static int plug_proxy_accepting (Plug p, void *sock) return plug_accepting(ps->plug, sock); } +/* + * This function can accept a NULL pointer as `addr', in which case + * it will only check the host name. + */ static int proxy_for_destination (SockAddr addr, char * hostname, int port) { int s = 0, e = 0; @@ -216,10 +255,21 @@ static int proxy_for_destination (SockAddr addr, char * hostname, int port) int hostip_len, hostname_len; char * exclude_list; + /* + * Check the host name and IP against the hard-coded + * representations of `localhost'. + */ + if (!cfg.even_proxy_localhost && + (sk_hostname_is_local(hostname) || + (addr && sk_address_is_local(addr)))) + return 0; /* do not proxy */ + /* we want a string representation of the IP address for comparisons */ - sk_getaddr(addr, hostip, 64); + if (addr) { + sk_getaddr(addr, hostip, 64); + hostip_len = strlen(hostip); + } - hostip_len = strlen(hostip); hostname_len = strlen(hostname); exclude_list = cfg.proxy_exclude_list; @@ -246,8 +296,8 @@ static int proxy_for_destination (SockAddr addr, char * hostname, int port) if (exclude_list[s] == '*') { /* wildcard at beginning of entry */ - if (strnicmp(hostip + hostip_len - (e - s - 1), - exclude_list + s + 1, e - s - 1) == 0 || + if ((addr && strnicmp(hostip + hostip_len - (e - s - 1), + exclude_list + s + 1, e - s - 1) == 0) || strnicmp(hostname + hostname_len - (e - s - 1), exclude_list + s + 1, e - s - 1) == 0) return 0; /* IP/hostname range excluded. do not use proxy. */ @@ -255,7 +305,7 @@ static int proxy_for_destination (SockAddr addr, char * hostname, int port) } else if (exclude_list[e-1] == '*') { /* wildcard at end of entry */ - if (strnicmp(hostip, exclude_list + s, e - s - 1) == 0 || + if ((addr && strnicmp(hostip, exclude_list + s, e - s - 1) == 0) || strnicmp(hostname, exclude_list + s, e - s - 1) == 0) return 0; /* IP/hostname range excluded. do not use proxy. */ @@ -264,7 +314,7 @@ static int proxy_for_destination (SockAddr addr, char * hostname, int port) * match (ie. a specific IP) */ - if (stricmp(hostip, exclude_list + s) == 0) + if (addr && stricmp(hostip, exclude_list + s) == 0) return 0; /* IP/hostname excluded. do not use proxy. */ if (stricmp(hostname, exclude_list + s) == 0) return 0; /* IP/hostname excluded. do not use proxy. */ @@ -277,11 +327,22 @@ static int proxy_for_destination (SockAddr addr, char * hostname, int port) return 1; } +SockAddr name_lookup(char *host, int port, char **canonicalname) +{ + if (cfg.proxy_type != PROXY_NONE && + do_proxy_dns && proxy_for_destination(NULL, host, port)) { + *canonicalname = dupstr(host); + return sk_nonamelookup(host); + } + + return sk_namelookup(host, canonicalname); +} + Socket new_connection(SockAddr addr, char *hostname, int port, int privport, int oobinline, int nodelay, Plug plug) { - static struct socket_function_table socket_fn_table = { + static const struct socket_function_table socket_fn_table = { sk_proxy_plug, sk_proxy_close, sk_proxy_write, @@ -293,7 +354,7 @@ Socket new_connection(SockAddr addr, char *hostname, sk_proxy_socket_error }; - static struct plug_function_table plug_fn_table = { + static const struct plug_function_table plug_fn_table = { plug_proxy_closing, plug_proxy_receive, plug_proxy_sent, @@ -306,7 +367,7 @@ Socket new_connection(SockAddr addr, char *hostname, Proxy_Socket ret; Proxy_Plug pplug; SockAddr proxy_addr; - char * proxy_canonical_name; + char *proxy_canonical_name, *err; ret = smalloc(sizeof(struct Socket_proxy_tag)); ret->fn = &socket_fn_table; @@ -314,8 +375,6 @@ Socket new_connection(SockAddr addr, char *hostname, ret->remote_addr = addr; ret->remote_port = port; - /* XXX review these initialisations, and initialise other fields - * in Proxy_Socket structure */ ret->error = NULL; ret->pending_flush = 0; ret->freeze = 0; @@ -326,7 +385,8 @@ Socket new_connection(SockAddr addr, char *hostname, ret->sub_socket = NULL; ret->state = PROXY_STATE_NEW; - + ret->negotiate = NULL; + if (cfg.proxy_type == PROXY_HTTP) { ret->negotiate = proxy_http_negotiate; } else if (cfg.proxy_type == PROXY_SOCKS) { @@ -350,6 +410,10 @@ Socket new_connection(SockAddr addr, char *hostname, /* look-up proxy */ proxy_addr = sk_namelookup(cfg.proxy_host, &proxy_canonical_name); + if ((err = sk_addr_error(proxy_addr))) { + ret->error = "Proxy error: Unable to resolve proxy host name"; + return (Socket)ret; + } sfree(proxy_canonical_name); /* create the actual socket we will be using, @@ -374,13 +438,13 @@ Socket new_connection(SockAddr addr, char *hostname, return sk_new(addr, port, privport, oobinline, nodelay, plug); } -Socket new_listener(int port, Plug plug, int local_host_only) +Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only) { /* TODO: SOCKS (and potentially others) support inbound * TODO: connections via the proxy. support them. */ - return sk_newlistener(port, plug, local_host_only); + return sk_newlistener(srcaddr, port, plug, local_host_only); } /* ---------------------------------------------------------------------- @@ -429,13 +493,14 @@ int proxy_http_negotiate (Proxy_Socket p, int change) * for this proxy method, it's just a simple HTTP * request */ - char buf[256], dest[64]; + char *buf, dest[512]; - sk_getaddr(p->remote_addr, dest, 64); + sk_getaddr(p->remote_addr, dest, lenof(dest)); - sprintf(buf, "CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n", - dest, p->remote_port, dest, p->remote_port); + buf = dupprintf("CONNECT %s:%i HTTP/1.1\r\nHost: %s:%i\r\n", + dest, p->remote_port, dest, p->remote_port); sk_write(p->sub_socket, buf, strlen(buf)); + sfree(buf); if (cfg.proxy_username[0] || cfg.proxy_password[0]) { char buf[sizeof(cfg.proxy_username)+sizeof(cfg.proxy_password)]; @@ -450,8 +515,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change) sk_write(p->sub_socket, buf2, strlen(buf2)); } - sprintf(buf, "\r\n"); - sk_write(p->sub_socket, buf, strlen(buf)); + sk_write(p->sub_socket, "\r\n", 2); p->state = 1; return 0; @@ -526,14 +590,14 @@ int proxy_http_negotiate (Proxy_Socket p, int change) bufchain_consume(&p->pending_input_data, eol); if (data[status] != '2') { /* error */ - char buf[1024]; + char *buf; data[eol] = '\0'; while (eol > status && (data[eol-1] == '\r' || data[eol-1] == '\n')) data[--eol] = '\0'; - sprintf(buf, "Proxy error: %.900s", - data+status); + buf = dupprintf("Proxy error: %s", data+status); plug_closing(p->plug, buf, PROXY_ERROR_GENERAL, 0); + sfree(buf); sfree(data); return 1; } @@ -564,6 +628,7 @@ int proxy_http_negotiate (Proxy_Socket p, int change) { bufchain_consume(&p->pending_input_data, eol); datap += eol; + len -= eol; eol = get_line_end(datap, len); } @@ -606,17 +671,26 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change) * user ID (variable length, null terminated string) */ - int length; - char * command; + int length, type, namelen; + char *command, addr[4], hostname[512]; - if (sk_addrtype(p->remote_addr) != AF_INET) { + type = sk_addrtype(p->remote_addr); + if (type == ADDRTYPE_IPV6) { plug_closing(p->plug, "Proxy error: SOCKS version 4 does" " not support IPv6", PROXY_ERROR_GENERAL, 0); return 1; + } else if (type == ADDRTYPE_IPV4) { + namelen = 0; + sk_addrcopy(p->remote_addr, addr); + } else { /* 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; + addr[3] = 1; } - length = strlen(cfg.proxy_username) + 9; - command = (char*) malloc(length); + length = strlen(cfg.proxy_username) + namelen + 9; + command = (char*) smalloc(length); strcpy(command + 8, cfg.proxy_username); command[0] = 4; /* version 4 */ @@ -627,10 +701,14 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change) command[3] = (char) p->remote_port & 0xff; /* address */ - sk_addrcopy(p->remote_addr, command + 4); + memcpy(command + 4, addr, 4); + + /* hostname */ + memcpy(command + 8 + strlen(cfg.proxy_username) + 1, + hostname, namelen); sk_write(p->sub_socket, command, length); - free(command); + sfree(command); p->state = 1; return 0; @@ -896,24 +974,30 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) * dest. port (2 bytes) [network order] */ - char command[22]; + char command[512]; int len; + int type; - if (sk_addrtype(p->remote_addr) == AF_INET) { - len = 10; + type = sk_addrtype(p->remote_addr); + if (type == ADDRTYPE_IPV4) { + len = 10; /* 4 hdr + 4 addr + 2 trailer */ command[3] = 1; /* IPv4 */ - } else { - len = 22; + sk_addrcopy(p->remote_addr, command+4); + } else if (type == ADDRTYPE_IPV6) { + len = 22; /* 4 hdr + 16 addr + 2 trailer */ command[3] = 4; /* IPv6 */ + sk_addrcopy(p->remote_addr, command+4); + } else if (type == ADDRTYPE_NAME) { + command[3] = 3; + sk_getaddr(p->remote_addr, command+5, 256); + command[4] = strlen(command+5); + len = 7 + command[4]; /* 4 hdr, 1 len, N addr, 2 trailer */ } command[0] = 5; /* version 5 */ command[1] = 1; /* CONNECT command */ command[2] = 0x00; - /* address */ - sk_addrcopy(p->remote_addr, command+4); - /* port */ command[len-2] = (char) (p->remote_port >> 8) & 0xff; command[len-1] = (char) p->remote_port & 0xff; @@ -1069,7 +1153,7 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change) int so = 0, eo = 0; /* we need to escape \\, \%, \r, \n, \t, \x??, \0???, - * %%, %host, and %port + * %%, %host, %port, %user, and %pass */ while (cfg.proxy_telnet_command[eo] != 0) { @@ -1177,27 +1261,40 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change) } } else { - /* % escape. we recognize %%, %host, %port. anything else, - * we just send unescaped (including the %). */ + /* % escape. we recognize %%, %host, %port, %user, %pass. + * anything else, we just send unescaped (including the %). + */ if (cfg.proxy_telnet_command[eo] == '%') { sk_write(p->sub_socket, "%", 1); eo++; - } + } else if (strnicmp(cfg.proxy_telnet_command + eo, "host", 4) == 0) { - char dest[64]; - sk_getaddr(p->remote_addr, dest, 64); + char dest[512]; + sk_getaddr(p->remote_addr, dest, lenof(dest)); sk_write(p->sub_socket, dest, strlen(dest)); eo += 4; - } + } else if (strnicmp(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(cfg.proxy_telnet_command + eo, + "user", 4) == 0) { + sk_write(p->sub_socket, cfg.proxy_username, + strlen(cfg.proxy_username)); + eo += 4; + } + else if (strnicmp(cfg.proxy_telnet_command + eo, + "pass", 4) == 0) { + sk_write(p->sub_socket, cfg.proxy_password, + strlen(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