Skip to content

Conversation

@s2010
Copy link
Contributor

@s2010 s2010 commented Jun 11, 2025

Solution

  • Added MultiRegexpFilter to handle multiple regex operations on same field
  • Enhanced FilterEncoder to automatically merge multiple regexp filters
  • Maintained full backward compatibility
  • Added security limits (max 50 operations, 1000 char patterns, 1MB input)

Changes

  • modules/logging/filters.go: Added MultiRegexpFilter with security validation
  • modules/logging/filterencoder.go: Enhanced parsing with automatic merging
  • modules/logging/filters_test.go: Added comprehensive tests
  • Added integration test

@CLAassistant
Copy link

CLAassistant commented Jun 11, 2025

CLA assistant check
All committers have signed the CLA.

@francislavoie
Copy link
Member

Nice, looks good! Don't forget to sign the CLA

@mholt
Copy link
Member

mholt commented Jun 13, 2025

I don't think I'm able to push to the branch, but if you sync up again the CI might pass.

@s2010
Copy link
Contributor Author

s2010 commented Jun 14, 2025

Hi @mholt I've resolved all the CI/CD pipeline issues that were preventing this PR from passing and synced up the branch.

s2010 added 4 commits October 16, 2025 01:02
…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 francislavoie force-pushed the fix/multiple-regexp-filters-7049 branch from 33e5cf7 to 4deed5b Compare October 16, 2025 05:02
@francislavoie francislavoie added this to the v2.11.0 milestone Oct 16, 2025
@francislavoie francislavoie added the bug 🐞 Something isn't working label Oct 16, 2025
Copy link
Member

@francislavoie francislavoie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Sorry for the delay!

@mholt mholt enabled auto-merge (squash) October 16, 2025 05:04
@mholt mholt merged commit f5f25d8 into caddyserver:master Oct 16, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug 🐞 Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants