Unescape HTTP path parameters (#3364)

* Add cases to http.TestVars()

* Unescape HTTP path parameters

http/mux.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"net/url"
 	"regexp"
 
 	chi "github.com/go-chi/chi/v5"
@@ -113,14 +114,22 @@ func (m *mux) Vars(r *http.Request) map[string]string {
 	for i, k := range params.Keys {
 		if k == "*" {
 			wildcard := m.wildcards[r.Method+"::"+rctx.RoutePattern()]
-			vars[wildcard] = params.Values[i]
+			vars[wildcard] = unescape(params.Values[i])
 			continue
 		}
-		vars[k] = params.Values[i]
+		vars[k] = unescape(params.Values[i])
 	}
 	return vars
 }
 
+func unescape(s string) string {
+	u, err := url.PathUnescape(s)
+	if err != nil {
+		return s
+	}
+	return u
+}
+
 // Use appends a middleware to the list of middlewares to be applied
 // downstream the Muxer.
 func (m *mux) Use(f func(http.Handler) http.Handler) {

http/mux_test.go

@@ -104,6 +104,23 @@ func TestVars(t *testing.T) {
 				"post_id": "456/789",
 			},
 		},
+		{
+			Name:    "escaped",
+			Pattern: "/users/{id}",
+			URL:     "/users/%40123",
+			Expected: map[string]string{
+				"id": "@123",
+			},
+		},
+		{
+			Name:    "escaped wildcard",
+			Pattern: "/users/{id}/posts/{*post_id}",
+			URL:     "/users/%40123/posts/456/789%24",
+			Expected: map[string]string{
+				"id":      "@123",
+				"post_id": "456/789$",
+			},
+		},
 		{
 			Name:     "no var",
 			Pattern:  "/users",