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

MINOR: http-fetch: Add pathq sample fetch

Browse Source 
The pathq sample fetch extract the relative URI of a request, i.e the path with
the query-string, excluding the scheme and the authority, if any. It is pretty
handy to always get a relative URI independently on the HTTP version. Indeed,
while relative URIs are common in HTTP/1.1, in HTTP/2, most of time clients use
absolute URIs.

This patch may be backported to 2.2.
This commit is contained in:
Christopher Faulet 2020-09-02 17:25:18 +02:00
parent 312294f53d
commit e720c32b78
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/configuration.txt
View File

@ -18116,6 +18116,14 @@ path : string
path_reg : regex match path_reg : regex match
path_sub : substring match path_sub : substring match
pathq : string
This extracts the request's URL path with the query-string, which starts at
the first slash. This sample fetch is pretty handy to always retrieve a
relative URI, excluding the scheme and the authority part, if any. Indeed,
while it is the common representation for an HTTP/1.1 request target, in
HTTP/2, an absolute URI is often used. This sample fetch will return the same
result in both cases.
query : string query : string
This extracts the request's query string, which starts after the first This extracts the request's query string, which starts after the first
question mark. If no question mark is present, this fetch returns nothing. If question mark. If no question mark is present, this fetch returns nothing. If

14
src/http_fetch.c
View File

@ -1025,8 +1025,9 @@ static int smp_fetch_hdr_ip(const struct arg *args, struct sample *smp, const ch
return ret; return ret;
} }
/* 8. Check on URI PATH. A pointer to the PATH is stored. The path starts at /* 8. Check on URI PATH. A pointer to the PATH is stored. The path starts at the
* the first '/' after the possible hostname, and ends before the possible '?'. * first '/' after the possible hostname. It ends before the possible '?' except
* for 'pathq' keyword.
*/ */
static int smp_fetch_path(const struct arg *args, struct sample *smp, const char *kw, void *private) static int smp_fetch_path(const struct arg *args, struct sample *smp, const char *kw, void *private)
{ {
@ -1039,7 +1040,13 @@ static int smp_fetch_path(const struct arg *args, struct sample *smp, const char
return 0; return 0;
sl = http_get_stline(htx); sl = http_get_stline(htx);
path = iststop(http_get_path(htx_sl_req_uri(sl)), '?'); path = http_get_path(htx_sl_req_uri(sl));
if (kw[0] == 'p' && kw[4] == 'q') // pathq
path = http_get_path(htx_sl_req_uri(sl));
else
path = iststop(http_get_path(htx_sl_req_uri(sl)), '?');
if (!isttest(path)) if (!isttest(path))
return 0; return 0;
@ -2071,6 +2078,7 @@ static struct sample_fetch_kw_list sample_fetch_keywords = {ILH, {
{ "http_first_req", smp_fetch_http_first_req, 0, NULL, SMP_T_BOOL, SMP_USE_HRQHP }, { "http_first_req", smp_fetch_http_first_req, 0, NULL, SMP_T_BOOL, SMP_USE_HRQHP },
{ "method", smp_fetch_meth, 0, NULL, SMP_T_METH, SMP_USE_HRQHP }, { "method", smp_fetch_meth, 0, NULL, SMP_T_METH, SMP_USE_HRQHP },
{ "path", smp_fetch_path, 0, NULL, SMP_T_STR, SMP_USE_HRQHV }, { "path", smp_fetch_path, 0, NULL, SMP_T_STR, SMP_USE_HRQHV },
{ "pathq", smp_fetch_path, 0, NULL, SMP_T_STR, SMP_USE_HRQHV },
{ "query", smp_fetch_query, 0, NULL, SMP_T_STR, SMP_USE_HRQHV }, { "query", smp_fetch_query, 0, NULL, SMP_T_STR, SMP_USE_HRQHV },
/* HTTP protocol on the request path */ /* HTTP protocol on the request path */