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
chore: reported code scanning issues (#9115)
Dylan Madisettif159ebdb0717
diff --git a/marimo/_server/api/endpoints/files.py b/marimo/_server/api/endpoints/files.pyindex 5ab118da2a..8890fc5211 100644--- a/marimo/_server/api/endpoints/files.py+++ b/marimo/_server/api/endpoints/files.py@@ -12,6 +12,7 @@ from marimo import _loggersfrom marimo._runtime.commands import RenameNotebookCommandfrom marimo._server.api.deps import AppStatefrom marimo._server.api.utils import parse_request+from marimo._server.files.path_validator import PathValidatorfrom marimo._server.models.models import (BaseResponse,CopyNotebookRequest,@@ -110,15 +111,21 @@ async def rename_file("""body = await parse_request(request, cls=RenameNotebookRequest)app_state = AppState(request)+ directory = app_state.session_manager.file_router.directory# Resolve relative filenames against the file router's directoryif not Path(body.filename).is_absolute():- directory = app_state.session_manager.file_router.directoryif directory:body.filename = str(Path(directory) / body.filename)filename = await abspath(body.filename)+ # Prevent path traversal: ensure target is inside the router's directory+ if directory:+ PathValidator().validate_inside_directory(+ Path(directory), Path(filename)+ )+app_state.require_current_session().put_control_request(RenameNotebookCommand(filename=filename),from_consumer_id=ConsumerId(app_state.require_current_session_id()),@@ -159,13 +166,19 @@ async def save("""app_state = AppState(request)body = await parse_request(request, cls=SaveNotebookRequest)+ directory = app_state.session_manager.file_router.directory# Resolve relative filenames against the file router's directoryif body.filename and not Path(body.filename).is_absolute():- directory = app_state.session_manager.file_router.directoryif directory:body.filename = str(Path(directory) / body.filename)+ # Prevent path traversal: ensure target is inside the router's directory+ if directory and body.filename:+ PathValidator().validate_inside_directory(+ Path(directory), Path(body.filename)+ )+session = app_state.require_current_session()contents = session.app_file_manager.save(body)@@ -217,6 +230,18 @@ async def copy(if body.destination and not Path(body.destination).is_absolute():body.destination = str(Path(directory) / body.destination)+ # Prevent path traversal: ensure source and destination are inside the router's directory+ if directory:+ validator = PathValidator()+ if body.source:+ validator.validate_inside_directory(+ Path(directory), Path(body.source)+ )+ if body.destination:+ validator.validate_inside_directory(+ Path(directory), Path(body.destination)+ )+session = app_state.require_current_session()contents = session.app_file_manager.copy(body)diff --git a/marimo/_server/api/endpoints/health.py b/marimo/_server/api/endpoints/health.pyindex 6b65e1c0c4..a371c4db82 100644--- a/marimo/_server/api/endpoints/health.py+++ b/marimo/_server/api/endpoints/health.py@@ -115,6 +115,7 @@ async def list_sessions(request: Request) -> JSONResponse:@router.get("/api/version")+@requires("read")async def version(request: Request) -> PlainTextResponse:"""responses:@@ -336,6 +337,7 @@ async def usage(request: Request) -> JSONResponse:@router.get("/api/status/connections")+@requires("read")async def connections(request: Request) -> JSONResponse:"""responses:diff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.pyindex ddc75ccdcc..95b83576a5 100644--- a/tests/_server/api/endpoints/test_files.py+++ b/tests/_server/api/endpoints/test_files.py@@ -390,6 +390,85 @@ def test_copy_file_with_relative_paths(client: TestClient) -> None:try_assert_n_times(5, _assert_contents)+@with_session(SESSION_ID)+def test_path_traversal_save_blocked(client: TestClient) -> None:+ """Save endpoint must not write outside the router's directory."""+ filename = get_session_manager(client).file_router.get_unique_file_key()+ assert filename+ path = Path(filename)+ directory = str(path.parent)+ file_router = get_session_manager(client).file_router++ with patch.object(+ type(file_router),+ "directory",+ new_callable=lambda: property(lambda _: directory),+ ):+ # Attempt to save outside the directory via path traversal+ traversal_path = str(path.parent.parent / "escaped.py")+ response = client.post(+ "/api/kernel/save",+ headers=HEADERS,+ json={+ "cellIds": ["1"],+ "codes": ["import marimo as mo"],+ "names": ["cell"],+ "configs": [{}],+ "filename": traversal_path,+ },+ )+ assert response.status_code == 403, response.text+++@with_session(SESSION_ID)+def test_path_traversal_rename_blocked(client: TestClient) -> None:+ """Rename endpoint must not move files outside the router's directory."""+ filename = get_session_manager(client).file_router.get_unique_file_key()+ assert filename+ path = Path(filename)+ directory = str(path.parent)+ file_router = get_session_manager(client).file_router++ with patch.object(+ type(file_router),+ "directory",+ new_callable=lambda: property(lambda _: directory),+ ):+ traversal_path = str(path.parent.parent / "escaped.py")+ response = client.post(+ "/api/kernel/rename",+ headers=HEADERS,+ json={"filename": traversal_path},+ )+ assert response.status_code == 403, response.text+++@with_session(SESSION_ID)+def test_path_traversal_copy_blocked(client: TestClient) -> None:+ """Copy endpoint must not write outside the router's directory."""+ filename = get_session_manager(client).file_router.get_unique_file_key()+ assert filename+ path = Path(filename)+ directory = str(path.parent)+ file_router = get_session_manager(client).file_router++ with patch.object(+ type(file_router),+ "directory",+ new_callable=lambda: property(lambda _: directory),+ ):+ traversal_dest = str(path.parent.parent / "escaped.py")+ response = client.post(+ "/api/kernel/copy",+ headers=HEADERS,+ json={+ "source": filename,+ "destination": traversal_dest,+ },+ )+ assert response.status_code == 403, response.text++@with_websocket_session(SESSION_ID)def test_rename_propagates(client: TestClient, websocket: WebSocketTestSessiondiff --git a/tests/_server/api/endpoints/test_health.py b/tests/_server/api/endpoints/test_health.pyindex 50b42733b5..18cabca95d 100644--- a/tests/_server/api/endpoints/test_health.py+++ b/tests/_server/api/endpoints/test_health.py@@ -43,7 +43,11 @@ def test_status(client: TestClient) -> None:def test_version(client: TestClient) -> None:+ # Unauthorizedresponse = client.get("/api/version")+ assert response.status_code == 401, response.text++ response = client.get("/api/version", headers=token_header())assert response.status_code == 200, response.textassert response.text == __version__@@ -75,8 +79,12 @@ def test_memory(client: TestClient) -> None:def test_connections(client: TestClient) -> None:+ # Unauthorizedresponse = client.get("/api/status/connections")- assert response.status_code == 200+ assert response.status_code == 401, response.text++ response = client.get("/api/status/connections", headers=token_header())+ assert response.status_code == 200, response.textassert response.json()["active"] == 0