X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=58f1a5a37a6d2f0547dd288368204c9941ba1a99;hp=c80e91a78c7c98441cbfcc9dca204be9ed036d21;hb=3ae8d3e7c9377291ce4f65a8578729e07a61dd36;hpb=6977919118a2eed09564e47947db19751677f42d diff --git a/jcc.c b/jcc.c index c80e91a7..58f1a5a3 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.203 2008/11/06 18:34:35 fabiankeil Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.215 2008/12/24 17:06:19 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,57 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.203 2008/11/06 18:34:35 fabiankeil Exp $" * * Revisions : * $Log: jcc.c,v $ + * Revision 1.215 2008/12/24 17:06:19 fabiankeil + * Keep a thread around to timeout alive connections + * even if no new requests are coming in. + * + * Revision 1.214 2008/12/20 14:53:55 fabiankeil + * Add config option socket-timeout to control the time + * Privoxy waits for data to arrive on a socket. Useful + * in case of stale ssh tunnels or when fuzz-testing. + * + * Revision 1.213 2008/12/15 18:45:51 fabiankeil + * When logging crunches, log the whole URL, so one can easily + * differentiate between vanilla HTTP and CONNECT requests. + * + * Revision 1.212 2008/12/14 15:46:22 fabiankeil + * Give crunched requests their own log level. + * + * Revision 1.211 2008/12/06 10:05:03 fabiankeil + * Downgrade "Received x bytes while expecting y." message to + * LOG_LEVEL_CONNECT as it doesn't necessarily indicate an error. + * + * Revision 1.210 2008/12/02 22:03:18 fabiankeil + * Don't miscalculate byte_count if we don't get all the + * server headers with one read_socket() call. With keep-alive + * support enabled, this caused delays until the server closed + * the connection. + * + * Revision 1.209 2008/11/27 09:44:04 fabiankeil + * Cosmetics for the last commit: Don't watch out for + * the last chunk if the content isn't chunk-encoded or + * if we already determined the content length previously. + * + * Revision 1.208 2008/11/26 18:24:17 fabiankeil + * Recognize that the server response is complete if the + * last chunk is read together with the server headers. + * Reported by Lee. + * + * Revision 1.207 2008/11/25 17:25:16 fabiankeil + * Don't convert the client-header list to text until we need to. + * + * Revision 1.206 2008/11/23 17:00:11 fabiankeil + * Some more chat() cosmetics. + * + * Revision 1.205 2008/11/16 12:43:49 fabiankeil + * Turn keep-alive support into a runtime feature + * that is disabled by setting keep-alive-timeout + * to a negative value. + * + * Revision 1.204 2008/11/06 19:42:17 fabiankeil + * Fix last-chunk detection hack to also apply + * if buf[] contains nothing but the last-chunk. + * * Revision 1.203 2008/11/06 18:34:35 fabiankeil * Factor receive_client_request() and * parse_client_request() out of chat(). @@ -1786,8 +1837,7 @@ static void send_crunch_response(const struct client_state *csp, struct http_res } /* Log that the request was crunched and why. */ - log_error(LOG_LEVEL_GPC, "%s%s crunch! (%s)", - http->hostport, http->path, crunch_reason(rsp)); + log_error(LOG_LEVEL_CRUNCH, "%s: %s", crunch_reason(rsp), http->url); log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" %s %d", csp->ip_addr_str, http->ocmd, status_code, rsp->content_length); @@ -2124,6 +2174,13 @@ static char *get_request_line(struct client_state *csp) do { + if (!data_is_available(csp->cfd, csp->config->socket_timeout)) + { + log_error(LOG_LEVEL_ERROR, + "Stopped waiting for the request line."); + return '\0'; + } + len = read_socket(csp->cfd, buf, sizeof(buf) - 1); if (len <= 0) return NULL; @@ -2256,6 +2313,13 @@ static jb_err receive_client_request(struct client_state *csp) * We didn't receive a complete header * line yet, get the rest of it. */ + if (!data_is_available(csp->cfd, csp->config->socket_timeout)) + { + log_error(LOG_LEVEL_ERROR, + "Stopped grabbing the client headers."); + return JB_ERR_PARSE; + } + len = read_socket(csp->cfd, buf, sizeof(buf) - 1); if (len <= 0) { @@ -2430,15 +2494,18 @@ static void chat(struct client_state *csp) int max_forwarded_connect_retries = csp->config->forwarded_connect_retries; const struct forward_spec *fwd; struct http_request *http; - int len; /* for buffer sizes (and negative error codes) */ + int len = 0; /* for buffer sizes (and negative error codes) */ /* Function that does the content filtering for the current request */ filter_function_ptr content_filter = NULL; /* Skeleton for HTTP response, if we should intercept the request */ struct http_response *rsp; + struct timeval timeout; memset(buf, 0, sizeof(buf)); + memset(&timeout, 0, sizeof(timeout)); + timeout.tv_sec = csp->config->socket_timeout; http = csp->http; @@ -2514,13 +2581,6 @@ static void chat(struct client_state *csp) build_request_line(csp, fwd, &csp->headers->first->str); } - hdr = list_to_text(csp->headers); - if (hdr == NULL) - { - /* FIXME Should handle error properly */ - log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header"); - } - /* * We have a request. Check if one of the crunchers wants it. */ @@ -2530,28 +2590,18 @@ static void chat(struct client_state *csp) * Yes. The client got the crunch response * and we are done here after cleaning up. */ - freez(hdr); + /* XXX: why list_remove_all()? */ list_remove_all(csp->headers); return; } - /* - * The headers can't be removed earlier because - * they were still needed for the referrer check - * in case of CGI crunches. - * - * XXX: Would it be worth to move the referrer check - * into client_referrer() and set a flag if it's trusted? - */ - list_remove_all(csp->headers); - log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path); if (fwd->forward_host) { log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s", - fwd->forward_host, fwd->forward_port, http->hostport); + fwd->forward_host, fwd->forward_port, http->hostport); } else { @@ -2560,11 +2610,13 @@ static void chat(struct client_state *csp) /* here we connect to the server, gateway, or the forwarder */ - while ( (csp->sfd = forwarded_connect(fwd, http, csp)) - && (errno == EINVAL) && (forwarded_connect_retries++ < max_forwarded_connect_retries)) + while ((csp->sfd = forwarded_connect(fwd, http, csp)) + && (errno == EINVAL) + && (forwarded_connect_retries++ < max_forwarded_connect_retries)) { - log_error(LOG_LEVEL_ERROR, "failed request #%u to connect to %s. Trying again.", - forwarded_connect_retries, http->hostport); + log_error(LOG_LEVEL_ERROR, + "failed request #%u to connect to %s. Trying again.", + forwarded_connect_retries, http->hostport); } if (csp->sfd == JB_INVALID_SOCKET) @@ -2582,7 +2634,7 @@ static void chat(struct client_state *csp) { rsp = error_response(csp, "connect-failed", errno); log_error(LOG_LEVEL_CONNECT, "connect to: %s failed: %E", - http->hostport); + http->hostport); } /* Write the answer to the client */ @@ -2591,10 +2643,17 @@ static void chat(struct client_state *csp) send_crunch_response(csp, rsp); } - freez(hdr); return; } + hdr = list_to_text(csp->headers); + if (hdr == NULL) + { + /* FIXME Should handle error properly */ + log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header"); + } + list_remove_all(csp->headers); + if (fwd->forward_host || (http->ssl == 0)) { /* @@ -2660,6 +2719,18 @@ static void chat(struct client_state *csp) FD_SET(csp->sfd, &rfds); #ifdef FEATURE_CONNECTION_KEEP_ALIVE + if ((csp->flags & CSP_FLAG_CHUNKED) + && !(csp->flags & CSP_FLAG_CONTENT_LENGTH_SET) + && ((csp->iob->eod - csp->iob->cur) >= 5) + && !memcmp(csp->iob->eod-5, "0\r\n\r\n", 5)) + { + log_error(LOG_LEVEL_CONNECT, + "Looks like we read the last chunk together with " + "the server headers. We better stop reading."); + byte_count = (size_t)(csp->iob->eod - csp->iob->cur); + csp->expected_content_length = byte_count; + csp->flags |= CSP_FLAG_CONTENT_LENGTH_SET; + } if (server_body && server_response_is_complete(csp, byte_count)) { log_error(LOG_LEVEL_CONNECT, @@ -2675,9 +2746,15 @@ static void chat(struct client_state *csp) } #endif /* FEATURE_CONNECTION_KEEP_ALIVE */ - n = select((int)maxfd+1, &rfds, NULL, NULL, NULL); + n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout); - if (n < 0) + if (n == 0) + { + log_error(LOG_LEVEL_ERROR, "Didn't receive data in time."); + mark_server_socket_tainted(csp); + return; + } + else if (n < 0) { log_error(LOG_LEVEL_ERROR, "select() failed!: %E"); mark_server_socket_tainted(csp); @@ -2976,6 +3053,12 @@ static void chat(struct client_state *csp) * Since we have to wait for more from the server before * we can parse the headers we just continue here. */ + int header_offset = csp->iob->cur - header_start; + assert(csp->iob->cur >= header_start); + byte_count += (size_t)(len - header_offset); + log_error(LOG_LEVEL_CONNECT, "Continuing buffering headers. " + "byte_count: %d. header_offset: %d. len: %d.", + byte_count, header_offset, len); continue; } } @@ -3122,7 +3205,7 @@ static void chat(struct client_state *csp) if ((csp->flags & CSP_FLAG_CONTENT_LENGTH_SET) && (csp->expected_content_length != byte_count)) { - log_error(LOG_LEVEL_ERROR, + log_error(LOG_LEVEL_CONNECT, "Received %d bytes while expecting %d.", byte_count, csp->expected_content_length); mark_server_socket_tainted(csp); @@ -3133,6 +3216,34 @@ static void chat(struct client_state *csp) } +/********************************************************************* + * + * Function : wait_for_alive_connections + * + * Description : Waits for alive connections to timeout. + * + * Parameters : N/A + * + * Returns : N/A + * + *********************************************************************/ +static void wait_for_alive_connections() +{ + int connections_alive = close_unusable_connections(); + + while (0 < connections_alive) + { + log_error(LOG_LEVEL_CONNECT, + "Waiting for %d connections to timeout.", + connections_alive); + sleep(60); + connections_alive = close_unusable_connections(); + } + + log_error(LOG_LEVEL_CONNECT, "No connections to wait for left."); + +} + /********************************************************************* * * Function : serve @@ -3158,9 +3269,22 @@ static void serve(struct client_state *csp) if (csp->sfd != JB_INVALID_SOCKET) { #ifdef FEATURE_CONNECTION_KEEP_ALIVE - if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)) + static int monitor_thread_running = 0; + + if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE) + && (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)) { remember_connection(csp->sfd, csp->http, forward_url(csp, csp->http)); + privoxy_mutex_lock(&connection_reuse_mutex); + if (!monitor_thread_running) + { + monitor_thread_running = 1; + privoxy_mutex_unlock(&connection_reuse_mutex); + wait_for_alive_connections(); + privoxy_mutex_lock(&connection_reuse_mutex); + monitor_thread_running = 0; + } + privoxy_mutex_unlock(&connection_reuse_mutex); } else {