Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 02:27:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "rewrite: Raise error if rewrite path does not begin with / #1610 (#1629)"

Browse Source 
This reverts commit e0ed7093970cf08f63cf04f663c6841a7fdc4499.
This commit is contained in:
Matthew Holt 2017-05-02 09:30:18 -06:00
parent 6d9783a267
commit 9fbac10a4b
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
caddyhttp/rewrite/setup.go
View File

@ -76,10 +76,6 @@ func rewriteParse(c *caddy.Controller) ([]httpserver.HandlerConfig, error) {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
to = strings.Join(args1, " ") to = strings.Join(args1, " ")
// ensure rewrite path begins with /
if !strings.HasPrefix(to, "/") {
return nil, c.Errf("%s:%d - Syntax error: Rewrite path must begin with '/'. Provided: '%s'", c.File(), c.Line(), c.Val())
}
case "ext": case "ext":
args1 := c.RemainingArgs() args1 := c.RemainingArgs()
if len(args1) == 0 { if len(args1) == 0 {
@ -94,20 +90,14 @@ func rewriteParse(c *caddy.Controller) ([]httpserver.HandlerConfig, error) {
if to == "" { if to == "" {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
if rule, err = NewComplexRule(base, pattern, to, ext, matcher); err != nil { if rule, err = NewComplexRule(base, pattern, to, ext, matcher); err != nil {
return nil, err return nil, err
} }
rules = append(rules, rule) rules = append(rules, rule)
// handle case of 2 arguments: "from to" // the only unhandled case is 2 and above
default: default:
// ensure rewrite path begins with / rule = NewSimpleRule(args[0], strings.Join(args[1:], " "))
topath := strings.Join(args[1:], " ")
if !strings.HasPrefix(topath, "/") {
return nil, c.Errf("%s:%d - Syntax error: Rewrite path must begin with '/'. Provided: '%s'", c.File(), c.Line(), c.Val())
}
rule = NewSimpleRule(args[0], topath)
rules = append(rules, rule) rules = append(rules, rule)
} }

10
caddyhttp/rewrite/setup_test.go
View File

@ -45,19 +45,15 @@ func TestRewriteParse(t *testing.T) {
SimpleRule{From: "/from", To: "/to"}, SimpleRule{From: "/from", To: "/to"},
}}, }},
{`rewrite /from /to {`rewrite /from /to
rewrite a /b`, false, []Rule{ rewrite a b`, false, []Rule{
SimpleRule{From: "/from", To: "/to"}, SimpleRule{From: "/from", To: "/to"},
SimpleRule{From: "a", To: "/b"}, SimpleRule{From: "a", To: "b"},
}}, }},
{`rewrite a b`, true, []Rule{}},
{`rewrite a`, true, []Rule{}}, {`rewrite a`, true, []Rule{}},
{`rewrite`, true, []Rule{}}, {`rewrite`, true, []Rule{}},
{`rewrite a b c`, true, []Rule{ {`rewrite a b c`, false, []Rule{
SimpleRule{From: "a", To: "b c"}, SimpleRule{From: "a", To: "b c"},
}}, }},
{`rewrite a /b c`, false, []Rule{
SimpleRule{From: "a", To: "/b c"},
}},
} }
for i, test := range simpleTests { for i, test := range simpleTests {