allow whitespace in regex

Jeffrey Reuling (TI) · vishr · commit 56091a418657 · 2018-06-26T09:57:59.000-07:00
diff --git a/middleware/rewrite.go b/middleware/rewrite.go
@@ -57,7 +57,7 @@ func RewriteWithConfig(config RewriteConfig) echo.MiddlewareFunc {
 
 	// Initialize
 	for k, v := range config.Rules {
-		k = strings.Replace(k, "*", "(\\S*)", -1)
+		k = strings.Replace(k, "*", "(.*)", -1)
 		config.rulesRegex[regexp.MustCompile(k)] = v
 	}
 
diff --git a/middleware/rewrite_test.go b/middleware/rewrite_test.go
@@ -32,6 +32,9 @@ func TestRewrite(t *testing.T) {
 	req.URL.Path = "/users/jack/orders/1"
 	e.ServeHTTP(rec, req)
 	assert.Equal(t, "/user/jack/order/1", req.URL.Path)
+	req.URL.Path = "/api/new users"
+	e.ServeHTTP(rec, req)
+	assert.Equal(t, "/new users", req.URL.Path)
 }
 
 // Issue #1086

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func RewriteWithConfig(config RewriteConfig) echo.MiddlewareFunc {`
`57`	`57`
`58`	`58`	`// Initialize`
`59`	`59`	`for k, v := range config.Rules {`
`60`		`- k = strings.Replace(k, "", "(\\S)", -1)`
	`60`	`+ k = strings.Replace(k, "", "(.)", -1)`
`61`	`61`	`config.rulesRegex[regexp.MustCompile(k)] = v`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ func TestRewrite(t *testing.T) {`
`32`	`32`	`req.URL.Path = "/users/jack/orders/1"`
`33`	`33`	`e.ServeHTTP(rec, req)`
`34`	`34`	`assert.Equal(t, "/user/jack/order/1", req.URL.Path)`
	`35`	`+ req.URL.Path = "/api/new users"`
	`36`	`+ e.ServeHTTP(rec, req)`
	`37`	`+ assert.Equal(t, "/new users", req.URL.Path)`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`// Issue #1086`