Make HTTP middleware easier to use

appengine/cmd/cron/ui/common.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 ui implements request handlers that serve user facing HTML pages.
 package ui
 
 import (
         "strings"
 
-        "github.com/julienschmidt/httprouter"
         "golang.org/x/net/context"
         "google.golang.org/appengine"
 
         "github.com/luci/gae/service/info"
 
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/xsrf"
-        "github.com/luci/luci-go/server/middleware"
+        "github.com/luci/luci-go/server/router"
         "github.com/luci/luci-go/server/templates"
 
         "github.com/luci/luci-go/appengine/cmd/cron/engine"
 )
 
 // Config is global configuration of UI handlers.
 type Config struct {
         Engine        engine.Engine
         TemplatesPath string // path to templates directory deployed to GAE
 }
 
 // InstallHandlers adds HTTP handlers that render HTML pages.
-func InstallHandlers(r *httprouter.Router, base middleware.Base, cfg Config) {
+func InstallHandlers(r *router.Router, handlers []router.Handler, cfg Config) {
         tmpl := prepareTemplates(cfg.TemplatesPath)
 
-        wrap := func(h middleware.Handler) httprouter.Handle {
-                h = auth.Authenticate(h)
-                h = templates.WithTemplates(h, tmpl)
-                h = middleware.WithContextValue(h, configContextKey(0), &cfg)
-                return base(h)
+        wrap := func() []router.Handler {
+                return append(
+                        handlers,
+                        router.HandlerWithContextValue(configContextKey(0), &cfg),
+                        templates.WithTemplates(tmpl),
+                        auth.Authenticate(),
+                )
         }
 
-        r.GET("/", wrap(indexPage))
-        r.GET("/jobs/:ProjectID", wrap(projectPage))
-        r.GET("/jobs/:ProjectID/:JobID", wrap(jobPage))
-        r.GET("/jobs/:ProjectID/:JobID/:InvID", wrap(invocationPage))
+        r.GET("/", append(wrap(), indexPage)...)
+        r.GET("/jobs/:ProjectID", append(wrap(), projectPage)...)
+        r.GET("/jobs/:ProjectID/:JobID", append(wrap(), jobPage)...)
+        r.GET("/jobs/:ProjectID/:JobID/:InvID", append(wrap(), invocationPage)...)

[iannucci, 2016/06/13 19:23:28]

same here?

 
         // All POST forms must be protected with XSRF token.
-        r.POST("/actions/runJob/:ProjectID/:JobID", wrap(xsrf.WithTokenCheck(runJobAction)))
-        r.POST("/actions/pauseJob/:ProjectID/:JobID", wrap(xsrf.WithTokenCheck(pauseJobAction)))
-        r.POST("/actions/resumeJob/:ProjectID/:JobID", wrap(xsrf.WithTokenCheck(resumeJobAction)))
-        r.POST("/actions/abortInvocation/:ProjectID/:JobID/:InvID", wrap(xsrf.WithTokenCheck(abortInvocationAction)))
+        r.POST("/actions/runJob/:ProjectID/:JobID", append(wrap(), xsrf.WithTokenCheck(), runJobAction)...)
+        r.POST("/actions/pauseJob/:ProjectID/:JobID", append(wrap(), xsrf.WithTokenCheck(), pauseJobAction)...)
+        r.POST("/actions/resumeJob/:ProjectID/:JobID", append(wrap(), xsrf.WithTokenCheck(), resumeJobAction)...)
+        r.POST("/actions/abortInvocation/:ProjectID/:JobID/:InvID", append(wrap(), xsrf.WithTokenCheck(), abortInvocationAction)...)
 }
 
 type configContextKey int
 
 // config returns Config passed to InstallHandlers.
 func config(c context.Context) *Config {
         cfg, _ := c.Value(configContextKey(0)).(*Config)
         if cfg == nil {
                 panic("impossible, configContextKey is not set")
         }
@@ skipping 25 matching lines @@
                                 "AppVersion":  strings.Split(info.Get(c).VersionID(), ".")[0],
                                 "IsAnonymous": auth.CurrentIdentity(c) == "anonymous:anonymous",
                                 "User":        auth.CurrentUser(c),
                                 "LoginURL":    loginURL,
                                 "LogoutURL":   logoutURL,
                                 "XsrfToken":   token,
                         }, nil
                 },
         }
 }