mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-06 15:41:36 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: http-htx: Fix scheme based normalization for URIs wih userinfo

Browse Source 
The scheme based normalization is not properly handled the URI's userinfo,
if any. First, the authority parser is not called with "no_userinfo"
parameter set. Then it is skipped from the URI normalization.

This patch must be backported as far as 2.4.
This commit is contained in:
Christopher Faulet 2022-07-06 17:41:31 +02:00
parent 1d93217a05
commit 0eab050b04
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http_htx.c
View File

@ -1783,7 +1783,7 @@ int http_scheme_based_normalize(struct htx *htx)
if (istlen(port) && uri_is_default_port(scheme, port)) {
/* reconstruct the uri with removal of the port */
struct buffer *temp = get_trash_chunk();
struct ist meth, vsn, path;
struct ist meth, vsn;
/* meth */
chunk_memcat(temp, HTX_SL_REQ_MPTR(sl), HTX_SL_REQ_MLEN(sl));
@ -1794,12 +1794,10 @@ int http_scheme_based_normalize(struct htx *htx)
vsn = ist2(temp->area + meth.len, HTX_SL_REQ_VLEN(sl));
/* reconstruct uri without port */
path = http_parse_path(&parser);
chunk_istcat(temp, scheme);
chunk_memcat(temp, uri.ptr, authority.ptr - uri.ptr);
chunk_istcat(temp, host);
chunk_istcat(temp, path);
uri = ist2(temp->area + meth.len + vsn.len,
scheme.len + host.len + path.len);
chunk_memcat(temp, istend(authority), istend(uri) - istend(authority));
uri = ist2(temp->area + meth.len + vsn.len, host.len + uri.len - authority.len); /* uri */
http_replace_stline(htx, meth, uri, vsn);