Correctly handle non handshake commands when using SniHandler #4703
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
|
@trustin @nmittler @Scottmitch PTAL |
|
@ejona86 might be interested as well |
| offset += extensionLength; | ||
| } | ||
| break loop; | ||
| } else { |
There was a problem hiding this comment.
I think if you structure this the opposite way, you can get rid of the break loop above:
if (in.readableBytes() < packetLength) {
// client hello incomplete try again to decode once more data is ready.
return;
}
...
// Fall-throughThere was a problem hiding this comment.
you are right... let me fix this
Motivation: As we can only handle handshake commands to parse SNI we should try to skip alert and change cipher spec commands a few times before we fallback to use a default SslContext. Modifications: - Use default SslContext if no application data command was received - Use default SslContext if after 4 commands we not received a handshake command - Simplify code - Eliminate multiple volatile fields - Rename SslConstants to SslUtils - Share code between SslHandler and SniHandler by moving stuff to SslUtils Result: Correct handling of non handshake commands and cleaner code.
normanmaurer
force-pushed
the
sni_decode
branch
from
76d6187
to
36e1924
Compare
|
I wonder creating an extra object to reduce the number of volatile writes seems like an overkill to me. Besides that, looks good to me. :-) |
|
@trustin honestly the object is only created once and it seems more clean (as both fields just be updated together) so I would like to keep it like it is :) |
|
lgtm! |
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:
As we can only handle handshake commands to parse SNI we should try to skip alert and change cipher spec commands a few times before we fallback to use a default SslContext.
Modifications:
Result:
Correct handling of non handshake commands and cleaner code.