Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions mux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,23 @@ func TestMethodNotAllowed(t *testing.T) {
}
}

func TestMethodNotAllowedSubrouterWithSeveralRoutes(t *testing.T) {
handler := func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }

router := NewRouter()
subrouter := router.PathPrefix("/v1").Subrouter()
subrouter.HandleFunc("/api", handler).Methods(http.MethodGet)
subrouter.HandleFunc("/api/{id}", handler).Methods(http.MethodGet)

w := NewRecorder()
req := newRequest(http.MethodPut, "/v1/api")
router.ServeHTTP(w, req)

if w.Code != http.StatusMethodNotAllowed {
t.Errorf("Expected status code 405 (got %d)", w.Code)
}
}

type customMethodNotAllowedHandler struct {
msg string
}
Expand Down
23 changes: 13 additions & 10 deletions route.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,19 @@ func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
continue
}

// Multiple routes may share the same path but use different HTTP methods. For instance:
// Route 1: POST "/users/{id}".
// Route 2: GET "/users/{id}", parameters: "id": "[0-9]+".
//
// The router must handle these cases correctly. For a GET request to "/users/abc" with "id" as "-2",
// The router should return a "Not Found" error as no route fully matches this request.
if rr, ok := m.(*routeRegexp); ok {
if rr.regexpType == regexpTypeQuery {
matchErr = ErrNotFound
break
}
}

// Ignore ErrNotFound errors. These errors arise from match call
// to Subrouters.
//
Expand All @@ -66,16 +79,6 @@ func (r *Route) Match(req *http.Request, match *RouteMatch) bool {

matchErr = nil // nolint:ineffassign
return false
} else {
// Multiple routes may share the same path but use different HTTP methods. For instance:
// Route 1: POST "/users/{id}".
// Route 2: GET "/users/{id}", parameters: "id": "[0-9]+".
//
// The router must handle these cases correctly. For a GET request to "/users/abc" with "id" as "-2",
// The router should return a "Not Found" error as no route fully matches this request.
if match.MatchErr == ErrMethodMismatch {
match.MatchErr = nil
}
}
}

Expand Down