A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: re-encode WebSocket proxy query params so spaces use %20 (#9041) (#9064)
Myles Scolnick0579862891d7
diff --git a/marimo/_server/api/middleware.py b/marimo/_server/api/middleware.pyindex 4db2bf6313..6a5ab8d0d6 100644--- a/marimo/_server/api/middleware.py+++ b/marimo/_server/api/middleware.py@@ -14,7 +14,7 @@ from typing import (Optional,Union,)-from urllib.parse import urljoin, urlparse+from urllib.parse import quote, urljoin, urlparseimport starlette.status as statusfrom starlette.authentication import (@@ -511,7 +511,13 @@ class ProxyMiddleware:try:original_params = websocket.query_paramsif original_params:- ws_url = f"{ws_url}?{'&'.join(f'{k}={v}' for k, v in original_params.items())}"+ # Re-encode query params from Starlette's already-decoded+ # values so spaces become %20 while preserving literal plus+ # signs instead of incorrectly treating them as spaces.+ encoded_params = [+ (k, quote(v)) for k, v in original_params.items()+ ]+ ws_url = f"{ws_url}?{'&'.join(f'{k}={v}' for k, v in encoded_params)}"await websocket.accept()# Try to connect to the upstream WebSocket with retriesdiff --git a/tests/_server/api/test_middleware.py b/tests/_server/api/test_middleware.pyindex fe5220c17a..8eb6e7049e 100644--- a/tests/_server/api/test_middleware.py+++ b/tests/_server/api/test_middleware.py@@ -654,6 +654,44 @@ class TestProxyMiddleware:await middleware(scope, None, None)assert proxy_calls[-1] == "wss://example.com/proxy/test"+ def test_proxy_websocket_query_params_space_encoding(self) -> None:+ """Spaces in query params encoded as '+' are re-encoded as '%20'.++ Starlette/browsers may encode spaces as '+' in query strings+ (application/x-www-form-urlencoded), but upstream servers like+ python-lsp-server expect percent-encoding (%20).+ See: https://github.com/marimo-team/marimo/issues/9041+ """+ from urllib.parse import quote++ from starlette.datastructures import QueryParams++ def _encode_params(query_string: bytes) -> str:+ """Reproduce the encoding logic from _proxy_websocket."""+ params = QueryParams(query_string.decode())+ encoded = [(k, quote(v)) for k, v in params.items()]+ return "&".join(f"{k}={v}" for k, v in encoded)++ # '+' in query string should be converted to %20+ result = _encode_params(b"file=my+file+name.py")+ assert result == "file=my%20file%20name.py"++ # Already percent-encoded spaces should stay as %20+ result = _encode_params(b"file=my%20file%20name.py")+ assert result == "file=my%20file%20name.py"++ # Params without spaces should pass through unchanged+ result = _encode_params(b"file=simple.py&mode=edit")+ assert result == "file=simple.py&mode=edit"++ # Path-like values: slashes are preserved (quote's default safe='/')+ result = _encode_params(b"file=/path/to/my+file.py")+ assert result == "file=/path/to/my%20file.py"++ # Literal plus signs (%2B) should be preserved, not turned into spaces+ result = _encode_params(b"file=a%2Bb.py")+ assert result == "file=a%2Bb.py"+def _mock_lsp_server(server_id: str, port: int):"""Helper to create a mock LSP server."""