Refactor handshake rate limiting to not store a Sleep type
#2915
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
In newer Tokio versions the `Sleep` type doesn't implement `Unpin`, so it's a little more complicated to use it. In this case it was easier to refactor the code to not store the `Sleep` type instead of wrapping it in a `Pin` type.
teor2345
approved these changes
Oct 21, 2021
There was a problem hiding this comment.
This looks good, it's a straightforward refactor that maintains the security conditions:
- if we don't connect to a peer, we don't add any wait time
- if we do connect to a peer, we wait at least
MIN_PEER_CONNECTION_INTERVALbefore the next peer - we don't have any really long delays
This is a very low risk change, so I'm happy to merge it now.
The docs say that sleep(duration) is:
Equivalent to
sleep_until(Instant::now() + duration).
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.
Motivation
This is part of the update to use Tokio version 1 (#2200), but can be merged separately.
In newer Tokio versions the
Sleeptype doesn't implementUnpin, so it's a little more complicated to use it.Solution
In this case it was easier to refactor the code to not store the
Sleeptype instead of wrapping it in aPintype.Review
Since this might be a security issue if not implemented correctly, I'd like @teor2345 to take a look at it.
Reviewer Checklist
Follow Up Work