mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-26 16:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: uri_normalizer: Add a strip-dot normalizer

Browse Source 
This normalizer removes "/./" segments from the path component.
Usually the dot refers to the current directory which renders those segments redundant.

See GitHub Issue #714.
This commit is contained in:
Maximilian Mader
2021-04-21 00:22:50 +02:00
committed by Christopher Faulet
parent c9c79570d4
commit ff3bb8b609
6 changed files with 154 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/http_act.c
View File

@@ -232,6 +232,23 @@ static enum act_return http_action_normalize_uri(struct act_rule *rule, struct p
break;
}
case ACT_NORMALIZE_URI_PATH_STRIP_DOT: {
const struct ist path = http_get_path(uri);
struct ist newpath = ist2(replace->area, replace->size);
if (!isttest(path))
goto leave;
err = uri_normalizer_path_dot(iststop(path, '?'), &newpath);
if (err != URI_NORMALIZER_ERR_NONE)
break;
if (!http_replace_req_path(htx, newpath, 0))
goto fail_rewrite;
break;
}
case ACT_NORMALIZE_URI_PATH_STRIP_DOTDOT:
case ACT_NORMALIZE_URI_PATH_STRIP_DOTDOT_FULL: {
const struct ist path = http_get_path(uri);
@@ -350,6 +367,11 @@ static enum act_parse_ret parse_http_normalize_uri(const char **args, int *orig_
rule->action = ACT_NORMALIZE_URI_PATH_MERGE_SLASHES;
}
else if (strcmp(args[cur_arg], "path-strip-dot") == 0) {
cur_arg++;
rule->action = ACT_NORMALIZE_URI_PATH_STRIP_DOT;
}
else if (strcmp(args[cur_arg], "path-strip-dotdot") == 0) {
cur_arg++;

41
src/uri_normalizer.c
View File

@@ -75,6 +75,47 @@ enum uri_normalizer_err uri_normalizer_percent_upper(const struct ist input, int
return err;
}
/* Removes `/./` from the given path. */
enum uri_normalizer_err uri_normalizer_path_dot(const struct ist path, struct ist *dst)
{
enum uri_normalizer_err err;
const size_t size = istclear(dst);
struct ist newpath = *dst;
struct ist scanner = path;
/* The path will either be shortened or have the same length. */
if (size < istlen(path)) {
err = URI_NORMALIZER_ERR_ALLOC;
goto fail;
}
while (istlen(scanner) > 0) {
const struct ist segment = istsplit(&scanner, '/');
if (!isteq(segment, ist("."))) {
if (istcat(&newpath, segment, size) < 0) {
/* This is impossible, because we checked the size of the destination buffer. */
my_unreachable();
err = URI_NORMALIZER_ERR_INTERNAL_ERROR;
goto fail;
}
if (istend(segment) != istend(scanner))
newpath = __istappend(newpath, '/');
}
}
*dst = newpath;
return URI_NORMALIZER_ERR_NONE;
fail:
return err;
}
/* Merges `/../` with preceding path segments.
*
* If `full` is set to `0` then `/../` will be printed at the start of the resulting