logging: fix multiple regexp filters on same field (fixes #7049)#7061
Merged
mholt merged 4 commits intocaddyserver:masterfrom Oct 16, 2025
Merged
logging: fix multiple regexp filters on same field (fixes #7049)#7061mholt merged 4 commits intocaddyserver:masterfrom
mholt merged 4 commits intocaddyserver:masterfrom
Conversation
|
|
Member
|
Nice, looks good! Don't forget to sign the CLA |
Member
|
I don't think I'm able to push to the branch, but if you sync up again the CI might pass. |
Contributor
Author
|
Hi @mholt I've resolved all the CI/CD pipeline issues that were preventing this PR from passing and synced up the branch. |
…s - Fix MultiRegexpFilter input size limit test by ensuring output doesn't exceed max length after each operation - All tests now pass and linter issues resolved
…JSON output to use Unicode escape sequence for ampersand character - Integration tests now pass
francislavoie
force-pushed
the
fix/multiple-regexp-filters-7049
branch
from
33e5cf7 to
4deed5b
Compare
francislavoie
approved these changes
Oct 16, 2025
Member
francislavoie
left a comment
francislavoie
left a comment
There was a problem hiding this comment.
Thanks! Sorry for the delay!
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Solution
MultiRegexpFilterto handle multiple regex operations on same fieldFilterEncoderto automatically merge multiple regexp filtersChanges
modules/logging/filters.go: AddedMultiRegexpFilterwith security validationmodules/logging/filterencoder.go: Enhanced parsing with automatic mergingmodules/logging/filters_test.go: Added comprehensive tests