From 9c9c17c70bc2ce28cd73df385d9eff551c1180af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Sun, 1 Nov 2026 21:53:43 +0100 Subject: [PATCH] rewrite: escape file matcher remainder before rewriting (#8325) (cherry picked from commit 094172da84a0139a5566b4ab11bc12393dbaeebc) --- modules/caddyhttp/rewrite/rewrite.go | 9 +++++ modules/caddyhttp/rewrite/rewrite_test.go | 40 +++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/modules/caddyhttp/rewrite/rewrite.go b/modules/caddyhttp/rewrite/rewrite.go index 868fdd165..7e2f678dd 100644 --- a/modules/caddyhttp/rewrite/rewrite.go +++ b/modules/caddyhttp/rewrite/rewrite.go @@ -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 } diff --git a/modules/caddyhttp/rewrite/rewrite_test.go b/modules/caddyhttp/rewrite/rewrite_test.go index 67ab01652..8d5e742d8 100644 --- a/modules/caddyhttp/rewrite/rewrite_test.go +++ b/modules/caddyhttp/rewrite/rewrite_test.go @@ -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()