X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d9d006d5c2265a2e7f177c776c5edb51f21cbc80..e693a2d9c8385b9177a24e28ab63701973975919:/proxy.c diff --git a/proxy.c b/proxy.c index d970b2bf..5baab7a8 100644 --- a/proxy.c +++ b/proxy.c @@ -342,7 +342,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port, } SockAddr name_lookup(char *host, int port, char **canonicalname, - const Config *cfg) + const Config *cfg, int addressfamily) { if (cfg->proxy_type != PROXY_NONE && do_proxy_dns(cfg) && @@ -351,13 +351,13 @@ SockAddr name_lookup(char *host, int port, char **canonicalname, return sk_nonamelookup(host); } - return sk_namelookup(host, canonicalname); + return sk_namelookup(host, canonicalname, addressfamily); } Socket new_connection(SockAddr addr, char *hostname, int port, int privport, - int oobinline, int nodelay, Plug plug, - const Config *cfg) + int oobinline, int nodelay, int keepalive, + Plug plug, const Config *cfg) { static const struct socket_function_table socket_fn_table = { sk_proxy_plug, @@ -388,7 +388,8 @@ Socket new_connection(SockAddr addr, char *hostname, Socket sret; if ((sret = platform_new_connection(addr, hostname, port, privport, - oobinline, nodelay, plug, cfg)) != + oobinline, nodelay, keepalive, + plug, cfg)) != NULL) return sret; @@ -432,7 +433,7 @@ Socket new_connection(SockAddr addr, char *hostname, /* look-up proxy */ proxy_addr = sk_namelookup(cfg->proxy_host, - &proxy_canonical_name); + &proxy_canonical_name, cfg->addressfamily); if (sk_addr_error(proxy_addr) != NULL) { ret->error = "Proxy error: Unable to resolve proxy host name"; return (Socket)ret; @@ -444,7 +445,7 @@ Socket new_connection(SockAddr addr, char *hostname, */ ret->sub_socket = sk_new(proxy_addr, cfg->proxy_port, privport, oobinline, - nodelay, (Plug) pplug); + nodelay, keepalive, (Plug) pplug); if (sk_socket_error(ret->sub_socket) != NULL) return (Socket) ret; @@ -456,17 +457,17 @@ Socket new_connection(SockAddr addr, char *hostname, } /* no proxy, so just return the direct socket */ - return sk_new(addr, port, privport, oobinline, nodelay, plug); + return sk_new(addr, port, privport, oobinline, nodelay, keepalive, plug); } Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only, - const Config *cfg) + const Config *cfg, int addressfamily) { /* TODO: SOCKS (and potentially others) support inbound * TODO: connections via the proxy. support them. */ - return sk_newlistener(srcaddr, port, plug, local_host_only); + return sk_newlistener(srcaddr, port, plug, local_host_only, addressfamily); } /* ---------------------------------------------------------------------- @@ -590,8 +591,14 @@ 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 = snewn(len, char); + data = snewn(len+1, char); bufchain_fetch(&p->pending_input_data, data, len); + /* + * We must NUL-terminate this data, because Windows + * sscanf appears to require a NUL at the end of the + * string because it strlens it _first_. Sigh. + */ + data[len] = '\0'; eol = get_line_end(data, len); if (eol < 0) { @@ -852,15 +859,16 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) * 0x03 = CHAP */ - char command[4]; + char command[5]; int len; command[0] = 5; /* version 5 */ if (p->cfg.proxy_username[0] || p->cfg.proxy_password[0]) { - command[1] = 2; /* two methods supported: */ command[2] = 0x00; /* no authentication */ - command[3] = 0x02; /* username/password */ - len = 4; + len = 3; + proxy_socks5_offerencryptedauth (command, &len); + command[len++] = 0x02; /* username/password */ + command[1] = len - 2; /* Number of methods supported */ } else { command[1] = 1; /* one methods supported: */ command[2] = 0x00; /* no authentication */ @@ -916,7 +924,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) * authentication methods: * 0x00 = no authentication * 0x01 = GSSAPI - * 0x02 = username/password + * 0x02 = username/password * 0x03 = CHAP * 0xff = no acceptable methods */ @@ -981,6 +989,12 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) p->state = 2; /* now proceed as authenticated */ } + if (p->state == 8) { + int ret; + ret = proxy_socks5_handlechap(p); + if (ret) return ret; + } + if (p->state == 2) { /* request format: @@ -1149,10 +1163,9 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) } if (p->state == 6) { - /* TODO: Handle CHAP authentication */ - plug_closing(p->plug, "Proxy error: We don't support CHAP authentication", - PROXY_ERROR_GENERAL, 0); - return 1; + int ret; + ret = proxy_socks5_selectchap(p); + if (ret) return ret; } } @@ -1302,7 +1315,8 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg) } else { /* % escape. we recognize %%, %host, %port, %user, %pass. - * anything else, we just send unescaped (including the %). + * %proxyhost, %proxyport. Anything else we just send + * unescaped (including the %). */ if (cfg->proxy_telnet_command[eo] == '%') { @@ -1346,6 +1360,25 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg) retlen += passlen; eo += 4; } + else if (strnicmp(cfg->proxy_telnet_command + eo, + "proxyhost", 4) == 0) { + int phlen = strlen(cfg->proxy_host); + ENSURE(phlen); + memcpy(ret+retlen, cfg->proxy_host, phlen); + retlen += phlen; + eo += 9; + } + else if (strnicmp(cfg->proxy_telnet_command + eo, + "proxyport", 4) == 0) { + char pport[50]; + int pplen; + sprintf(pport, "%d", cfg->proxy_port); + pplen = strlen(cfg->proxy_host); + ENSURE(pplen); + memcpy(ret+retlen, pport, pplen); + retlen += pplen; + eo += 9; + } else { /* we don't escape this, so send the % now, and * don't advance eo, so that we'll consider the