Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Redirect now does exact path matching like rewrite middleware

Browse source
This commit is contained in:
Matthew Holt 2015-04-12 17:40:59 -06:00
parent d8e7adcdb4
commit 6ca475def8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleware/redirect/redirect.go
View file

@ -30,9 +30,9 @@ type Redirect struct {
// ServeHTTP implements the middleware.Handler interface. // ServeHTTP implements the middleware.Handler interface.
func (rd Redirect) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) { func (rd Redirect) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
for _, rule := range rd.Rules { for _, rule := range rd.Rules {
if middleware.Path(r.URL.Path).Matches(rule.From) { if r.URL.Path == rule.From {
if rule.From == "/" { if rule.From == "/" {
// Catchall redirect preserves path (TODO: This should be made more consistent...) // Catchall redirect preserves path (TODO: This behavior should be more standardized...)
http.Redirect(w, r, strings.TrimSuffix(rule.To, "/")+r.URL.Path, rule.Code) http.Redirect(w, r, strings.TrimSuffix(rule.To, "/")+r.URL.Path, rule.Code)
return 0, nil return 0, nil
} }
@ -55,7 +55,6 @@ func parse(c middleware.Controller) ([]Rule, error) {
rule.From = "/" rule.From = "/"
rule.To = c.Val() rule.To = c.Val()
rule.Code = 307 // TODO: Consider 301 instead? rule.Code = 307 // TODO: Consider 301 instead?
redirects = append(redirects, rule)
} else if len(args) == 3 { } else if len(args) == 3 {
// From, To, and Code specified // From, To, and Code specified
rule.From = args[0] rule.From = args[0]
@ -65,10 +64,15 @@ func parse(c middleware.Controller) ([]Rule, error) {
} else { } else {
rule.Code = code rule.Code = code
} }
redirects = append(redirects, rule)
} else { } else {
return redirects, c.ArgErr() return redirects, c.ArgErr()
} }
if rule.From == rule.To {
return redirects, c.Err("Redirect rule cannot allow From and To arguments to be the same.")
}
redirects = append(redirects, rule)
} }
return redirects, nil return redirects, nil