Make HTTP middleware easier to use

appengine/gaemiddleware/appengine.go

Index: appengine/gaemiddleware/appengine.go
diff --git a/appengine/gaemiddleware/appengine.go b/appengine/gaemiddleware/appengine.go
index d39b00091d31359552d1e600679d992135053907..51237ceffaddcd931d06d19b7fe77e9097925e28 100644
--- a/appengine/gaemiddleware/appengine.go
+++ b/appengine/gaemiddleware/appengine.go
@@ -8,10 +8,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/julienschmidt/httprouter"
 	"github.com/luci/gae/service/info"
 	"github.com/luci/luci-go/common/logging"
-	"github.com/luci/luci-go/server/middleware"
+	"github.com/luci/luci-go/server/router"
 	"golang.org/x/net/context"
 )
 
@@ -24,17 +23,17 @@ var devAppserverBypassFn = func(c context.Context) bool {
 //
 // This middleware has no effect when using 'BaseTest' or when running under
 // dev_appserver.py
-func RequireCron(h middleware.Handler) middleware.Handler {
-	return func(c context.Context, rw http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		if !devAppserverBypassFn(c) {
-			if r.Header.Get("X-Appengine-Cron") != "true" {
-				rw.WriteHeader(http.StatusForbidden)
-				logging.Errorf(c, "request not made from cron")
-				fmt.Fprint(rw, "error: must be run from cron")
+func RequireCron() router.Handler {
+	return func(c *router.Context) {
+		if !devAppserverBypassFn(c.Context) {
+			if c.Request.Header.Get("X-Appengine-Cron") != "true" {
+				c.Writer.WriteHeader(http.StatusForbidden)
+				logging.Errorf(c.Context, "request not made from cron")
+				fmt.Fprint(c.Writer, "error: must be run from cron")
+				c.Abort()
 				return
 			}
 		}
-		h(c, rw, r, p)
 	}
 }
 
@@ -47,17 +46,17 @@ func RequireCron(h middleware.Handler) middleware.Handler {
 //
 // This middleware has no effect when using 'BaseTest' or when running under
 // dev_appserver.py
-func RequireTaskQueue(queue string, h middleware.Handler) middleware.Handler {
-	return func(c context.Context, rw http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		if !devAppserverBypassFn(c) {
-			qName := r.Header.Get("X-AppEngine-QueueName")
+func RequireTaskQueue(queue string) router.Handler {
+	return func(c *router.Context) {
+		if !devAppserverBypassFn(c.Context) {
+			qName := c.Request.Header.Get("X-AppEngine-QueueName")
 			if qName == "" || (queue != "" && queue != qName) {
-				rw.WriteHeader(http.StatusForbidden)
-				logging.Errorf(c, "request made from wrong taskqueue: %q v %q", qName, queue)
-				fmt.Fprintf(rw, "error: must be run from the correct taskqueue")
+				c.Writer.WriteHeader(http.StatusForbidden)
+				logging.Errorf(c.Context, "request made from wrong taskqueue: %q v %q", qName, queue)
+				fmt.Fprintf(c.Writer, "error: must be run from the correct taskqueue")
+				c.Abort()
 				return
 			}
 		}
-		h(c, rw, r, p)
 	}
 }