Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ratelimit not working with both headers and cidr matches #4377

Merged
merged 8 commits into from
Oct 21, 2024

Conversation

shawnh2
Copy link
Contributor

@shawnh2 shawnh2 commented Oct 1, 2024

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #4351

@shawnh2 shawnh2 requested a review from a team as a code owner October 1, 2024 04:22
Copy link

codecov bot commented Oct 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.85%. Comparing base (26ec49a) to head (6c2b20f).
Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4377      +/-   ##
==========================================
+ Coverage   65.83%   65.85%   +0.01%     
==========================================
  Files         203      203              
  Lines       30699    30700       +1     
==========================================
+ Hits        20212    20216       +4     
+ Misses       9335     9333       -2     
+ Partials     1152     1151       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

arkodg
arkodg previously approved these changes Oct 18, 2024
Copy link
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM thanks !

@arkodg arkodg requested review from a team October 18, 2024 02:08
zhaohuabing
zhaohuabing previously approved these changes Oct 18, 2024
Copy link
Member

@zhaohuabing zhaohuabing left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix! Could you also modify the headerMatch in the test and add an example in the comment to help future readers to better understand the code?

Signed-off-by: shawnh2 <shawnhxh@outlook.com>
Signed-off-by: shawnh2 <shawnhxh@outlook.com>
@shawnh2 shawnh2 dismissed stale reviews from zhaohuabing and arkodg via d7553b3 October 19, 2024 07:58
@shawnh2 shawnh2 requested review from arkodg, zhaohuabing and a team October 19, 2024 07:58
@shawnh2
Copy link
Contributor Author

shawnh2 commented Oct 20, 2024

/retest

@arkodg arkodg merged commit 66c0b51 into envoyproxy:main Oct 21, 2024
23 of 24 checks passed
@shawnh2 shawnh2 deleted the fix-rl branch October 22, 2024 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ratelimiting doesn't work with both clientSelectors (i.e. headers and sourceCIDR) enabled
3 participants