Skip to content

websocket: set follow_redirects to False #2920

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.

Sign up for GitHub

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

Merged
bdarnell merged 2 commits into from
Sep 25, 2020
Merged

websocket: set follow_redirects to False #2920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c6056
websocket_test: test websocket_connect redirect raises exception
ploxiln Sep 22, 2020
3e13fd2
websocket: set follow_redirects to False
vivamexico Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tornado/test/websocket_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ def get(self):
self.write("ok")


class RedirectHandler(RequestHandler):
def get(self):
self.redirect("/echo")


class CloseReasonHandler(TestWebSocketHandler):
def open(self):
self.on_close_called = False
Expand Down Expand Up @@ -221,6 +226,7 @@ def get_app(self):
[
("/echo", EchoHandler, dict(close_future=self.close_future)),
("/non_ws", NonWebSocketHandler),
("/redirect", RedirectHandler),
("/header", HeaderHandler, dict(close_future=self.close_future)),
(
"/header_echo",
Expand Down Expand Up @@ -365,6 +371,11 @@ def test_websocket_http_success(self):
with self.assertRaises(WebSocketError):
yield self.ws_connect("/non_ws")

@gen_test
def test_websocket_http_redirect(self):
with self.assertRaises(HTTPError):
yield self.ws_connect("/redirect")

@gen_test
def test_websocket_network_fail(self):
sock, port = bind_unused_port()
Expand Down
3 changes: 3 additions & 0 deletions tornado/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,9 @@ def __init__(
"Sec-WebSocket-Extensions"
] = "permessage-deflate; client_max_window_bits"

# Websocket connection is currently unable to follow redirects
request.follow_redirects = False

self.tcp_client = TCPClient()
super().__init__(
None,
Expand Down