Fix #8067 Use nanotime for DosFilter rate tracker #8082
Merged
Conversation
This file contains 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
Use nano time to avoid false positives when wall clock changes.
lachlan-roberts
requested changes
Jun 1, 2022
| @@ -1235,7 +1235,7 @@ public OverLimit isRateExceeded(long now) | |||
| } | |||
|
|
|||
| long rate = (now - last); | |||
| if (rate < 1000L) | |||
| if (TimeUnit.NANOSECONDS.toSeconds(rate) < 1L) | |||
| { | |||
| return new Overage(Duration.ofMillis(rate), _maxRequestsPerSecond); | |||
There was a problem hiding this comment.
Why is this still using Duration.ofMillis ?
| @@ -326,7 +326,7 @@ protected void doFilter(HttpServletRequest request, HttpServletResponse response | |||
| tracker = getRateTracker(request); | |||
|
|
|||
| // Calculate the rate and check if it is over the allowed limit | |||
| final OverLimit overLimit = tracker.isRateExceeded(System.currentTimeMillis()); | |||
| final OverLimit overLimit = tracker.isRateExceeded(System.nanoTime()); | |||
There was a problem hiding this comment.
Can you update the javadoc of isRateExceeded. It specifies that the value is in ms.
now the time now (in milliseconds)
updates from review
lorban
previously approved these changes
Jun 3, 2022
| @@ -1216,7 +1216,7 @@ public RateTracker(ServletContext context, String filterName, String id, RateTyp | |||
| } | |||
|
|
|||
| /** | |||
| * @param now the time now (in milliseconds) | |||
| * @param now the time now (in nanoseconds) | |||
There was a problem hiding this comment.
Could you please mention elapsed time or something in the javadoc as a hint that nanoTime() should be used instead of currentTimeMillis()?
olamy
previously approved these changes
Jun 3, 2022
sbordet
previously approved these changes
Jun 3, 2022
|
@lachlan-roberts can you rereview to remove your objection. |
Jetty 9.4.47 - 🧊 FROZEN 🥶
automation
moved this from Review in progress
to Reviewer approved
Jun 5, 2022
lachlan-roberts
approved these changes
Jun 5, 2022
|
I think the CI failure is some kind of CI problem. Distribution tests work locally |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use nano time to avoid false positives when wall clock changes.