github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

redir: Do not count multiple rules with if statements as duplicates

Browse Source 
This allows you to have multiple redir directives conditioned solely
upon if statements, without regard to path.
This commit is contained in:
Matthew Holt 2017-09-28 11:41:11 -06:00
parent baf6db5b57
commit f9cba03d25
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddyhttp/httpserver/condition.go
View File

@ -40,6 +40,7 @@ func SetupIfMatcher(controller *caddy.Controller) (RequestMatcher, error) {
return matcher, err return matcher, err
} }
matcher.ifs = append(matcher.ifs, ifc) matcher.ifs = append(matcher.ifs, ifc)
matcher.Enabled = true
case "if_op": case "if_op":
if !c.NextArg() { if !c.NextArg() {
return matcher, c.ArgErr() return matcher, c.ArgErr()
@ -155,8 +156,9 @@ func (i ifCond) True(r *http.Request) bool {
// IfMatcher is a RequestMatcher for 'if' conditions. // IfMatcher is a RequestMatcher for 'if' conditions.
type IfMatcher struct { type IfMatcher struct {
ifs []ifCond // list of If Enabled bool // if true, matcher has been configured; otherwise it's no-op
isOr bool // if true, conditions are 'or' instead of 'and' ifs []ifCond // list of If
isOr bool // if true, conditions are 'or' instead of 'and'
} }
// Match satisfies RequestMatcher interface. // Match satisfies RequestMatcher interface.

9
caddyhttp/redirect/setup.go
View File

@ -101,9 +101,12 @@ func redirParse(c *caddy.Controller) ([]Rule, error) {
return c.Err("'from' and 'to' values of redirect rule cannot be the same") return c.Err("'from' and 'to' values of redirect rule cannot be the same")
} }
for _, otherRule := range redirects { // prevent obvious duplicates (rules with if statements exempt)
if otherRule.FromPath == rule.FromPath { if ifm, ok := rule.RequestMatcher.(httpserver.IfMatcher); !ok || !ifm.Enabled {
return c.Errf("rule with duplicate 'from' value: %s -> %s", otherRule.FromPath, otherRule.To) for _, otherRule := range redirects {
if otherRule.FromPath == rule.FromPath {
return c.Errf("rule with duplicate 'from' value: %s -> %s", otherRule.FromPath, otherRule.To)
}
} }
} }