diff options
| author | Francis Lavoie <[email protected]> | 2024-11-05 12:15:31 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-05 10:15:31 -0700 |
| commit | 5823eccf99d9fc6b4ffba8a78acfdb59c4ec0c97 (patch) | |
| tree | 3282adb4c2aa5aca380a05477eb9818173d2b75f | |
| parent | cc23ad6402e6dace30b04f0d9113530a4d9541a9 (diff) | |
| download | caddy-5823eccf99d9fc6b4ffba8a78acfdb59c4ec0c97.tar.gz caddy-5823eccf99d9fc6b4ffba8a78acfdb59c4ec0c97.zip | |
rewrite: Don't add / in Caddyfile, do it after replacer (#6662)
| -rw-r--r-- | modules/caddyhttp/rewrite/caddyfile.go | 3 | ||||
| -rw-r--r-- | modules/caddyhttp/rewrite/rewrite.go | 3 | ||||
| -rw-r--r-- | modules/caddyhttp/rewrite/rewrite_test.go | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/modules/caddyhttp/rewrite/caddyfile.go b/modules/caddyhttp/rewrite/caddyfile.go index 89f44c79b..5f9b97adf 100644 --- a/modules/caddyhttp/rewrite/caddyfile.go +++ b/modules/caddyhttp/rewrite/caddyfile.go @@ -110,9 +110,6 @@ func parseCaddyfileURI(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, err return nil, h.ArgErr() } rewr.StripPathPrefix = args[1] - if !strings.HasPrefix(rewr.StripPathPrefix, "/") { - rewr.StripPathPrefix = "/" + rewr.StripPathPrefix - } case "strip_suffix": if len(args) != 2 { diff --git a/modules/caddyhttp/rewrite/rewrite.go b/modules/caddyhttp/rewrite/rewrite.go index e76682729..31ebfb430 100644 --- a/modules/caddyhttp/rewrite/rewrite.go +++ b/modules/caddyhttp/rewrite/rewrite.go @@ -259,6 +259,9 @@ func (rewr Rewrite) Rewrite(r *http.Request, repl *caddy.Replacer) bool { // strip path prefix or suffix if rewr.StripPathPrefix != "" { prefix := repl.ReplaceAll(rewr.StripPathPrefix, "") + if !strings.HasPrefix(prefix, "/") { + prefix = "/" + prefix + } mergeSlashes := !strings.Contains(prefix, "//") changePath(r, func(escapedPath string) string { escapedPath = caddyhttp.CleanPath(escapedPath, mergeSlashes) diff --git a/modules/caddyhttp/rewrite/rewrite_test.go b/modules/caddyhttp/rewrite/rewrite_test.go index aaa142bc2..81360baee 100644 --- a/modules/caddyhttp/rewrite/rewrite_test.go +++ b/modules/caddyhttp/rewrite/rewrite_test.go @@ -236,6 +236,11 @@ func TestRewrite(t *testing.T) { expect: newRequest(t, "GET", "/foo/bar"), }, { + rule: Rewrite{StripPathPrefix: "prefix"}, + input: newRequest(t, "GET", "/prefix/foo/bar"), + expect: newRequest(t, "GET", "/foo/bar"), + }, + { rule: Rewrite{StripPathPrefix: "/prefix"}, input: newRequest(t, "GET", "/prefix"), expect: newRequest(t, "GET", ""), |