serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

httpcaddyfile: Make root directive mutually exclusive

Browse source 
See https://caddy.community/t/caddyfile-and-v2/6766/22?u=matt
This commit is contained in:
Matthew Holt 2020-02-04 13:04:34 -07:00
parent 9639fe7d28
commit 490cd02f82
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
caddyconfig/httpcaddyfile/httptype.go
View file

@ -448,38 +448,13 @@ func buildSubroute(routes []ConfigValue, groupCounter counter) (*caddyhttp.Subro
subroute := new(caddyhttp.Subroute) subroute := new(caddyhttp.Subroute)
// get a group name for rewrite directives, if needed // some directives are mutually exclusive (only first matching
var rewriteGroupName string // instance should be evaluated); this is done by putting their
var rewriteCount int // routes in the same group
for _, r := range routes { mutuallyExclusiveDirs := map[string]*struct {
if r.directive == "rewrite" { count int
rewriteCount++ groupName string
if rewriteCount > 1 { }{
break
}
}
}
if rewriteCount > 1 {
rewriteGroupName = groupCounter.nextGroup()
}
// get a group name for handle blocks, if needed
var handleGroupName string
var handleCount int
for _, r := range routes {
if r.directive == "handle" {
handleCount++
if handleCount > 1 {
break
}
}
}
if handleCount > 1 {
handleGroupName = groupCounter.nextGroup()
}
// add all the routes piled in from directives
for _, r := range routes {
// as a special case, group rewrite directives so that they are mutually exclusive; // as a special case, group rewrite directives so that they are mutually exclusive;
// this means that only the first matching rewrite will be evaluated, and that's // this means that only the first matching rewrite will be evaluated, and that's
// probably a good thing, since there should never be a need to do more than one // probably a good thing, since there should never be a need to do more than one
@ -489,16 +464,37 @@ func buildSubroute(routes []ConfigValue, groupCounter counter) (*caddyhttp.Subro
// (We use this on the Caddy website, or at least we did once.) The first rewrite's // (We use this on the Caddy website, or at least we did once.) The first rewrite's
// result is also matched by the second rewrite, making the first rewrite pointless. // result is also matched by the second rewrite, making the first rewrite pointless.
// See issue #2959. // See issue #2959.
if r.directive == "rewrite" { "rewrite": {},
route := r.Value.(caddyhttp.Route)
route.Group = rewriteGroupName
r.Value = route
}
// handle blocks are also mutually exclusive by definition // handle blocks are also mutually exclusive by definition
if r.directive == "handle" { "handle": {},
// root just sets a variable, so if it was not mutually exclusive, intersecting
// root directives would overwrite previously-matched ones; they should not cascade
"root": {},
}
for meDir, info := range mutuallyExclusiveDirs {
// see how many instances of the directive there are
for _, r := range routes {
if r.directive == meDir {
info.count++
if info.count > 1 {
break
}
}
}
// if there is more than one, put them in a group
if info.count > 1 {
info.groupName = groupCounter.nextGroup()
}
}
// add all the routes piled in from directives
for _, r := range routes {
// put this route into a group if it is mutually exclusive
if info, ok := mutuallyExclusiveDirs[r.directive]; ok {
route := r.Value.(caddyhttp.Route) route := r.Value.(caddyhttp.Route)
route.Group = handleGroupName route.Group = info.groupName
r.Value = route r.Value = route
} }