RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-20 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: http-conv: Fix url_enc() to not crush const samples

Browse Source 
url_enc() encodes an input string by calling encode_string(). To do so, it
adds a trailing '\0' to the sample string. However it never restores the
sample string at the end. It is a problem for const samples. The sample
string may be in the middle of a buffer. For instance, the HTTP headers
values are concerned.

However, instead of modifying the sample string, it is easier to rely on
encode_chunk() function. It does the same but on a buffer.

This patch must be backported as far as 2.2.
This commit is contained in:
Christopher Faulet 2022-04-08 10:04:05 +02:00
parent dca3b5b2c6
commit 21ac0eec28
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http_conv.c
View File

@ -324,16 +324,13 @@ static int sample_conv_url_enc(const struct arg *args, struct sample *smp, void
enc_type = ENC_QUERY;
enc_type = args->data.sint;
/* Add final \0 required by encode_string() */
smp->data.u.str.area[smp->data.u.str.data] = '\0';
if (enc_type == ENC_QUERY)
encode_map = query_encode_map;
else
return 0;
ret = encode_string(trash->area, trash->area + trash->size, '%',
encode_map, smp->data.u.str.area);
ret = encode_chunk(trash->area, trash->area + trash->size, '%',
encode_map, &smp->data.u.str);
if (ret == NULL || *ret != '\0')
return 0;
trash->data = ret - trash->area;