fix: strip path from incoming request, not the upstream request

nbycomp · Feb 29, 2024 · 8dc4fa4 · 8dc4fa4
1 parent 817943a
commit 8dc4fa4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -197,7 +197,9 @@ func ConfigureBackendURL(r *http.Request, rl *rule.Rule) error {
 
 	if rl.Upstream.StripPath != "" {
 		forwardURL.Path = strings.Replace(forwardURL.Path, "/"+strings.Trim(rl.Upstream.StripPath, "/"), "", 1)
+		proxyPath = strings.Replace(proxyPath, "/"+strings.Trim(rl.Upstream.StripPath, "/"), "", 1)
 	}
+	forwardURL.Path = "/" + strings.TrimLeft("/"+strings.Trim(backendPath, "/")+"/"+strings.TrimLeft(proxyPath, "/"), "/")
 
 	r.Host = backendHost
 	if rl.Upstream.PreserveHost {

diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go
@@ -501,6 +501,12 @@ func TestConfigureBackendURL(t *testing.T) {
 			eURL:  "http://localhost:4000/foo/users/1234",
 			eHost: "localhost:3000",
 		},
+		{
+			r:     &http.Request{Host: "localhost:3000", URL: &url.URL{Path: "/foo/baz", Scheme: "http"}},
+			rl:    &rule.Rule{Upstream: rule.Upstream{URL: "http://localhost:4000/foo/bar", PreserveHost: true, StripPath: "foo"}},
+			eURL:  "http://localhost:4000/foo/bar/baz",
+			eHost: "localhost:3000",
+		},
 	} {
 		t.Run(fmt.Sprintf("case=%d", k), func(t *testing.T) {
 			require.NoError(t, proxy.ConfigureBackendURL(tc.r, tc.rl))