X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2192a8e4edbdda53506406fca893fe7ca175f716..57356d6317f6f33dd622711d305c4579df63b269:/proxy.c diff --git a/proxy.c b/proxy.c index 2d32d880..a02fc11c 100644 --- a/proxy.c +++ b/proxy.c @@ -5,9 +5,9 @@ * code and the higher level backend. */ -#include - #include +#include +#include #define DEFINE_PLUG_METHOD_MACROS #include "putty.h" @@ -22,43 +22,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 +142,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); } @@ -281,7 +312,7 @@ 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 +324,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, @@ -314,13 +345,18 @@ Socket new_connection(SockAddr addr, char *hostname, ret->remote_addr = addr; ret->remote_port = port; + ret->error = NULL; + ret->pending_flush = 0; + ret->freeze = 0; + bufchain_init(&ret->pending_input_data); bufchain_init(&ret->pending_output_data); bufchain_init(&ret->pending_oob_output_data); 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) { @@ -423,13 +459,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[64]; sk_getaddr(p->remote_addr, dest, 64); - 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)]; @@ -520,14 +557,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; } @@ -603,14 +640,14 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change) int length; char * command; - if (sk_addrtype(p->remote_addr) != AF_INET) { + if (sk_addrtype(p->remote_addr) != ADDRTYPE_IPV4) { plug_closing(p->plug, "Proxy error: SOCKS version 4 does" " not support IPv6", PROXY_ERROR_GENERAL, 0); return 1; } length = strlen(cfg.proxy_username) + 9; - command = (char*) malloc(length); + command = (char*) smalloc(length); strcpy(command + 8, cfg.proxy_username); command[0] = 4; /* version 4 */ @@ -624,7 +661,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change) sk_addrcopy(p->remote_addr, command + 4); sk_write(p->sub_socket, command, length); - free(command); + sfree(command); p->state = 1; return 0; @@ -893,7 +930,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) char command[22]; int len; - if (sk_addrtype(p->remote_addr) == AF_INET) { + if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV6) { len = 10; command[3] = 1; /* IPv4 */ } else { @@ -1063,7 +1100,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) { @@ -1171,27 +1208,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); 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