sandbox-cli 0.2.40__tar.gz → 0.2.42__tar.gz

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sandbox-cli
-Version: 0.2.40
+Version: 0.2.42
 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
@@ -12,10 +12,10 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.11
 Requires-Dist: aiofiles>=24.1.0
-Requires-Dist: asyncssh>=2.21.0
+Requires-Dist: asyncssh>=2.21.1
 Requires-Dist: colorama>=0.4.6
-Requires-Dist: cryptography>=45.0.4
-Requires-Dist: cyclopts>=3.22.5
+Requires-Dist: cryptography>=46.0.1
+Requires-Dist: cyclopts>=3.24.0
 Requires-Dist: docker>=7.1.0
 Requires-Dist: ptsandbox>=5.0.6
 Requires-Dist: pyzipper>=0.3.6

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandbox-cli"
-version = "0.2.40"
+version = "0.2.42"
 description = "Command line tool for interaction with sandboxes"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -9,10 +9,10 @@ license-files = ["LICENSE", "NOTICE"]
 authors = [{ name = "Alexey Kolesnikov" }]
 dependencies = [
   "aiofiles>=24.1.0",
-  "asyncssh>=2.21.0",
+  "asyncssh>=2.21.1",
   "colorama>=0.4.6",
-  "cryptography>=45.0.4",
-  "cyclopts>=3.22.5",
+  "cryptography>=46.0.1",
+  "cyclopts>=3.24.0",
   "docker>=7.1.0",
   "ptsandbox>=5.0.6",
   "pyzipper>=0.3.6",

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/sandbox_cli/cli/reporter.py

@@ -69,7 +69,7 @@ def generate_report(
     data: list[TableData] = []
     match mode:
         case "md":
-            delimeter = " "
+            delimeter = "<br/>"
         case _:
             delimeter = "\n"
 
@@ -130,6 +130,7 @@ def generate_report(
                     "static": delimeter.join(extract_static(report)),
                     "memory": delimeter.join(extract_memory(report)),
                     "network": delimeter.join(extract_network_from_trace(corr_trace)),
+                    # "sandbox": f"[link={link}]{link}[/link]",
                     "sandbox": link,
                 }
             )
@@ -142,7 +143,7 @@ def generate_report(
             | --- | --- | --- | --- | --- | --- | --- |"""
             ).strip()
 
-            md_report_base = "|{sample}|{image}|{verdict}|{static}|{memory}|{network}|"
+            md_report_base = "|{sample}|{image}|{verdict}|{static}|{memory}|{network}|{sandbox}|"
             table_md = md_report_head + "\n"
             table_md += "\n".join(md_report_base.format(**d) for d in data)
             print(table_md)
@@ -157,6 +158,7 @@ def generate_report(
             table.add_column("Sandbox", overflow="fold")
 
             for d in data:
+                sandbox = f"[link={d['sandbox']}]{d['sandbox']}[/link]"
                 table.add_row(
                     d["sample"],
                     d["image"],
@@ -164,7 +166,8 @@ def generate_report(
                     d["static"],
                     d["memory"],
                     d["network"],
-                    d["sandbox"],
+                    # special case for sandbox link
+                    sandbox,
                 )
             console.print(table)
         case _:

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/sandbox_cli/cli/scanner/__init__.py

@@ -465,6 +465,14 @@ async def scan_new(
             validator=validators.Number(gt=0),
         ),
     ] = 300,
+    wait_timeout: Annotated[
+        int | None,
+        Parameter(
+            name=["--wait-timeout", "-W"],
+            help="Task waiting time in seconds (useful for heavy samples)",
+            validator=validators.Number(gt=0),
+        ),
+    ] = None,
     fake_name: Annotated[
         str | None,
         Parameter(
@@ -735,6 +743,7 @@ async def scan_new(
         vnc_mode=vnc_mode,
         extra_files=extra_files,
         upload_timeout=upload_timeout,
+        wait_timeout=wait_timeout,
         all=all,
         debug=debug,
         artifacts=artifacts,

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/sandbox_cli/utils/downloader/__init__.py

@@ -22,6 +22,17 @@ from sandbox_cli.console import console
 
 semaphore = asyncio.Semaphore(value=16)
 
+# At first glance, it's counter-intuitive, but ArtifactType can contain not only predefined fields in it, but also newly added.
+# This usually happens when a new feature is released in the sandbox.
+_KNOWN_ARTIFACT_TYPES = {
+    ArtifactType.ARCHIVE,
+    ArtifactType.COMPRESSED,
+    ArtifactType.EMAIL,
+    ArtifactType.FILE,
+    ArtifactType.PROCESS_DUMP,
+    ArtifactType.URL,
+}
+
 
 async def _save_artifact(
     scan_id: UUID,
@@ -202,6 +213,13 @@ async def download(
                             decompress=decompress,
                         )
 
+                    if all and artifact.type not in _KNOWN_ARTIFACT_TYPES:
+                        add_task(
+                            output / "other",
+                            artifact.file_info.sha256,
+                            artifact.file_info.file_uri,
+                        )
+
     if not tasks:
         console.info(f"Nothing to download from {report.scan_id}")
 

{sandbox_cli-0.2.40 → sandbox_cli-0.2.42}/sandbox_cli/utils/scanner/advanced.py

@@ -219,6 +219,7 @@ async def scan_internal_advanced(
     vnc_mode: VNCMode,
     extra_files: list[Path] | None,
     upload_timeout: int,
+    wait_timeout: int | None,
     all: bool,
     debug: bool,
     artifacts: bool,
@@ -264,6 +265,8 @@ async def scan_internal_advanced(
             task = next(t for t in progress.tasks if t.id == task_id)
 
             wait_time = sandbox_options.analysis_duration * 4 + (300 if sandbox_options.analysis_duration < 80 else 120)
+            if wait_timeout is not None:
+                wait_time = wait_timeout
 
             try:
                 scan_result = await sandbox.create_advanced_scan(