X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f99e500a39b96f15c2814b742737b2f234766bbd..267d3c40bf1c5503e6487db2ab1f6a4339ac5f83:/lib/controller/handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 6669e020fd..a35d003019 100644
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -25,6 +25,7 @@ import (
 	"git.arvados.org/arvados.git/sdk/go/health"
 	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	"github.com/jmoiron/sqlx"
+
 	// sqlx needs lib/pq to talk to PostgreSQL
 	_ "github.com/lib/pq"
 )
@@ -91,18 +92,23 @@ func (h *Handler) setup() {
 	})
 
 	oidcAuthorizer := localdb.OIDCAccessTokenAuthorizer(h.Cluster, h.db)
-	rtr := router.New(federation.New(h.Cluster), api.ComposeWrappers(ctrlctx.WrapCallsInTransactions(h.db), oidcAuthorizer.WrapCalls))
+	rtr := router.New(federation.New(h.Cluster), router.Config{
+		MaxRequestSize: h.Cluster.API.MaxRequestSize,
+		WrapCalls:      api.ComposeWrappers(ctrlctx.WrapCallsInTransactions(h.db), oidcAuthorizer.WrapCalls),
+	})
 	mux.Handle("/arvados/v1/config", rtr)
-	mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr)
-
-	if !h.Cluster.ForceLegacyAPI14 {
-		mux.Handle("/arvados/v1/collections", rtr)
-		mux.Handle("/arvados/v1/collections/", rtr)
-		mux.Handle("/arvados/v1/users", rtr)
-		mux.Handle("/arvados/v1/users/", rtr)
-		mux.Handle("/login", rtr)
-		mux.Handle("/logout", rtr)
-	}
+	mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr) // must come before .../users/
+	mux.Handle("/arvados/v1/collections", rtr)
+	mux.Handle("/arvados/v1/collections/", rtr)
+	mux.Handle("/arvados/v1/users", rtr)
+	mux.Handle("/arvados/v1/users/", rtr)
+	mux.Handle("/arvados/v1/connect/", rtr)
+	mux.Handle("/arvados/v1/container_requests", rtr)
+	mux.Handle("/arvados/v1/container_requests/", rtr)
+	mux.Handle("/arvados/v1/groups", rtr)
+	mux.Handle("/arvados/v1/groups/", rtr)
+	mux.Handle("/login", rtr)
+	mux.Handle("/logout", rtr)
 
 	hs := http.NotFoundHandler()
 	hs = prepend(hs, h.proxyRailsAPI)