summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2020-09-16 22:01:22 -0400
committerGitHub <noreply@github.com>2020-09-16 20:01:22 -0600
commite3324aa6de6c6f8f9fc14757025bb15de4801dde (patch)
tree9640edc2de5489eac325472fc2f805f2c28522e0 /caddyconfig
parentd55d50b3b3a9a8e842bb25e1ee8468587cd346f4 (diff)
httpcaddyfile: Ensure handle_path is sorted equally to handle (#3676)
* httpcaddyfile: Ensure handle_path is sorted as equal to handle * httpcaddyfile: Make mutual exclusivity grouping deterministic (I hope) * httpcaddyfile: Add comment linking to the issue being fixed * httpcaddyfile: Typo fix, comment clarity Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Update caddyconfig/httpcaddyfile/httptype.go Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/httptype.go22
1 files changed, 21 insertions, 1 deletions
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
index f2d1568..a19a6fe 100644
--- a/caddyconfig/httpcaddyfile/httptype.go
+++ b/caddyconfig/httpcaddyfile/httptype.go
@@ -172,6 +172,15 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
if err != nil {
return nil, warnings, fmt.Errorf("parsing caddyfile tokens for '%s': %v", dir, err)
}
+
+ // As a special case, we want "handle_path" to be sorted
+ // at the same level as "handle", so we force them to use
+ // the same directive name after their parsing is complete.
+ // See https://github.com/caddyserver/caddy/issues/3675#issuecomment-678042377
+ if dir == "handle_path" {
+ dir = "handle"
+ }
+
for _, result := range results {
result.directive = dir
sb.pile[result.Class] = append(sb.pile[result.Class], result)
@@ -854,7 +863,18 @@ func buildSubroute(routes []ConfigValue, groupCounter counter) (*caddyhttp.Subro
// root directives would overwrite previously-matched ones; they should not cascade
"root": {},
}
- for meDir, info := range mutuallyExclusiveDirs {
+
+ // we need to deterministically loop over each of these directives
+ // in order to keep the group numbers consistent
+ keys := make([]string, 0, len(mutuallyExclusiveDirs))
+ for k := range mutuallyExclusiveDirs {
+ keys = append(keys, k)
+ }
+ sort.Strings(keys)
+
+ for _, meDir := range keys {
+ info := mutuallyExclusiveDirs[meDir]
+
// see how many instances of the directive there are
for _, r := range routes {
if r.directive == meDir {