X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e6769d20505e2c8c74b2d7e3f9c2f33f2a2db092..23cb044d4a68d424d9088ad68a8778a4d4838a2f:/lib/controller/handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 965ba040ed..665fd5c636 100644
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -13,7 +13,6 @@ import (
 	"net/url"
 	"strings"
 	"sync"
-	"time"
 
 	"git.arvados.org/arvados.git/lib/controller/api"
 	"git.arvados.org/arvados.git/lib/controller/federation"
@@ -61,12 +60,6 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			req.URL.Path = strings.Replace(req.URL.Path, "//", "/", -1)
 		}
 	}
-	if h.Cluster.API.RequestTimeout > 0 {
-		ctx, cancel := context.WithDeadline(req.Context(), time.Now().Add(time.Duration(h.Cluster.API.RequestTimeout)))
-		req = req.WithContext(ctx)
-		defer cancel()
-	}
-
 	h.handlerStack.ServeHTTP(w, req)
 }
 
@@ -136,6 +129,8 @@ func (h *Handler) setup() {
 	mux.Handle("/arvados/v1/links/", rtr)
 	mux.Handle("/login", rtr)
 	mux.Handle("/logout", rtr)
+	mux.Handle("/arvados/v1/api_client_authorizations", rtr)
+	mux.Handle("/arvados/v1/api_client_authorizations/", rtr)
 
 	hs := http.NotFoundHandler()
 	hs = prepend(hs, h.proxyRailsAPI)