Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-23 05:49:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

map: Remove infinite recursion check (#5094)

Browse source 
It was not accurate. Placeholders could be used in outputs that are
defined in the same mapping as long as that placeholder does not do the
same.

A more general solution would be to detect it at run-time in the
replacer directly, but that's a bit tedious
and will require allocations I think.

A better implementation of this check could still be done, but I don't
know if it would always be accurate. Could be a "best-effort" thing?
But I've also never heard of an actual case where someone configured
infinite recursion...
This commit is contained in:
Matt Holt 2022-09-29 12:46:38 -06:00 committed by GitHub
parent fcdbc69fab
commit 5e52bbb136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/caddyhttp/map/map.go
View file

@ -109,22 +109,13 @@ func (h *Handler) Validate() error {
} }
seen[input] = i seen[input] = i
// prevent infinite recursion
for _, out := range m.Outputs {
for _, dest := range h.Destinations {
if strings.Contains(caddy.ToString(out), dest) ||
strings.Contains(m.Input, dest) {
return fmt.Errorf("mapping %d requires value of {%s} to define value of {%s}: infinite recursion", i, dest, dest)
}
}
}
// ensure mappings have 1:1 output-to-destination correspondence // ensure mappings have 1:1 output-to-destination correspondence
nOut := len(m.Outputs) nOut := len(m.Outputs)
if nOut != nDest { if nOut != nDest {
return fmt.Errorf("mapping %d has %d outputs but there are %d destinations defined", i, nOut, nDest) return fmt.Errorf("mapping %d has %d outputs but there are %d destinations defined", i, nOut, nDest)
} }
} }
return nil return nil
} }