Browse Source

httpcaddyfile: Fix panic when parsing route with matchers (#3746)

Fixes #3745
master
Francis Lavoie 4 years ago
committed by GitHub
parent
commit
be6daa5fd4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      caddyconfig/httpcaddyfile/directives.go
  2. 31
      caddytest/integration/caddyfile_adapt/matchers_in_route.txt

6
caddyconfig/httpcaddyfile/directives.go

@ -304,13 +304,17 @@ func parseSegmentAsConfig(h Helper) ([]ConfigValue, error) {
}
// find and extract any embedded matcher definitions in this scope
for i, seg := range segments {
for i := 0; i < len(segments); i++ {
seg := segments[i]
if strings.HasPrefix(seg.Directive(), matcherPrefix) {
// parse, then add the matcher to matcherDefs
err := parseMatcherDefinitions(caddyfile.NewDispenser(seg), matcherDefs)
if err != nil {
return nil, err
}
// remove the matcher segment (consumed), then step back the loop
segments = append(segments[:i], segments[i+1:]...)
i--
}
}

31
caddytest/integration/caddyfile_adapt/matchers_in_route.txt

@ -0,0 +1,31 @@
:80 {
route {
# unused matchers should not panic
# see https://github.com/caddyserver/caddy/issues/3745
@matcher1 path /path1
@matcher2 path /path2
}
}
----------
{
"apps": {
"http": {
"servers": {
"srv0": {
"listen": [
":80"
],
"routes": [
{
"handle": [
{
"handler": "subroute"
}
]
}
]
}
}
}
}
}
Loading…
Cancel
Save