just single slash

mtojek · mtojek · commit efd096523682 · 2025-02-11T16:54:43.000+01:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -10,6 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"path/filepath"
@@ -788,7 +789,7 @@ func New(options *Options) *API {
 		httpmw.AttachRequestID,
 		httpmw.ExtractRealIP(api.RealIPConfig),
 		httpmw.Logger(api.Logger),
-		stripSlashesMW,
+		singleSlashMW,
 		rolestore.CustomRoleMW,
 		prometheusMW,
 		// Build-Version is helpful for debugging.
@@ -1735,8 +1736,12 @@ func ReadExperiments(log slog.Logger, raw []string) codersdk.Experiments {
 
 var multipleSlashesRe = regexp.MustCompile(`/+`)
 
-func stripSlashesMW(next http.Handler) http.Handler {
+func singleSlashMW(next http.Handler) http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "test-app-owner") {
+			log.Println(r.URL.Path)
+		}
+
 		var path string
 		rctx := chi.RouteContext(r.Context())
 		if rctx != nil && rctx.RoutePath != "" {
@@ -1748,11 +1753,6 @@ func stripSlashesMW(next http.Handler) http.Handler {
 		// Normalize multiple slashes to a single slash
 		newPath := multipleSlashesRe.ReplaceAllString(path, "/")
 
-		// Ensure it doesn't strip the root `/`
-		if len(newPath) > 1 && newPath[len(newPath)-1] == '/' {
-			newPath = strings.TrimSuffix(newPath, "/")
-		}
-
 		// Apply the cleaned path
 		if rctx != nil {
 			rctx.RoutePath = newPath
diff --git a/coderd/coderd_internal_test.go b/coderd/coderd_internal_test.go
@@ -19,9 +19,8 @@ func TestStripSlashesMW(t *testing.T) {
 		wantPath  string
 	}{
 		{"No changes", "/api/v1/buildinfo", "/api/v1/buildinfo"},
-		{"Single trailing slash", "/api/v2/buildinfo/", "/api/v2/buildinfo"},
 		{"Double slashes", "/api//v2//buildinfo", "/api/v2/buildinfo"},
-		{"Triple slashes", "/api///v2///buildinfo///", "/api/v2/buildinfo"},
+		{"Triple slashes", "/api///v2///buildinfo", "/api/v2/buildinfo"},
 		{"Leading slashes", "///api/v2/buildinfo", "/api/v2/buildinfo"},
 		{"Root path", "/", "/"},
 		{"Double slashes root", "//", "/"},
@@ -46,7 +45,7 @@ func TestStripSlashesMW(t *testing.T) {
 			req = req.WithContext(context.WithValue(req.Context(), chi.RouteCtxKey, rctx))
 
 			// Pass the request through the middleware
-			stripSlashesMW(handler).ServeHTTP(rec, req)
+			singleSlashMW(handler).ServeHTTP(rec, req)
 
 			// Get the updated chi RouteContext after middleware processing
 			updatedCtx := chi.RouteContext(req.Context())
