fix: correct approach

mtojek · mtojek · commit cdfef4ddec91 · 2025-02-12T08:47:56.000+01:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1749,10 +1749,12 @@ func singleSlashMW(next http.Handler) http.Handler {
 		newPath := multipleSlashesRe.ReplaceAllString(path, "/")
 
 		// Apply the cleaned path
+		// The approach is consistent with: https://github.com/go-chi/chi/blob/e846b8304c769c4f1a51c9de06bebfaa4576bd88/middleware/strip.go#L24-L28
 		if rctx != nil {
 			rctx.RoutePath = newPath
+		} else {
+			r.URL.Path = newPath
 		}
-		r.URL.Path = newPath
 
 		next.ServeHTTP(w, r)
 	}
diff --git a/coderd/coderd_internal_test.go b/coderd/coderd_internal_test.go
@@ -33,26 +33,37 @@ func TestStripSlashesMW(t *testing.T) {
 
 	for _, tt := range tests {
 		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
 
+		t.Run("chi/"+tt.name, func(t *testing.T) {
+			t.Parallel()
 			req := httptest.NewRequest("GET", tt.inputPath, nil)
 			rec := httptest.NewRecorder()
 
-			// Create a chi RouteContext and attach it to the request
+			// given
 			rctx := chi.NewRouteContext()
-			rctx.RoutePath = tt.inputPath // Simulate chi route path
+			rctx.RoutePath = tt.inputPath
 			req = req.WithContext(context.WithValue(req.Context(), chi.RouteCtxKey, rctx))
 
-			// Pass the request through the middleware
+			// when
 			singleSlashMW(handler).ServeHTTP(rec, req)
-
-			// Get the updated chi RouteContext after middleware processing
 			updatedCtx := chi.RouteContext(req.Context())
 
-			// Validate URL path
-			assert.Equal(t, tt.wantPath, req.URL.Path)
+			// then
+			assert.Equal(t, tt.inputPath, req.URL.Path)
 			assert.Equal(t, tt.wantPath, updatedCtx.RoutePath)
 		})
+
+		t.Run("stdlib/"+tt.name, func(t *testing.T) {
+			t.Parallel()
+			req := httptest.NewRequest("GET", tt.inputPath, nil)
+			rec := httptest.NewRecorder()
+
+			// when
+			singleSlashMW(handler).ServeHTTP(rec, req)
+
+			// then
+			assert.Equal(t, tt.wantPath, req.URL.Path)
+			assert.Nil(t, chi.RouteContext(req.Context()))
+		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1749,10 +1749,12 @@ func singleSlashMW(next http.Handler) http.Handler {`
`1749`	`1749`	`newPath := multipleSlashesRe.ReplaceAllString(path, "/")`
`1750`	`1750`
`1751`	`1751`	`// Apply the cleaned path`
	`1752`	`+ // The approach is consistent with: https://github.com/go-chi/chi/blob/e846b8304c769c4f1a51c9de06bebfaa4576bd88/middleware/strip.go#L24-L28`
`1752`	`1753`	`if rctx != nil {`
`1753`	`1754`	`rctx.RoutePath = newPath`
	`1755`	`+ } else {`
	`1756`	`+ r.URL.Path = newPath`
`1754`	`1757`	`}`
`1755`		`- r.URL.Path = newPath`
`1756`	`1758`
`1757`	`1759`	`next.ServeHTTP(w, r)`
`1758`	`1760`	`}`