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

BUG/MINOR: mux-fcgi: Don't url-decode the QUERY_STRING parameter anymore

Browse Source 
In the CGI/1.1 specification, it is specified the QUERY_STRING must not be
url-decoded. However, this parameter is sent decoded because it is extracted
after the URI's path decoding. Now, the query-string is first extracted, then
the script part of the path is url-decoded. This way, the QUERY_STRING parameter
is no longer decoded.

This patch should fix the issue #769. It must be backported as far as 2.1.
This commit is contained in:
Christopher Faulet 2020-07-23 15:44:37 +02:00
parent f1ea47d896
commit 0f17a4444e
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mux_fcgi.c
View File

@ -1303,27 +1303,21 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
struct ist path = http_get_path(params->uri);
int len;
/* Decode the path. it must first be copied to keep the URI
* untouched.
*/
chunk_memcat(params->p, path.ptr, path.len);
path.ptr = b_tail(params->p) - path.len;
path.ptr[path.len] = '\0';
len = url_decode(path.ptr, 0);
if (len < 0)
goto error;
path.len = len;
/* No scrit_name set but no valid path ==> error */
if (!(params->mask & FCGI_SP_SCRIPT_NAME) && !istlen(path))
goto error;
/* Find limit between the path and the query-string */
for (len = 0; len < path.len && *(path.ptr + len) != '?'; len++);
/* If there is a query-string, Set it if not already set */
if (!(params->mask & FCGI_SP_REQ_QS) && len < path.len)
params->qs = ist2(path.ptr+len+1, path.len-len-1);
if (!(params->mask & FCGI_SP_REQ_QS)) {
struct ist qs = istfind(path, '?');
/* Update the path length */
path.len -= qs.len;
/* Set the query-string skipping the '?', if any */
if (istlen(qs))
params->qs = istnext(qs);
}
/* If the script_name is set, don't try to deduce the path_info
* too. The opposite is not true.
@ -1333,8 +1327,18 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
goto end;
}
/* Decode the path. it must first be copied to keep the URI
* untouched.
*/
chunk_memcat(params->p, path.ptr, path.len);
path.ptr = b_tail(params->p) - path.len;
len = url_decode(ist0(path), 0);
if (len < 0)
goto error;
path.len = len;
/* script_name not set, preset it with the path for now */
params->scriptname = ist2(path.ptr, len);
params->scriptname = path;
/* If there is no regex to match the pathinfo, just to the last
* part and see if the index must be used.