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: additional validation (#8162)
Dylan Madisetti78800407bb05
diff --git a/marimo/_server/api/endpoints/mpl.py b/marimo/_server/api/endpoints/mpl.pyindex b4512977bf..449a254351 100644--- a/marimo/_server/api/endpoints/mpl.py+++ b/marimo/_server/api/endpoints/mpl.py@@ -17,6 +17,7 @@ if TYPE_CHECKING:from marimo import _loggers+from marimo._server.api.auth import validate_authfrom marimo._server.router import APIRouterLOGGER = _loggers.marimo_logger()@@ -132,6 +133,14 @@ async def _mpl_handler("""from starlette.responses import Response+ # Validate authentication before proxying - prevents SSRF+ if not validate_auth(request):+ return Response(+ content="Unauthorized",+ status_code=401,+ media_type="text/plain",+ )+# Proxy to matplotlib server# Determine the target portport = figure_endpoints.get(figurenum, None)@@ -228,8 +237,12 @@ async def mpl_handler(request: Request) -> Response:async def mpl_websocket(websocket: WebSocket) -> None:"""Proxy WebSocket connections to matplotlib server."""global figure_endpoints- port = str(websocket.path_params["port"])+ # Only authenticated users can register figure->port mappings+ if not validate_auth(websocket):+ await websocket.close(code=1008, reason="Unauthorized")+ return+ port = str(websocket.path_params["port"])await websocket.accept()# Construct target WebSocket URL with query parametersdiff --git a/tests/_server/api/endpoints/test_mpl_endpoints.py b/tests/_server/api/endpoints/test_mpl_endpoints.pyindex eca4e07167..b7bd3b455d 100644--- a/tests/_server/api/endpoints/test_mpl_endpoints.py+++ b/tests/_server/api/endpoints/test_mpl_endpoints.py@@ -21,102 +21,160 @@ class TestMatplotlibProxyEndpoints:"""Clean up after each test."""figure_endpoints.clear()+ @staticmethod+ def test_http_requires_auth(client: TestClient) -> None:+ """Test that HTTP proxy requires authentication."""+ figure_endpoints[1] = "8888"++ # Mock validate_auth to return False (unauthenticated)+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth",+ return_value=False,+ ):+ response = client.get("/mpl/1/test_path")+ assert response.status_code == 401, response.text+ assert "Unauthorized" in response.text+@staticmethoddef test_unauthorized_figure_returns_403(client: TestClient) -> None:"""Test that accessing unregistered figure returns 403."""- response = client.get("/mpl/999/some_path")- assert response.status_code == 403, response.text- assert "Unauthorized" in response.text+ # Mock auth to pass, but figure not registered+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ response = client.get("/mpl/999/some_path")+ assert response.status_code == 403, response.text+ assert "Unauthorized" in response.text@staticmethoddef test_connection_error_returns_503(client: TestClient) -> None:"""Test connection failure returns 503."""figure_endpoints[1] = "8888"- with patch("urllib.request.urlopen") as mock_urlopen:- from urllib.error import URLError+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ with patch("urllib.request.urlopen") as mock_urlopen:+ from urllib.error import URLError- mock_urlopen.side_effect = URLError("Connection refused")- response = client.get("/mpl/1/test_path")- assert response.status_code == 503, response.text- assert "Matplotlib server is not available" in response.text+ mock_urlopen.side_effect = URLError("Connection refused")+ response = client.get("/mpl/1/test_path")+ assert response.status_code == 503, response.text+ assert "Matplotlib server is not available" in response.text@staticmethoddef test_successful_proxy(client: TestClient) -> None:"""Test successful proxying to matplotlib server."""figure_endpoints[1] = "8888"- with patch("urllib.request.urlopen") as mock_urlopen:- mock_response = MagicMock()- mock_response.status = 200- mock_response.headers = {"content-type": "text/html"}- mock_response.read.return_value = b"<html>Success</html>"- mock_urlopen.return_value.__enter__.return_value = mock_response-- response = client.get("/mpl/1/test")- assert response.status_code == 200, response.text- assert response.text == "<html>Success</html>"+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ with patch("urllib.request.urlopen") as mock_urlopen:+ mock_response = MagicMock()+ mock_response.status = 200+ mock_response.headers = {"content-type": "text/html"}+ mock_response.read.return_value = b"<html>Success</html>"+ mock_urlopen.return_value.__enter__.return_value = (+ mock_response+ )++ response = client.get("/mpl/1/test")+ assert response.status_code == 200, response.text+ assert response.text == "<html>Success</html>"@staticmethoddef test_query_params_forwarded(client: TestClient) -> None:"""Test query parameters are forwarded to matplotlib server."""figure_endpoints[1] = "8888"- with patch("urllib.request.urlopen") as mock_urlopen:- mock_response = MagicMock()- mock_response.status = 200- mock_response.headers = {}- mock_response.read.return_value = b""- mock_urlopen.return_value.__enter__.return_value = mock_response+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ with patch("urllib.request.urlopen") as mock_urlopen:+ mock_response = MagicMock()+ mock_response.status = 200+ mock_response.headers = {}+ mock_response.read.return_value = b""+ mock_urlopen.return_value.__enter__.return_value = (+ mock_response+ )- client.get("/mpl/1/test?param1=value1¶m2=value2")+ client.get("/mpl/1/test?param1=value1¶m2=value2")- request_obj = mock_urlopen.call_args[0][0]- assert "param1=value1" in request_obj.full_url- assert "param2=value2" in request_obj.full_url+ request_obj = mock_urlopen.call_args[0][0]+ assert "param1=value1" in request_obj.full_url+ assert "param2=value2" in request_obj.full_url@staticmethoddef test_headers_filtered(client: TestClient) -> None:"""Test that problematic headers (host, content-length) are filtered."""figure_endpoints[1] = "8888"- with patch("urllib.request.urlopen") as mock_urlopen:- mock_response = MagicMock()- mock_response.status = 200- mock_response.headers = {}- mock_response.read.return_value = b""- mock_urlopen.return_value.__enter__.return_value = mock_response+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ with patch("urllib.request.urlopen") as mock_urlopen:+ mock_response = MagicMock()+ mock_response.status = 200+ mock_response.headers = {}+ mock_response.read.return_value = b""+ mock_urlopen.return_value.__enter__.return_value = (+ mock_response+ )- client.get("/mpl/1/test")+ client.get("/mpl/1/test")- request_obj = mock_urlopen.call_args[0][0]- assert "Host" not in request_obj.headers- assert "Content-length" not in request_obj.headers+ request_obj = mock_urlopen.call_args[0][0]+ assert "Host" not in request_obj.headers+ assert "Content-length" not in request_obj.headers@staticmethod- def test_websocket_registers_figure(client: TestClient) -> None:- """Test that WebSocket connection registers figure endpoint."""+ def test_websocket_requires_auth(client: TestClient) -> None:+ """Test that WebSocket connection requires authentication."""from starlette.websockets import WebSocketDisconnect- with patch("websockets.connect") as mock_connect:- mock_ws = MagicMock()- mock_context = MagicMock()- mock_context.__aenter__ = AsyncMock(return_value=mock_ws)- mock_context.__aexit__ = AsyncMock(return_value=None)- mock_connect.return_value = mock_context-- async def mock_iter():- return- yield-- mock_ws.__aiter__ = mock_iter-+ # Mock validate_auth to return False (unauthenticated)+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth",+ return_value=False,+ ):try:- with client.websocket_connect("/mpl/8888/ws?figure=123"):+ with client.websocket_connect("/mpl/8888/ws"):passexcept WebSocketDisconnect:+ # Expected - connection should be rejectedpass- # Verify figure was registered- assert 123 in figure_endpoints- assert figure_endpoints[123] == "8888"+ @staticmethod+ def test_websocket_authenticated_connects(client: TestClient) -> None:+ """Test that authenticated WebSocket connection succeeds."""+ from starlette.websockets import WebSocketDisconnect++ # Mock validate_auth to return True (authenticated)+ with patch(+ "marimo._server.api.endpoints.mpl.validate_auth", return_value=True+ ):+ with patch("websockets.connect") as mock_connect:+ mock_ws = MagicMock()+ mock_context = MagicMock()+ mock_context.__aenter__ = AsyncMock(return_value=mock_ws)+ mock_context.__aexit__ = AsyncMock(return_value=None)+ mock_connect.return_value = mock_context++ async def mock_iter():+ return+ yield++ mock_ws.__aiter__ = mock_iter++ try:+ with client.websocket_connect("/mpl/8888/ws?figure=123"):+ pass+ except WebSocketDisconnect:+ pass++ # Verify websockets.connect was called with correct port+ mock_connect.assert_called()+ call_url = mock_connect.call_args[0][0]+ assert "localhost:8888" in call_url