rewrite: escape file matcher remainder before rewriting (#8325)
(cherry picked from commit 094172da84)
This commit is contained in:
parent
125a76909d
commit
9c9c17c70b
2 changed files with 49 additions and 0 deletions
|
|
@ -352,6 +352,15 @@ func escapePathPlaceholders(path string, r *http.Request, repl *caddy.Replacer)
|
|||
}
|
||||
}
|
||||
|
||||
fileMatchRemainderPlaceholder := "{http.matchers.file.remainder}"
|
||||
if strings.Contains(path, fileMatchRemainderPlaceholder) {
|
||||
if val, ok := repl.Get("http.matchers.file.remainder"); ok {
|
||||
if remainder, ok := val.(string); ok {
|
||||
path = strings.ReplaceAll(path, fileMatchRemainderPlaceholder, escapePathPreservingSlashes(remainder))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return path
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -569,6 +569,46 @@ func TestRewrite(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestRewriteEscapesFileMatcherRemainder(t *testing.T) {
|
||||
for i, tc := range []struct {
|
||||
input string
|
||||
remainder string
|
||||
expect string
|
||||
}{
|
||||
{
|
||||
input: "/index.php/foo/bar?a=b",
|
||||
remainder: "/foo/bar",
|
||||
expect: "/index.php/foo/bar?a=b",
|
||||
},
|
||||
{
|
||||
input: "/index.php/..%252fprivate%252fsecret.txt",
|
||||
remainder: "/..%2fprivate%2fsecret.txt",
|
||||
expect: "/index.php/..%252fprivate%252fsecret.txt",
|
||||
},
|
||||
{
|
||||
input: "/index.php/x%3Fa=evil?a=b",
|
||||
remainder: "/x?a=evil",
|
||||
expect: "/index.php/x%3Fa=evil?a=b",
|
||||
},
|
||||
{
|
||||
input: "/index.php/x%23frag?a=b",
|
||||
remainder: "/x#frag",
|
||||
expect: "/index.php/x%23frag?a=b",
|
||||
},
|
||||
} {
|
||||
req := newRequest(t, "GET", tc.input)
|
||||
repl := caddy.NewReplacer()
|
||||
repl.Set("http.matchers.file.relative", "/index.php")
|
||||
repl.Set("http.matchers.file.remainder", tc.remainder)
|
||||
|
||||
Rewrite{URI: "{http.matchers.file.relative}{http.matchers.file.remainder}"}.Rewrite(req, repl)
|
||||
|
||||
if expected, actual := tc.expect, req.URL.RequestURI(); expected != actual {
|
||||
t.Errorf("Test %d: Expected URL.RequestURI()='%s' but got '%s'", i, expected, actual)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestQueryOpsRenameNoOpCases(t *testing.T) {
|
||||
repl := caddy.NewReplacer()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue