RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 21:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: http: unbreak uri/header/url_param hashing

Browse Source 
Vedran Furac reported that "balance uri" doesn't work anymore in recent
1.7-dev versions. Dragan Dosen found that the first faulty commit was
dbe34eb ("MEDIUM: filters/http: Move body parsing of HTTP messages in
dedicated functions"), merged in 1.7-dev2.

After this patch, the hashing is performed on uninitialized data,
indicating that the buffer is not correctly rewound. In fact, all forms
of content-based hashing are broken since the commit above. Upon code
inspection, it appears that the new functions http_msg_forward_chunked_body()
and http_msg_forward_body() forget to rewind the buffer in the success
case, when the parser changes to state HTTP_MSG_DONE. The rewinding code
was reinserted in both functions and the fix was confirmed by two test,
with and without chunking.

No backport it needed.
This commit is contained in:
Willy Tarreau 2016-06-28 11:52:08 +02:00
parent 08d35deada
commit 9962f8fc44
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proto_http.c
View File

@ -6853,6 +6853,9 @@ http_msg_forward_body(struct stream *s, struct http_msg *msg)
if (msg->next) if (msg->next)
goto waiting; goto waiting;
if (unlikely(!(chn->flags & CF_WROTE_DATA) || msg->sov > 0))
msg->sov -= ret;
FLT_STRM_DATA_CB(s, chn, flt_http_end(s, msg), FLT_STRM_DATA_CB(s, chn, flt_http_end(s, msg),
/* default_ret */ 1, /* default_ret */ 1,
/* on_error */ goto error, /* on_error */ goto error,
@ -6968,6 +6971,9 @@ http_msg_forward_chunked_body(struct stream *s, struct http_msg *msg)
if (msg->next) if (msg->next)
goto waiting; goto waiting;
if (unlikely(!(chn->flags & CF_WROTE_DATA) || msg->sov > 0))
msg->sov -= ret;
FLT_STRM_DATA_CB(s, chn, flt_http_end(s, msg), FLT_STRM_DATA_CB(s, chn, flt_http_end(s, msg),
/* default_ret */ 1, /* default_ret */ 1,
/* on_error */ goto error, /* on_error */ goto error,