Limit maximal size of incoming fragment. #252
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
bkchr
reviewed
Jan 16, 2019
| @@ -158,6 +158,9 @@ pub struct Settings { | |||
| /// The maximum length of outgoing frames. Messages longer than this will be fragmented. | |||
| /// Default: 65,535 | |||
| pub fragment_size: usize, | |||
| /// The maximum length of acceptable incoming frames. Messages longer than this will be rejected. | |||
| /// Default: unlimited | |||
| pub max_fragment_size: usize, | |||
There was a problem hiding this comment.
In the implementation you are using u64 and here usize? Why not use u64 everywhere?
There was a problem hiding this comment.
u64 is required by the Cursor API. I prefer usize in the settings for two reasons:
- Consistency with
fragment_size - It is restricted by the available memory anyway, so I think
usizedescribes that better. In the worst case we are going to be upcasting.
6 tasks
|
@housleyjk Any chance to get a review on this one? |
|
fwiw we've pushed |
|
Sorry, been quite busy with other stuff recently. Thanks for the PR. |
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.
Since frame size is allowed to be up to
2^64one can forge a frame that declares extremely large payload size.In case we haven't received enough data yet:
https://github.com/housleyjk/ws-rs/compare/master...tomusdrw:td-maxframe?expand=1#diff-8c1748e0d20c7a39978ef7656d9f39f4R326
we reset the cursor position and wait for more data in
in_buffer.By default the
in_bufferis allowed to grow indefinitely, so the server will go OOM at some point trying to read such a big frame.PR introduces additional setting
max_fragment_sizewhich defines maximal (sane) allowed frame payload size.