You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/07/14 07:19:17 UTC
svn commit: r218988 -
/httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c
Author: wrowe
Date: Wed Jul 13 22:19:15 2005
New Revision: 218988
URL: http://svn.apache.org/viewcvs?rev=218988&view=rev
Log:
Close HTTP response splitting issues in Apache 1.3 - much simpler
than the fix for httpd-2.x as we don't support chunked request
bodies.
Reviewed by: JimJag
Modified:
httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c
Modified: httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c?rev=218988&r1=218987&r2=218988&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c (original)
+++ httpd/httpd/branches/1.3.x/src/modules/proxy/proxy_http.c Wed Jul 13 22:19:15 2005
@@ -121,7 +121,7 @@
char portstr[32];
pool *p = r->pool;
int destport = 0;
- int chunked = 0;
+ const char *chunked = NULL;
char *destportstr = NULL;
const char *urlptr = NULL;
const char *datestr, *urlstr;
@@ -338,7 +338,12 @@
ap_table_mergen(req_hdrs, "X-Forwarded-Server", r->server->server_hostname);
}
- /* we don't yet support keepalives - but we will soon, I promise! */
+ /* we don't yet support keepalives - but we will soon, I promise!
+ * XXX: This introduces various HTTP Request vulnerabilies if not
+ * properly implemented. Before changing this .. be certain to
+ * add a hard-close of the connection if the T-E and C-L headers
+ * are both present, or the C-L header is malformed.
+ */
ap_table_set(req_hdrs, "Connection", "close");
reqhdrs_arr = ap_table_elts(req_hdrs);
@@ -475,25 +480,40 @@
}
/* is this content chunked? */
- chunked = ap_find_last_token(r->pool,
- ap_table_get(resp_hdrs, "Transfer-Encoding"),
- "chunked");
+ chunked = ap_table_get(resp_hdrs, "Transfer-Encoding");
+ if (chunked && (strcasecmp(chunked, "chunked") != 0)) {
+ ap_kill_timeout(r);
+ return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool,
+ "Unsupported Transfer-Encoding ", chunked,
+ " from remote server", NULL));
+ }
/* strip hop-by-hop headers defined by Connection and RFC2616 */
ap_proxy_clear_connection(p, resp_hdrs);
content_length = ap_table_get(resp_hdrs, "Content-Length");
if (content_length != NULL) {
- c->len = ap_strtol(content_length, NULL, 10);
-
- if (c->len < 0) {
- ap_kill_timeout(r);
- return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool,
- "Invalid Content-Length from remote server",
- NULL));
+ if (chunked) {
+ /* XXX: We would unset keep-alive here, to the proxy
+ * origin server, for safety's sake but we aren't using
+ * keep-alives (we force Connection: close above)
+ */
+ nocache = 1; /* do not cache this suspect file */
+ ap_table_unset(resp_hdrs, "Content-Length");
+ }
+ else {
+ char *len_end;
+ errno = 0;
+ c->len = ap_strtol(content_length, &len_end, 10);
+
+ if (errno || (c->len < 0) || (len_end && *len_end)) {
+ ap_kill_timeout(r);
+ return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+ "Invalid Content-Length from remote"
+ " server");
+ }
}
}
-
}
else {
/* an http/0.9 response */
@@ -612,7 +632,8 @@
* content length is not known. We need to make 100% sure c->len is always
* set correctly before we get here to correctly do keepalive.
*/
- ap_proxy_send_fb(f, r, c, c->len, 0, chunked, conf->io_buffer_size);
+ ap_proxy_send_fb(f, r, c, c->len, 0, chunked != NULL,
+ conf->io_buffer_size);
}
/* ap_proxy_send_fb() closes the socket f for us */