Skip to content

armgit / strix

Public Imported from GitHub
0

Open-source AI penetration testing tool to find and fix your app’s vulnerabilities.

fix(runtime): remove the extra-file staging dir on cleanup and failed bring-up

Ahmed Allam944274e12f44
diff --git a/strix/runtime/session_manager.py b/strix/runtime/session_manager.py
index d018f350..625e77dd 100644
--- a/strix/runtime/session_manager.py
+++ b/strix/runtime/session_manager.py
@@ -5,6 +5,7 @@ from __future__ import annotations
import asyncio
import logging
import os
+import shutil
import sys
import tempfile
from pathlib import Path
@@ -291,14 +292,14 @@ async def create_or_reuse(
backend_name = load_settings().runtime.backend
backend = get_backend(backend_name)
+ staging_dir: Path | None = None
if backend_supports_bind_mounts(backend_name):
bind_mounts = build_bind_mounts(local_sources)
entries: dict[str | Path, BaseEntry] = {}
if extra_files:
+ staging_dir = extra_file_staging_dir(scan_id)
bind_mounts.extend(
- build_extra_file_bind_mounts(
- extra_files, extra_file_staging_dir(scan_id), local_sources
- )
+ build_extra_file_bind_mounts(extra_files, staging_dir, local_sources)
)
else:
bind_mounts = []
@@ -334,12 +335,16 @@ async def create_or_reuse(
image,
)
report("Starting sandbox container")
- client, session = await backend(
- image=image,
- manifest=manifest,
- exposed_ports=(_CONTAINER_CAIDO_PORT,),
- bind_mounts=bind_mounts,
- )
+ try:
+ client, session = await backend(
+ image=image,
+ manifest=manifest,
+ exposed_ports=(_CONTAINER_CAIDO_PORT,),
+ bind_mounts=bind_mounts,
+ )
+ except BaseException:
+ _remove_staging_dir(staging_dir)
+ raise
report("Setting up the proxy")
caido_endpoint = await session.resolve_exposed_port(_CONTAINER_CAIDO_PORT)
@@ -366,12 +371,18 @@ async def create_or_reuse(
"client": client,
"session": session,
"caido_client": caido_client,
+ "extra_file_staging_dir": staging_dir,
}
_SESSION_CACHE[scan_id] = bundle
logger.info("Sandbox session for scan %s ready and cached", scan_id)
return bundle
+def _remove_staging_dir(staging_dir: Path | None) -> None:
+ if staging_dir is not None:
+ shutil.rmtree(staging_dir, ignore_errors=True)
+
+
async def cleanup(scan_id: str) -> None:
"""Tear down ``scan_id``'s container and drop its cache entry.
@@ -385,6 +396,8 @@ async def cleanup(scan_id: str) -> None:
logger.debug("cleanup(%s): no cached session", scan_id)
return
+ _remove_staging_dir(bundle.get("extra_file_staging_dir"))
+
caido_client = bundle.get("caido_client")
if caido_client is not None:
try:
diff --git a/tests/test_session_entries.py b/tests/test_session_entries.py
index 21cc915d..33e2e862 100644
--- a/tests/test_session_entries.py
+++ b/tests/test_session_entries.py
@@ -6,8 +6,10 @@ import tempfile
from pathlib import Path
from typing import Any
+import pytest
from agents.sandbox.entries import File, LocalDir
+from strix.runtime import session_manager
from strix.runtime.backends import (
_BACKENDS,
_BIND_MOUNT_BACKENDS,
@@ -336,6 +338,28 @@ def test_extra_file_staging_dir_sanitizes_the_scan_id() -> None:
assert staging.is_relative_to(Path(tempfile.gettempdir()))
+async def test_cleanup_removes_the_extra_file_staging_dir() -> None:
+ staging = extra_file_staging_dir("scan-staging-cleanup")
+ (staging / "0").mkdir()
+ (staging / "0" / "README.md").write_bytes(b"hi")
+
+ class _Client:
+ async def delete(self, _session: Any) -> None:
+ return None
+
+ session_manager._SESSION_CACHE["scan-staging-cleanup"] = {
+ "client": _Client(),
+ "session": object(),
+ "caido_client": None,
+ "extra_file_staging_dir": staging,
+ }
+
+ await session_manager.cleanup("scan-staging-cleanup")
+
+ assert not staging.exists()
+
+
def test_only_bind_mount_capable_backends_are_registered_as_such() -> None:
assert backend_supports_bind_mounts("docker")
assert not backend_supports_bind_mounts("e2b")