fix(caddyfile): bump expansion limits #9
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A single maxSnippetExpansions of 1000 could be too low for some real world scenarios. Snippet-based configuration can be used broadly across large CoreDNS Corefiles. We cannot implement a pure “import depth” integer with the current splice-then-continue parser because imports are expanded by lexing and splicing tokens into the stream, not by recursive function calls. Instead, we introduce high default per-directive caps for snippet and file imports, keeping globs counted as one. Prevent trivial snippet self-import. Add tests that lower caps to validate failure on cycles and success with large glob imports. This should present a good enough middleground, instead of rewriting the parser. Signed-off-by: Ville Vesilehto <[email protected]>
yongtang
approved these changes
Sep 20, 2025
jdamick
pushed a commit
to jdamick/caddy
that referenced
this pull request
Sep 25, 2025
A single maxSnippetExpansions of 1000 could be too low for some real world scenarios. Snippet-based configuration can be used broadly across large CoreDNS Corefiles. We cannot implement a pure “import depth” integer with the current splice-then-continue parser because imports are expanded by lexing and splicing tokens into the stream, not by recursive function calls. Instead, we introduce high default per-directive caps for snippet and file imports, keeping globs counted as one. Prevent trivial snippet self-import. Add tests that lower caps to validate failure on cycles and success with large glob imports. This should present a good enough middleground, instead of rewriting the parser. Signed-off-by: Ville Vesilehto <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continues from #8 after I did some testing.
A single
maxSnippetExpansionsof 1000 could be too low for some real world scenarios. Snippet-based configuration can be used broadly across large CoreDNS Corefiles. We cannot implement a pure “import depth” integer with the current splice-then-continue parser - simply because imports are expanded by lexing and splicing tokens into the stream, not by recursive function calls.Instead, we introduce high default per-directive caps for snippet and file imports, keeping globs counted as one. Prevent trivial snippet self-import. Add tests that lower caps to validate failure on cycles and success with large glob imports.
This should present a generous enough middleground, instead of rewriting the parser.
cc: @miekg @yongtang