Merge branch '18863-delete-old-logs-without-cron'

[arvados.git] / lib / controller / handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 965ba040edc8fb5fad02e153d817d5cbb8087152..e1392bef92652bfbf8a61155a062752608809495 100644 (file)
--- 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)
 }
 
@@ -108,7 +101,10 @@ func (h *Handler) setup() {
        h.federation = federation.New(h.Cluster, &healthFuncs)
        rtr := router.New(h.federation, router.Config{
                MaxRequestSize: h.Cluster.API.MaxRequestSize,
-               WrapCalls:      api.ComposeWrappers(ctrlctx.WrapCallsInTransactions(h.db), oidcAuthorizer.WrapCalls),
+               WrapCalls: api.ComposeWrappers(
+                       ctrlctx.WrapCallsInTransactions(h.db),
+                       oidcAuthorizer.WrapCalls,
+                       ctrlctx.WrapCallsWithAuth(h.Cluster)),
        })
 
        healthRoutes := health.Routes{"ping": func() error { _, err := h.db(context.TODO()); return err }}
@@ -136,6 +132,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)
@@ -157,6 +155,7 @@ func (h *Handler) setup() {
        }
 
        go h.trashSweepWorker()
+       go h.containerLogSweepWorker()
 }
 
 var errDBConnection = errors.New("database connection error")