sinjuginas/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "BUG/MINOR: http-rules: Replace path and query-string in "replace-path" action"

Browse Source 
This reverts commit 4b9c0d1fc08388bf44c6ebbd88f786032dd010fc.

Actually, the "replace-path" action is ambiguous. "set-path" action preserves
the query-string. The "path" sample fetch does not contain the query-string. But
"replace-path" action is documented to handle the query-string. It is probably
not the expected behavior. So instead of fixing the code, we will fix the
documentation to make "replace-path" action consistent with other parts of the
code. In addition actions and sample fetches to handle the path with the
query-string will be added.

If the commit above is ever backported, this one must be as well.
This commit is contained in:
Christopher Faulet 2020-09-02 11:10:38 +02:00
parent 398da62c38
commit 1fa0cc18e1
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http_act.c
View File

@ -214,8 +214,8 @@ static enum act_return http_action_replace_uri(struct act_rule *rule, struct pro
goto fail_alloc;
uri = htx_sl_req_uri(http_get_stline(htxbuf(&s->req.buf)));
if (rule->action == 4) // replace-path
uri = http_get_path(uri);
if (rule->action == 1) // replace-path
uri = iststop(http_get_path(uri), '?');
if (!regex_exec_match2(rule->arg.http.re, uri.ptr, uri.len, MAX_MATCH, pmatch, 0))
goto leave;
@ -273,7 +273,7 @@ static enum act_parse_ret parse_replace_uri(const char **args, int *orig_arg, st
char *error = NULL;
if (strcmp(args[cur_arg-1], "replace-path") == 0)
rule->action = 4; // replace-path
rule->action = 1; // replace-path, same as set-path
else
rule->action = 3; // replace-uri, same as set-uri

5
src/http_ana.c
View File

@ -2785,11 +2785,6 @@ int http_req_replace_stline(int action, const char *replace, int len,
return -1;
break;
case 4: // path + query
if (!http_replace_req_path(htx, ist2(replace, len), 1))
return -1;
break;
default:
return -1;
}