mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: httpclient: segfault when the httpclient parser fails

Browse Source 
If the uri is unexpected ("/" in place of "http://xxx/"), some parsing
function fails. The failure is not handled.

This patch handle these errors. Note: the return code is boolean, maybe
we can return more precise error for Lua reporting ?

Must be backported in 2.6.
This commit is contained in:
Thierry Fournier 2022-10-10 12:46:38 +02:00 committed by William Lallemand
parent 47ddc89879
commit 74a9eb5216
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http_client.c
View File

@ -476,10 +476,10 @@ int httpclient_set_dst(struct httpclient *hc, const char *dst)
}
/*
* Return a split URL in <scheme>, <host>, <port>
* Split <url> in <scheme>, <host>, <port>
*/
static void httpclient_spliturl(struct ist url, enum http_scheme *scheme,
struct ist *host, int *port)
static int httpclient_spliturl(struct ist url, enum http_scheme *scheme,
struct ist *host, int *port)
{
enum http_scheme scheme_tmp = SCH_HTTP;
int port_tmp = 0;
@ -489,6 +489,9 @@ static void httpclient_spliturl(struct ist url, enum http_scheme *scheme,
parser = http_uri_parser_init(url);
scheme_ist = http_parse_scheme(&parser);
if (!isttest(scheme_ist)) {
return 0;
}
if (isteqi(scheme_ist, ist("http://"))){
scheme_tmp = SCH_HTTP;
@ -499,6 +502,9 @@ static void httpclient_spliturl(struct ist url, enum http_scheme *scheme,
}
authority_ist = http_parse_authority(&parser, 1);
if (!isttest(authority_ist)) {
return 0;
}
p = end = istend(authority_ist);
/* look for a port at the end of the authority */
@ -521,6 +527,7 @@ static void httpclient_spliturl(struct ist url, enum http_scheme *scheme,
if (port)
*port = port_tmp;
return 1;
}
/*
@ -1006,7 +1013,8 @@ static int httpclient_applet_init(struct appctx *appctx)
/* parse the URL and */
httpclient_spliturl(hc->req.url, &scheme, &host, &port);
if (!httpclient_spliturl(hc->req.url, &scheme, &host, &port))
goto out_error;
if (hc->dst) {
/* if httpclient_set_dst() was used, sets the alternative address */