Fix x_forwarded_proto for websockets in proxy_headers.py
#2011
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
aminalaee
requested changes
Jun 22, 2023
| headers[b"x-forwarded-proto"].decode("latin1").strip() | ||
| ) | ||
| if scope["type"] == "websocket": | ||
| scope["scheme"] = ( |
There was a problem hiding this comment.
This line is missing a test coverage. Can you please add that?
There was a problem hiding this comment.
I know there are no unit tests, because I don't know how to write, and help wanted.
Can you give me some examples of how to do a websocket test client? It seems that httpx does not support it. #2012
There was a problem hiding this comment.
That issue is not related
3 tasks
|
Thanks @1997cui for the interest! :) |
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.
Summary
As discussed in #1933, the upstream proxies (i.e., Caddy) will always pass http or https in x_forwarded_proto, even if it is a WebSocket Upgrade request. However, storing the http or https in a WebSocket scope is not correct. In this pull request, I added some if statements to solve this issue.
I know there are no unit tests, because I don't know how to write, and help wanted.
This PR is based on #1934 based on suggestions from @Kludex and @aminalaee
Checklist