auth: Refactor how authentication methods are passed to server/auth library.

scheduler/appengine/frontend/handler.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 // Package frontend implements GAE web server for luci-scheduler service.
 //
 // Due to the way classic GAE imports work, this package can not have
 // subpackages (or at least subpackages referenced via absolute import path).
 // We can't use relative imports because luci-go will then become unbuildable
 // by regular (non GAE) toolset.
@@ skipping 12 matching lines @@
 
         "golang.org/x/net/context"
         "google.golang.org/appengine"
 
         "github.com/luci/gae/service/info"
         tq "github.com/luci/gae/service/taskqueue"
 
         "github.com/luci/luci-go/grpc/discovery"
         "github.com/luci/luci-go/grpc/grpcmon"
         "github.com/luci/luci-go/grpc/prpc"
-        "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/router"
 
-        "github.com/luci/luci-go/appengine/gaeauth/server"
         "github.com/luci/luci-go/appengine/gaemiddleware"
 
         "github.com/luci/luci-go/common/data/rand/mathrand"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/logging"
 
         "github.com/luci/luci-go/scheduler/api/scheduler/v1"
 
         "github.com/luci/luci-go/scheduler/appengine/apiservers"
         "github.com/luci/luci-go/scheduler/appengine/catalog"
@@ skipping 87 matching lines @@
         }
         globalEngine = engine.NewEngine(engine.Config{
                 Catalog:              globalCatalog,
                 TimersQueuePath:      "/internal/tasks/timers",
                 TimersQueueName:      "timers",
                 InvocationsQueuePath: "/internal/tasks/invocations",
                 InvocationsQueueName: "invocations",
                 PubSubPushPath:       "/pubsub",
         })
 
-        // Middleware chains. 'baseUI' is used for web interface routes, 'base' for
-        // everything else.
+        // Do global init before handling requests.
         base := gaemiddleware.BaseProd().Extend(
                 func(c *router.Context, next router.Handler) {
                         globalInit.Do(func() { initializeGlobalState(c.Context) })
                         next(c)
                 },
         )
-        baseUI := base.Extend(auth.Use(auth.Authenticator{server.CookieAuth}))

[Vadim Sh., 2017/04/18 23:46:24]

moved to ui.InstallHandlers

 
         // Setup HTTP routes.
         r := router.New()
 
         gaemiddleware.InstallHandlersWithMiddleware(r, base)
 
-        ui.InstallHandlers(r, baseUI, ui.Config{
+        ui.InstallHandlers(r, base, ui.Config{
                 Engine:        globalEngine,
                 Catalog:       globalCatalog,
                 TemplatesPath: "templates",
         })
 
         r.POST("/pubsub", base, pubsubPushHandler) // auth is via custom tokens
         r.GET("/internal/cron/read-config", base.Extend(gaemiddleware.RequireCron), readConfigCron)
         r.POST("/internal/tasks/read-project-config", base.Extend(gaemiddleware.RequireTaskQueue("read-project-config")), readProjectConfigTask)
         r.POST("/internal/tasks/timers", base.Extend(gaemiddleware.RequireTaskQueue("timers")), actionTask)
         r.POST("/internal/tasks/invocations", base.Extend(gaemiddleware.RequireTaskQueue("invocations")), actionTask)
@@ skipping 126 matching lines @@
                 return
         }
         count, _ := strconv.Atoi(rc.Request.Header.Get("X-AppEngine-TaskExecutionCount"))
         err = globalEngine.ExecuteSerializedAction(rc.Context, body, count)
         if err != nil {
                 rc.err(err, "Error when executing the action")
                 return
         }
         rc.ok()
 }