voidaccess 1.4.0__tar.gz → 1.4.2__tar.gz

{voidaccess-1.4.0 → voidaccess-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voidaccess
-Version: 1.4.0
+Version: 1.4.2
 Summary: Dark web OSINT CLI — automated threat intelligence from query to report
 Author: VoidAccess
 License-Expression: MIT

{voidaccess-1.4.0 → voidaccess-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "voidaccess"
-version = "1.4.0"
+version = "1.4.2"
 description = "Dark web OSINT CLI — automated threat intelligence from query to report"
 readme = "README.md"
 license = "MIT"

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voidaccess
-Version: 1.4.0
+Version: 1.4.2
 Summary: Dark web OSINT CLI — automated threat intelligence from query to report
 Author: VoidAccess
 License-Expression: MIT

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/__init__.py

@@ -1,3 +1,3 @@
 """voidaccess CLI — dark-web OSINT command-line interface."""
 
-__version__ = "1.3.0"
+__version__ = "1.4.1"

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/commands/export.py

@@ -39,7 +39,7 @@ def run(
         raise typer.Exit(code=1)
 
     payload, suffix = _render(fmt, inv_id, data)
-    out_path = output or _default_out_path(target, suffix)
+    out_path = output or _default_out_path(target, suffix, fmt=fmt)
     out_path = Path(out_path).expanduser()
     out_path.parent.mkdir(parents=True, exist_ok=True)
     if isinstance(payload, bytes):
@@ -150,9 +150,13 @@ def _flatten_for_md(data: dict) -> dict:
     return data
 
 
-def _default_out_path(target: str, suffix: str) -> Path:
+def _default_out_path(target: str, suffix: str, fmt: str = "") -> Path:
     p = Path(target).expanduser()
     if p.exists():
-        return p.with_suffix(suffix)
+        candidate = p.with_suffix(suffix)
+        # Avoid overwriting input when suffix is the same (e.g. stix/misp .json)
+        if candidate == p and fmt and fmt not in ("json",):
+            return p.parent / f"{p.stem}-{fmt}{suffix}"
+        return candidate
     from voidaccess_cli import config as cli_config
     return cli_config.get_output_dir() / f"{target}{suffix}"

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/commands/investigate.py

@@ -49,9 +49,28 @@ def run(
     from voidaccess_cli import config as cli_config
 
     cli_config.apply_env()
+
+    try:
+        import spacy
+        spacy.load("en_core_web_sm")
+    except Exception:
+        import subprocess, sys
+        from rich.console import Console
+        Console().print("  [dim]→[/dim] Installing spaCy NER model (one-time)...")
+        subprocess.run(
+            [sys.executable, "-m", "spacy", "download", "en_core_web_sm"],
+            capture_output=True,
+        )
+
     if quiet:
         logging.getLogger().setLevel(logging.ERROR)
 
+    from utils.content_safety import is_blocked_query
+    blocked, reason = is_blocked_query(query)
+    if blocked:
+        console.print(f"[red]Query blocked:[/red] {reason}")
+        raise typer.Exit(code=1)
+
     if not cli_config.is_configured() and not no_llm:
         console.print("[yellow]No LLM configured.[/yellow] Run [bold]voidaccess configure[/bold] first, or pass --no-llm.")
         raise typer.Exit(code=2)
@@ -382,6 +401,7 @@ async def _run_investigation(
         "query": query,
         "refined_query": refined,
         "model_used": chosen_model if llm is not None else None,
+        "status": "completed" if final_entities or scraped_pages else "completed_no_results",
         "created_at": datetime.now(timezone.utc).isoformat(),
         "summary": summary_text,
         "sources_used": sources_used,

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/commands/show.py

@@ -24,6 +24,7 @@ def run(
     target: Optional[str] = typer.Argument(
         None, help="Investigation id or path to a .json export"
     ),
+    no_tui: bool = typer.Option(False, "--no-tui", help="Print summary table without launching TUI (for scripted use)."),
 ) -> None:
     """Open the entity browser TUI."""
     from voidaccess_cli import config as cli_config
@@ -32,6 +33,9 @@ def run(
     data: Optional[dict] = None
 
     if target is None:
+        if no_tui:
+            console.print("[yellow]No target specified.[/yellow]")
+            raise typer.Exit(code=1)
         target = _pick_recent()
         if target is None:
             console.print("[yellow]No investigations found. Run `voidaccess investigate` first.[/yellow]")
@@ -49,11 +53,29 @@ def run(
             console.print(f"[red]Unknown investigation:[/red] {target}")
             raise typer.Exit(code=1)
 
+    if no_tui:
+        _print_summary(data)
+        return
+
     from voidaccess_cli.browser import EntityBrowserApp
     app = EntityBrowserApp(data=data)
     app.run()
 
 
+def _print_summary(data: dict) -> None:
+    inv = data.get("investigation") or data
+    entities = data.get("entities", [])
+    table = Table(title="Investigation summary")
+    table.add_column("Field", style="bold")
+    table.add_column("Value")
+    table.add_row("Query", str(inv.get("query") or ""))
+    table.add_row("Status", str(inv.get("status") or ""))
+    table.add_row("Entities", str(len(entities)))
+    table.add_row("Created", str(inv.get("created_at") or "")[:19])
+    table.add_row("Summary", (str(inv.get("summary") or "—"))[:120])
+    console.print(table)
+
+
 def _pick_recent() -> Optional[str]:
     from voidaccess_cli.adapters import sqlite as sqlite_adapter
     sqlite_adapter.init_db()

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/config.py

@@ -178,3 +178,9 @@ def apply_env(config: Optional[dict[str, Any]] = None) -> None:
     # Enrichment keys
     for k, v in (cfg.get("enrichment_keys") or {}).items():
         _set_env_if_present(k, v, clear_if_empty=True)
+
+    # Keyless APIs (ThreatFox/URLhaus/MalwareBazaar/abuse.ch) must never
+    # receive an empty auth header — clear any empty env remnant.
+    for key in ("ABUSECH_API_KEY", "VT_API_KEY", "OTX_API_KEY"):
+        if not os.environ.get(key):
+            os.environ.pop(key, None)

{voidaccess-1.4.0 → voidaccess-1.4.2}/voidaccess_cli/main.py

@@ -14,6 +14,7 @@ import sys
 # Force UTF-8 on Windows consoles so rich glyphs render reliably
 if sys.platform == "win32":
     os.environ.setdefault("PYTHONIOENCODING", "utf-8")
+    os.environ.setdefault("PYTHONUTF8", "1")
     try:
         sys.stdout.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]
         sys.stderr.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]
@@ -21,6 +22,7 @@ if sys.platform == "win32":
         pass
 
 import typer
+from rich.align import Align
 from rich.console import Console
 from rich.table import Table
 
@@ -30,13 +32,17 @@ from voidaccess_cli.commands import configure, enrich, export, investigate, show
 
 console = Console()
 BANNER = """\
-[color(183)]     ░░[color(141)]████████[color(183)]░░[/]
-[color(183)]   ░░[color(141)]████████████[color(183)]░░[/]
-[color(183)]  ░░[color(141)]██████████████[color(183)]░░[/]
-[color(183)]  ░░[color(141)]████[/]  [bright_white]void[/]  [color(141)]████[color(183)]░░[/]
-[color(183)]  ░░[color(141)]██████████████[color(183)]░░[/]
-[color(183)]   ░░[color(141)]████████████[color(183)]░░[/]
-[color(183)]     ░░[color(141)]████████[color(183)]░░[/]
+[color(183)]     ░░░░░[color(141)]█[color(183)]░░░░░[/]
+[color(183)]  ░░[color(141)]█████████████[color(183)]░░[/]
+[color(183)] ░[color(141)]█████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(141)]██████[/]  [bright_white]void[/]  [color(141)]███████[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)] ░[color(141)]█████████████████[color(183)]░[/]
+[color(183)]  ░░[color(141)]█████████████[color(183)]░░[/]
+[color(183)]     ░░░░░[color(141)]█[color(183)]░░░░░[/]
 [dim white]   dark web osint intelligence[/dim white]"""
 
 app = typer.Typer(
@@ -154,10 +160,16 @@ def version() -> None:
 
 
 def show_banner(console: Console) -> None:
-    if not sys.stdout.isatty():
+    import shutil
+    if os.environ.get("TERM") == "dumb":
+        return
+    if not sys.stdout.isatty() and "PS1" not in os.environ and os.name != "nt":
         return
     console.print()
-    console.print(BANNER, justify="center")
+    raw_line = "     oooooXooooo     "  # widest line, 21 chars
+    pad = max(0, (console.width - len(raw_line)) // 2)
+    for line in BANNER.split("\n"):
+        console.print(" " * pad + line)
     console.print()
 
 
@@ -171,7 +183,7 @@ def main(
 ) -> None:
     """Set env vars and render banner before command execution."""
     cli_config.apply_env()
-    if not no_banner and not ctx.invoked_subcommand:
+    if not no_banner and ctx.invoked_subcommand:
         show_banner(console)