From 07ad4655db5d37635edf36fa91d997d166d306b0 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 15 Jan 2020 11:44:21 -0700 Subject: rewrite: Make URI modifications more transactional (#2891) Before, modifying the path might have affected how a new query string was built if the query string relied on the path. Now, we build each component in isolation and only change the URI on the request later. Also, prevent trailing & in query string. --- modules/caddyhttp/rewrite/rewrite_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'modules/caddyhttp/rewrite/rewrite_test.go') diff --git a/modules/caddyhttp/rewrite/rewrite_test.go b/modules/caddyhttp/rewrite/rewrite_test.go index 3dbc2d6..34a0cdb 100644 --- a/modules/caddyhttp/rewrite/rewrite_test.go +++ b/modules/caddyhttp/rewrite/rewrite_test.go @@ -63,6 +63,16 @@ func TestRewrite(t *testing.T) { input: newRequest(t, "GET", "/bar"), expect: newRequest(t, "GET", "/foo/bar"), }, + { + rule: Rewrite{URI: "/index.php?p={http.request.uri.path}"}, + input: newRequest(t, "GET", "/foo/bar"), + expect: newRequest(t, "GET", "/index.php?p=%2Ffoo%2Fbar"), + }, + { + rule: Rewrite{URI: "?a=b&{http.request.uri.query}"}, + input: newRequest(t, "GET", "/"), + expect: newRequest(t, "GET", "/?a=b"), + }, { rule: Rewrite{URI: "/?c=d"}, input: newRequest(t, "GET", "/"), -- cgit v1.2.3