From b8c43e55dba837e0e5e3f8529ff7afcf4c8f5154 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Thu, 29 Jan 2015 22:05:54 -0700
Subject: [PATCH] Moved redirect middleware into its own package
---
middleware/{ => redirect}/redirect.go | 50 +++++++++++++++------------
1 file changed, 27 insertions(+), 23 deletions(-)
rename middleware/{ => redirect}/redirect.go (55%)
diff --git a/middleware/redirect.go b/middleware/redirect/redirect.go
similarity index 55%
rename from middleware/redirect.go
rename to middleware/redirect/redirect.go
index 2a4c7e292..b7020c5ae 100644
--- a/middleware/redirect.go
+++ b/middleware/redirect/redirect.go
@@ -1,42 +1,39 @@
-package middleware
-
-import "net/http"
-
// Redirect is middleware for redirecting certain requests
// to other locations.
-func Redirect(p parser) Middleware {
+package redirect
- // Redirect describes an HTTP redirect rule.
- type redirect struct {
- From string
- To string
- Code int
- }
+import (
+ "net/http"
+ "github.com/mholt/caddy/middleware"
+)
+
+// New creates a new redirect middleware.
+func New(c middleware.Controller) (middleware.Middleware, error) {
var redirects []redirect
- for p.Next() {
+ for c.Next() {
var rule redirect
// From
- if !p.NextArg() {
- return p.ArgErr()
+ if !c.NextArg() {
+ return nil, c.ArgErr()
}
- rule.From = p.Val()
+ rule.From = c.Val()
// To
- if !p.NextArg() {
- return p.ArgErr()
+ if !c.NextArg() {
+ return nil, c.ArgErr()
}
- rule.To = p.Val()
+ rule.To = c.Val()
// Status Code
- if !p.NextArg() {
- return p.ArgErr()
+ if !c.NextArg() {
+ return nil, c.ArgErr()
}
- if code, ok := httpRedirs[p.Val()]; !ok {
- return p.Err("Invalid redirect code '" + p.Val() + "'")
+ if code, ok := httpRedirs[c.Val()]; !ok {
+ return nil, c.Err("Invalid redirect code '" + c.Val() + "'")
} else {
rule.Code = code
}
@@ -54,7 +51,14 @@ func Redirect(p parser) Middleware {
}
next(w, r)
}
- }
+ }, nil
+}
+
+// redirect describes an HTTP redirect rule.
+type redirect struct {
+ From string
+ To string
+ Code int
}
// httpRedirs is a list of supported HTTP redirect codes.