sandbox-cli 0.2.34__tar.gz → 0.2.36__tar.gz

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sandbox-cli
-Version: 0.2.34
+Version: 0.2.36
 Summary: Command line tool for interaction with sandboxes
 Project-URL: Homepage, https://github.com/Security-Experts-Community/sandbox-cli
 Project-URL: Documentation, https://security-experts-community.github.io/sandbox-cli

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandbox-cli"
-version = "0.2.34"
+version = "0.2.36"
 description = "Command line tool for interaction with sandboxes"
 readme = "README.md"
 requires-python = ">=3.11"

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/sandbox_cli/cli/downloader.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+import sys
 from collections.abc import Coroutine
 from http import HTTPStatus
 from pathlib import Path
@@ -11,6 +12,7 @@ import aiofiles
 import aiohttp
 import aiohttp.client_exceptions
 import orjson
+from colorama import init
 from cyclopts import Parameter
 from ptsandbox import Sandbox
 from ptsandbox.models import Artifact, SandboxBaseTaskResponse
@@ -182,6 +184,8 @@ async def download_command(
     Download any artifact from the sandbox.
     """
 
+    init() # colorama stuff for working on windows
+
     progress = Progress(
         SpinnerColumn(),
         TextColumn("{task.description}"),
@@ -233,19 +237,23 @@ async def download_command(
     async def create_task(sandbox: Sandbox, task_id: str) -> None:
         progress_task_id = progress.add_task(description=rf"\[[green1]{task_id}[/]] fetching info", start=True)
 
+        def finalize_progress() -> None:
+            progress.remove_task(task_id=progress_task_id)
+
         try:
             result = await sandbox.get_report(task_id=task_id)
         except aiohttp.client_exceptions.ClientResponseError as e:
             if e.status == HTTPStatus.NOT_FOUND:
-                console.warning(f"Not found information for {task_id}")
+                console.warning(f"Got 404 error for {task_id}")
+            finalize_progress()
             return
 
         if (report := result.get_long_report()) is None:
             console.warning(f"Not found information for {task_id}")
+            finalize_progress()
             return
 
-        progress.stop_task(task_id=progress_task_id)
-        progress.update(task_id=progress_task_id, visible=False)
+        finalize_progress()
 
         tasks.append(
             worker(
@@ -273,14 +281,16 @@ async def download_command(
         limit = 40 if count > 40 else count
         viewed, next_cursor = 0, ""
 
-        while viewed <= count:
-            response = await sandbox.get_tasks(query=query, limit=limit, next_cursor=next_cursor)
-
-            with progress:
+        with progress:
+            while viewed <= count:
+                response = await sandbox.get_tasks(query=query, limit=limit, next_cursor=next_cursor)
                 await asyncio.gather(*(create_task(sandbox, task.id) for task in response.tasks))
 
-            viewed += limit
-            next_cursor = response.next_cursor
+                viewed += limit
+                next_cursor = response.next_cursor
+
+        # clear last line
+        sys.stdout.write("\033[F\033[K")
 
     for task in tasks_id:
         sandbox, task_id = get_key_and_task(key, task)
@@ -292,6 +302,8 @@ async def download_command(
     with progress:
         await asyncio.gather(*tasks)
 
+    # clear last line
+    sys.stdout.write("\033[F\033[K")
 
 def download_email(
     emails: Annotated[

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/sandbox_cli/utils/downloader/__init__.py

@@ -139,7 +139,7 @@ async def download(
             if sandbox_result.details.sandbox is None:
                 continue
 
-            if sandbox_result.details.sandbox.image and (image_id := sandbox_result.details.sandbox.image.image_id):
+            if sandbox_result.details.sandbox.image and (image_id := sandbox_result.details.sandbox.image.image_id) and out_dir.parts[-1] != image_id:
                 output = out_dir / image_id
             else:
                 output = out_dir

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/sandbox_cli/utils/scanner/__init__.py

@@ -235,7 +235,7 @@ async def scan_internal(
     ) -> None:
         sandbox_arguments = SandboxArguments(
             type=ScanType.SCAN,
-            sandbox_key_name=key.name,
+            sandbox_key_name=key.name.get_secret_value(),
             sandbox_options=sandbox_options.sandbox,
         )
         save_scan_arguments(out_dir, sandbox_arguments)
@@ -245,7 +245,7 @@ async def scan_internal(
         # except Exception as ex:
         #     console.log(f"[cyan]{idx}[/] {file_path} Error: {ex!r}")
 
-    console.info(f"Using key: name={key.name} max_workers={key.max_workers}")
+    console.info(f"Using key: name={key.name.get_secret_value()} max_workers={key.max_workers}")
 
     tasks: list[Coroutine[Any, Any, None]] = []
     sandbox, sandbox_options, images = await _prepare_scan_options(

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/sandbox_cli/utils/scanner/advanced.py

@@ -327,7 +327,7 @@ async def scan_internal_advanced(
     ) -> None:
         sandbox_arguments = SandboxArguments(
             type=ScanType.SCAN_NEW,
-            sandbox_key_name=key.name,
+            sandbox_key_name=key.name.get_secret_value(),
             sandbox_options=sandbox_options,
         )
         save_scan_arguments(out_dir, sandbox_arguments)
@@ -337,7 +337,7 @@ async def scan_internal_advanced(
         # except Exception as ex:
         #     console.log(f"[cyan]{idx}[/] {file_path} Error: {ex!r}")
 
-    console.info(f"Using key: name={key.name} max_workers={key.max_workers}")
+    console.info(f"Using key: name={key.name.get_secret_value()} max_workers={key.max_workers}")
 
     tasks: list[Coroutine[Any, Any, None]] = []
     with progress:

{sandbox_cli-0.2.34 → sandbox_cli-0.2.36}/sandbox_cli/utils/scanner/rescan.py

@@ -236,14 +236,14 @@ async def rescan_internal(
 
         await process_trace(drakvuf_trace, tcpdump_pcap, trace, out_dir, idx)
 
-    console.info(f"Using key: name={key.name} max_workers={key.max_workers}")
+    console.info(f"Using key: name={key.name.get_secret_value()} max_workers={key.max_workers}")
 
     tasks: list[Coroutine[Any, Any, None]] = []
     with progress:
         sandbox, sandbox_options = await _prepare_rescan_options(progress, rules_dir, key, is_local)
         sandbox_arguments = SandboxArguments(
             type=ScanType.RE_SCAN,
-            sandbox_key_name=key.name,
+            sandbox_key_name=key.name.get_secret_value(),
             sandbox_options=sandbox_options.sandbox,
         )