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

MINOR: http: split the url_param in two parts

Browse Source 
This patch is the part of the body_param fetch. The goal is to have
generic url-encoded parser which can used for parsing the query string
and the body.
This commit is contained in:
Thierry FOURNIER 2015-05-19 14:46:23 +02:00 committed by Willy Tarreau
parent b4e34da692
commit 4fdc74c22c
1 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/proto_http.c
View File

@ -11575,48 +11575,19 @@ find_next_url_param(char* query_string, char *qs_end,
return value_end != value_start; return value_end != value_start;
} }
/* This scans a URL-encoded query string. It relies on ctx->a[0] to point to
* the beginning of the string and ctx->a[1] to point to the end. The string
* must be contigous. The pointers are updated for next iteration before
* leaving.
*/
static int static int
smp_fetch_url_param(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_param(char delim, const char *name, int name_len, const struct arg *args, struct sample *smp, const char *kw, void *private)
{ {
char delim = '?';
struct http_msg *msg;
char *query_string, *qs_end; char *query_string, *qs_end;
const char *name;
int name_len;
if (!args ||
(args[0].type && args[0].type != ARGT_STR) ||
(args[1].type && args[1].type != ARGT_STR))
return 0;
CHECK_HTTP_MESSAGE_FIRST();
msg = &smp->strm->txn->req;
if (args[1].type)
delim = *args[1].data.str.str;
query_string = smp->ctx.a[0]; query_string = smp->ctx.a[0];
qs_end = smp->ctx.a[1]; qs_end = smp->ctx.a[1];
if (!query_string) { // first call, find the query string
query_string = find_param_list(msg->chn->buf->p + msg->sl.rq.u,
msg->sl.rq.u_l, delim);
if (!query_string)
return 0;
qs_end = msg->chn->buf->p + msg->sl.rq.u + msg->sl.rq.u_l;
smp->ctx.a[0] = query_string;
smp->ctx.a[1] = qs_end;
}
name = "";
name_len = 0;
if (args->type == ARGT_STR) {
name = args->data.str.str;
name_len = args->data.str.len;
}
if (!find_next_url_param(query_string, qs_end, if (!find_next_url_param(query_string, qs_end,
name, name_len, name, name_len,
&smp->data.str.str, &smp->data.str.len, &smp->data.str.str, &smp->data.str.len,
@ -11635,6 +11606,51 @@ smp_fetch_url_param(const struct arg *args, struct sample *smp, const char *kw,
return 1; return 1;
} }
/* This function iterates over each parameter of the query string. It uses
* ctx->a[0] and ctx->a[1] to store the beginning and end of the current
* parameter. An optional parameter name is passed in args[0], otherwise
* any parameter is considered. It supports an optional delimiter argument
* for the beginning of the string in args[1], which defaults to "?".
*/
static int
smp_fetch_url_param(const struct arg *args, struct sample *smp, const char *kw, void *private)
{
struct http_msg *msg;
char delim = '?';
const char *name;
int name_len;
if (!smp->ctx.a[0]) { // first call, find the query string
if (!args ||
(args[0].type && args[0].type != ARGT_STR) ||
(args[1].type && args[1].type != ARGT_STR))
return 0;
if (args[1].type)
delim = *args[1].data.str.str;
name = "";
name_len = 0;
if (args->type == ARGT_STR) {
name = args->data.str.str;
name_len = args->data.str.len;
}
CHECK_HTTP_MESSAGE_FIRST();
msg = &smp->strm->txn->req;
smp->ctx.a[0] = find_param_list(msg->chn->buf->p + msg->sl.rq.u,
msg->sl.rq.u_l, delim);
if (!smp->ctx.a[0])
return 0;
smp->ctx.a[1] = msg->chn->buf->p + msg->sl.rq.u + msg->sl.rq.u_l;
}
return smp_fetch_param(delim, name, name_len, args, smp, kw, private);
}
/* Return the signed integer value for the specified url parameter (see url_param /* Return the signed integer value for the specified url parameter (see url_param
* above). * above).
*/ */