Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Origin header on proxied WebSocket requests #12583

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

treuherz
Copy link

Similar to CORS controls, WebSocket servers are often configured to check the Origin header of incoming requests. The config for the HTTP proxy overwrites requests' Origin header to prevent issues with CORS, but didn't previously do the same thing for WebSockets, as they are controlled by a different config key.

This Origin-limiting behaviour is recommended in RFC 6455 and is implemented in the Python websockets package, the Java websockets API and the Gorillas websocket package. I think it is common enough that c-r-a should support it out-of-the-box.

See https://github.com/treuherz/wstest for repro and test.

Fixes #10878

@treuherz treuherz requested a review from mrmckeb as a code owner July 11, 2022 10:22
@facebook-github-bot
Copy link

Hi @treuherz!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks!

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@treuherz
Copy link
Author

Looks like the previous fix wasn't sufficient to work in Chrome. I've added another change to fix it and have tested in Safari, Firefox and Chrome. I think this also now fixes #5280.

@treuherz
Copy link
Author

Rebased on top of current main

Similar to CORS controls, WebSocket servers are often (see below)
configured to check the Origin header of incoming requests. The config
for the HTTP proxy overwrites requests' Origin header to prevent issues
with CORS, but didn't previously do the same thing for WebSockets, as
they are controlled by a different config key.

Fixes facebook#10878
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proxying WebSocket requests is broken
2 participants