WebSocket: should compare 'Upgrade' header value with case insensitive #4617
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
makenowjust
force-pushed
the
fix/http-web-socket-handler/compare-upgrade-case-insensitive
branch
from
858af90
to
c2109db
Compare
RFC 6445, section 4.2.1 says clearly: "An Upgrade header field containing the value "websocket", treated as an ASCII case-insensitive value". https://tools.ietf.org/html/rfc6455#section-4.2.1 And now, we have `String#compare(other, case_insensitive: true)`.
makenowjust
force-pushed
the
fix/http-web-socket-handler/compare-upgrade-case-insensitive
branch
from
c2109db
to
40bb277
Compare
RX14
reviewed
Jun 24, 2017
| @@ -14,7 +14,7 @@ class HTTP::WebSocketHandler | |||
| end | |||
|
|
|||
| def call(context) | |||
| if context.request.headers["Upgrade"]? == "websocket" && context.request.headers.includes_word?("Connection", "Upgrade") | |||
| if context.request.headers["Upgrade"]?.try(&.compare("websocket", case_insensitive: true)) == 0 && context.request.headers.includes_word?("Connection", "Upgrade") | |||
There was a problem hiding this comment.
This is now a very long line of code, it might be good to refactor out upgrade_header = context.request.headers["Upgrade"]? and use if upgrade_header && upgrade_header.compare("websocket", case_insensitive: true) == 0 && context.request.headers.includes_word?("Connection", "Upgrade") but that's still rather long.
How about structuring this as a series of guards:
call_next(context) unless upgrade_header && upgrade_header.compare("websocket", case_insensitive: true) == 0
call_next(context) unless context.request.headers.includes_word?("Connection", "Upgrade")
RX14
approved these changes
Jun 24, 2017
|
One of the Kemal users exactly reported an issue related to this. I think this is an important issue and this PR solves 👍 |
|
IE11 and below are sending 'Upgrade' header with capitalized "Websocket" |
|
Any ETA for merging this? |
How about now? :) |
|
Thanks @makenowjust! Love this little, self-contained PRs with specs ❤️ |
makenowjust
deleted the
fix/http-web-socket-handler/compare-upgrade-case-insensitive
branch
Val
pushed a commit
to Val/crystal
that referenced
this pull request
Aug 12, 2017
crystal-lang#4617) RFC 6445, section 4.2.1 says clearly: "An Upgrade header field containing the value "websocket", treated as an ASCII case-insensitive value". https://tools.ietf.org/html/rfc6455#section-4.2.1 And now, we have `String#compare(other, case_insensitive: true)`.
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.
RFC 6445, section 4.2.1 says clearly:
And now, we have
String#compare(other, case_insensitive: true).