Websocket origin use port returned by bind_sockets (#10178)

bokeh · Jun 16, 2020 · bd947ea · bd947ea
1 parent 5bcb525
commit bd947ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/bokeh/server/server.py b/bokeh/server/server.py
@@ -395,7 +395,7 @@ def __init__(self, applications, io_loop=None, http_server_kwargs=None, **kwargs
         sockets, self._port = bind_sockets(opts.address, opts.port)
         self._address = opts.address
 
-        extra_websocket_origins = create_hosts_allowlist(opts.allow_websocket_origin, opts.port)
+        extra_websocket_origins = create_hosts_allowlist(opts.allow_websocket_origin, self.port)
         try:
             tornado_app = BokehTornado(applications,
                                        extra_websocket_origins=extra_websocket_origins,

diff --git a/tests/unit/bokeh/test_client_server.py b/tests/unit/bokeh/test_client_server.py
@@ -165,6 +165,10 @@ async def check_http_blocked_socket_blocked(self, server, origin=None):
     async def test_allow_websocket_origin(self, ManagedServerLoop) -> None:
         application = Application()
 
+        # allow good local origin with random port
+        with ManagedServerLoop(application, port=0) as server:
+            await self.check_http_ok_socket_ok(server, origin="http://localhost:%s" % server.port)
+
         # allow good origin
         with ManagedServerLoop(application, allow_websocket_origin=["example.com"]) as server:
             await self.check_http_ok_socket_ok(server, origin="http://example.com:80")