mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-26 16:21:22 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: proto_htx: Fix functions applying regex filters on HTX messages

Browse Source 
The HTX functions htx_apply_filter_to_req_headers() and
htx_apply_filter_to_resp_headers() contain 2 bugs. The first one is about the
matching on each header. The chunk 'hdr' used to format a full header line was
never reset. The second bug appears when we try to replace or remove a
header. The variable ctx was not fully initialized, leading to sefaults.

This patch must be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-02-26 15:36:05 +01:00
parent 7402776c52
commit 02e771a9e0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proto_htx.c
View File

@ -3502,7 +3502,7 @@ static int htx_apply_filter_to_req_headers(struct stream *s, struct channel *req
n = htx_get_blk_name(htx, blk); n = htx_get_blk_name(htx, blk);
v = htx_get_blk_value(htx, blk); v = htx_get_blk_value(htx, blk);
chunk_memcat(hdr, n.ptr, n.len); chunk_memcpy(hdr, n.ptr, n.len);
hdr->area[hdr->data++] = ':'; hdr->area[hdr->data++] = ':';
hdr->area[hdr->data++] = ' '; hdr->area[hdr->data++] = ' ';
chunk_memcat(hdr, v.ptr, v.len); chunk_memcat(hdr, v.ptr, v.len);
@ -3534,6 +3534,7 @@ static int htx_apply_filter_to_req_headers(struct stream *s, struct channel *req
http_parse_header(ist2(trash.area, len), &n, &v); http_parse_header(ist2(trash.area, len), &n, &v);
ctx.blk = blk; ctx.blk = blk;
ctx.value = v; ctx.value = v;
ctx.lws_before = ctx.lws_after = 0;
if (!http_replace_header(htx, &ctx, n, v)) if (!http_replace_header(htx, &ctx, n, v))
return -1; return -1;
if (!ctx.blk) if (!ctx.blk)
@ -3544,6 +3545,7 @@ static int htx_apply_filter_to_req_headers(struct stream *s, struct channel *req
case ACT_REMOVE: case ACT_REMOVE:
ctx.blk = blk; ctx.blk = blk;
ctx.value = v; ctx.value = v;
ctx.lws_before = ctx.lws_after = 0;
if (!http_remove_header(htx, &ctx)) if (!http_remove_header(htx, &ctx))
return -1; return -1;
if (!ctx.blk) if (!ctx.blk)
@ -3717,7 +3719,7 @@ static int htx_apply_filter_to_resp_headers(struct stream *s, struct channel *re
n = htx_get_blk_name(htx, blk); n = htx_get_blk_name(htx, blk);
v = htx_get_blk_value(htx, blk); v = htx_get_blk_value(htx, blk);
chunk_memcat(hdr, n.ptr, n.len); chunk_memcpy(hdr, n.ptr, n.len);
hdr->area[hdr->data++] = ':'; hdr->area[hdr->data++] = ':';
hdr->area[hdr->data++] = ' '; hdr->area[hdr->data++] = ' ';
chunk_memcat(hdr, v.ptr, v.len); chunk_memcat(hdr, v.ptr, v.len);
@ -3747,6 +3749,7 @@ static int htx_apply_filter_to_resp_headers(struct stream *s, struct channel *re
http_parse_header(ist2(trash.area, len), &n, &v); http_parse_header(ist2(trash.area, len), &n, &v);
ctx.blk = blk; ctx.blk = blk;
ctx.value = v; ctx.value = v;
ctx.lws_before = ctx.lws_after = 0;
if (!http_replace_header(htx, &ctx, n, v)) if (!http_replace_header(htx, &ctx, n, v))
return -1; return -1;
if (!ctx.blk) if (!ctx.blk)
@ -3757,6 +3760,7 @@ static int htx_apply_filter_to_resp_headers(struct stream *s, struct channel *re
case ACT_REMOVE: case ACT_REMOVE:
ctx.blk = blk; ctx.blk = blk;
ctx.value = v; ctx.value = v;
ctx.lws_before = ctx.lws_after = 0;
if (!http_remove_header(htx, &ctx)) if (!http_remove_header(htx, &ctx))
return -1; return -1;
if (!ctx.blk) if (!ctx.blk)