Skip to content

Fixed incorrect Sec-WebSocket-Origin header for v13, see #9134#9312

Merged
normanmaurer merged 1 commit intonetty:4.1from
amizurov:feature/fix_ws_client_handshaker13
Jul 12, 2019
Merged

Fixed incorrect Sec-WebSocket-Origin header for v13, see #9134#9312
normanmaurer merged 1 commit intonetty:4.1from
amizurov:feature/fix_ws_client_handshaker13

Conversation

@amizurov
Copy link
Copy Markdown
Contributor

@amizurov amizurov commented Jul 1, 2019

Motivation:

Based on https://tools.ietf.org/html/rfc6455#section-1.3 - for non-browser
clients, Origin header field may be sent if it makes sense in the context of those clients.

Modification:

Replace Sec-WebSocket-Origin to Origin

Result:

Fixes #9134 .

@netty-bot
Copy link
Copy Markdown

Can one of the admins verify this patch?

@normanmaurer normanmaurer requested a review from slandelle July 1, 2019 20:28
@normanmaurer
Copy link
Copy Markdown
Member

@netty-bot test this please

@normanmaurer
Copy link
Copy Markdown
Member

/cc @vietj

@normanmaurer
Copy link
Copy Markdown
Member

@slandelle ping...

@slandelle
Copy link
Copy Markdown
Contributor

LGTM

@normanmaurer normanmaurer merged commit be26f4e into netty:4.1 Jul 12, 2019
@normanmaurer
Copy link
Copy Markdown
Member

@amizurov thanks a lot!

@normanmaurer normanmaurer added this to the 4.1.38.Final milestone Jul 12, 2019
normanmaurer pushed a commit that referenced this pull request Jul 12, 2019
Motivation:

Based on https://tools.ietf.org/html/rfc6455#section-1.3 - for non-browser
clients, Origin header field may be sent if it makes sense in the context of those clients.

Modification:

Replace Sec-WebSocket-Origin to Origin

Result:

Fixes #9134 .
@marci74
Copy link
Copy Markdown

marci74 commented Aug 6, 2019

Hi,
we are using netty as a web socket client (through vert.x). In our tests we fake the "origin" header. This does not work anymore with version 4.1.38 since you always overwrite our custom the "origin" header. Could you please set the header conditionally (only if it does not already exist in the custom headers)?
Thanks.
Marc

@normanmaurer
Copy link
Copy Markdown
Member

normanmaurer commented Aug 6, 2019 via email

@amizurov
Copy link
Copy Markdown
Contributor Author

amizurov commented Aug 7, 2019

Hi guys, could you please check the #9435

@marci74
Copy link
Copy Markdown

marci74 commented Aug 8, 2019

@amizurov Looks good. Thank you very much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

WebSocketClientHandshaker13 Invalid Handshake

5 participants