Fix regex rewrite

Rulox · Rulox · commit f1bbdc7e5a36 · 2020-06-24T11:25:18.000+01:00
diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go
@@ -555,7 +555,7 @@ func generateRewrites(path string, proxy *conf_v1.ActionProxy, internal bool, or
 	}
 
 	if isRegex {
-		rewrites = append(rewrites, fmt.Sprintf(`"^%v$" "%v" break`, trimmedPath, proxy.RewritePath))
+		rewrites = append(rewrites, fmt.Sprintf(`"^%v" "%v" break`, trimmedPath, proxy.RewritePath))
 	} else if internal {
 		rewrites = append(rewrites, fmt.Sprintf(`"^%v(.*)$" "%v$1" break`, trimmedPath, proxy.RewritePath))
 	}
diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go
@@ -3905,15 +3905,6 @@ func TestGenerateRewrites(t *testing.T) {
 			originalPath: "/path",
 			expected:     []string{`^ $request_uri`, `"^/path(.*)$" "/rewrite$1" break`},
 		},
-		{
-			path:     "/_internal_path",
-			internal: true,
-			proxy: &conf_v1.ActionProxy{
-				RewritePath: "/rewrite",
-			},
-			originalPath: "/path",
-			expected:     []string{`^ $request_uri`, `"^/path(.*)$" "/rewrite$1" break`},
-		},
 		{
 			path:     "~/regex",
 			internal: true,
@@ -3929,7 +3920,7 @@ func TestGenerateRewrites(t *testing.T) {
 			proxy: &conf_v1.ActionProxy{
 				RewritePath: "/rewrite",
 			},
-			expected: []string{`"^/regex$" "/rewrite" break`},
+			expected: []string{`"^/regex" "/rewrite" break`},
 		},
 	}
 
@@ -4166,6 +4157,7 @@ func TestGenerateProxyIgnoreHeaders(t *testing.T) {
 			proxy: &conf_v1.ActionProxy{
 				ResponseHeaders: nil,
 			},
+			expected: "",
 		},
 		{
 			proxy: &conf_v1.ActionProxy{

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ func generateRewrites(path string, proxy *conf_v1.ActionProxy, internal bool, or`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`if isRegex {`
`558`		- rewrites = append(rewrites, fmt.Sprintf(`"^%v$" "%v" break`, trimmedPath, proxy.RewritePath))
	`558`	+ rewrites = append(rewrites, fmt.Sprintf(`"^%v" "%v" break`, trimmedPath, proxy.RewritePath))
`559`	`559`	`} else if internal {`
`560`	`560`	rewrites = append(rewrites, fmt.Sprintf(`"^%v(.*)$" "%v$1" break`, trimmedPath, proxy.RewritePath))
`561`	`561`	`}`