dryhack-mcp 2.2.0__tar.gz → 2.3.1__tar.gz

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dryhack-mcp
-Version: 2.2.0
+Version: 2.3.1
 Summary: DryHack-MCP - an MCP server providing offensive-security tooling (curl, python, shell, Playwright browser) and a scope-gated authorize engine for authorized penetration testing.
 Author: Afrizal F.A
 License: MIT License
@@ -36,6 +36,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mcp<2,>=1.2.0
+Requires-Dist: playwright>=1.40
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: ruff>=0.1; extra == "dev"
@@ -88,16 +89,21 @@ python3 -m pip install -e ".[dev]"
 
 ### Browser tool (Playwright)
 
-The `browser` tool needs the optional `browser` extra plus the Playwright
-browser binaries:
+Playwright is a **core dependency**, so a plain `pip install dryhack-mcp` /
+`uvx dryhack-mcp` already ships it — no extra needed. The browser *binaries*
+(Chromium/Firefox/WebKit) are not distributed via pip, so the first time the
+`browser` tool launches an engine it **auto-runs `playwright install <browser>`**
+if the binary is missing.
+
+To pre-install the binaries (optional, avoids the one-time first-use download):
 
 ```bash
-python3 -m pip install 'dryhack-mcp[browser]'
-playwright install        # or: playwright install chromium
+playwright install            # all engines
+playwright install chromium   # just chromium
 ```
 
-If Playwright is not installed, the `browser` tool returns an install hint
-instead of failing — the rest of the server keeps working.
+Auto-install is controlled by `DRYHACK_BROWSER_AUTO_INSTALL` (default on); set it
+to `0` to disable and manage browsers yourself.
 
 ## Run
 
@@ -181,6 +187,8 @@ Start the server separately with `dryhack-mcp --transport http`.
 | `DRYHACK_COMMAND_TIMEOUT` | `120` | Per-command timeout (seconds) |
 | `DRYHACK_WORKDIR` | cwd | Working directory for commands |
 | `DRYHACK_OUTPUT_LIMIT` | `65536` | Max stdout/stderr bytes captured |
+| `DRYHACK_BROWSER_AUTO_INSTALL` | `1` | Auto-download the browser binary on first use (`browser` tool) |
+| `DRYHACK_BROWSER_INSTALL_TIMEOUT` | `900` | Timeout (s) for the on-demand `playwright install` download |
 | `DRYHACK_HTTP_HOST` | `127.0.0.1` | Default HTTP bind host |
 | `DRYHACK_HTTP_PORT` | `8000` | Default HTTP bind port |
 
@@ -236,9 +244,11 @@ browser(action="goto", url="https://target.example/",
         init_script="Object.defineProperty(navigator,'webdriver',{get:()=>false})")
 ```
 
-Playwright runs in a dedicated worker thread (the MCP server owns the asyncio
-loop, and Playwright's sync API cannot run inside a live loop). The same
-authorized-use scope rules as the other tools apply.
+Playwright ships with dryhack-mcp and runs in a dedicated worker thread (the MCP
+server owns the asyncio loop, and Playwright's sync API cannot run inside a live
+loop). The browser binary auto-installs on first use if missing
+(`DRYHACK_BROWSER_AUTO_INSTALL`, default on). The same authorized-use scope
+rules as the other tools apply.
 
 ## authorize (per-call scope)
 

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/README.md

@@ -43,16 +43,21 @@ python3 -m pip install -e ".[dev]"
 
 ### Browser tool (Playwright)
 
-The `browser` tool needs the optional `browser` extra plus the Playwright
-browser binaries:
+Playwright is a **core dependency**, so a plain `pip install dryhack-mcp` /
+`uvx dryhack-mcp` already ships it — no extra needed. The browser *binaries*
+(Chromium/Firefox/WebKit) are not distributed via pip, so the first time the
+`browser` tool launches an engine it **auto-runs `playwright install <browser>`**
+if the binary is missing.
+
+To pre-install the binaries (optional, avoids the one-time first-use download):
 
 ```bash
-python3 -m pip install 'dryhack-mcp[browser]'
-playwright install        # or: playwright install chromium
+playwright install            # all engines
+playwright install chromium   # just chromium
 ```
 
-If Playwright is not installed, the `browser` tool returns an install hint
-instead of failing — the rest of the server keeps working.
+Auto-install is controlled by `DRYHACK_BROWSER_AUTO_INSTALL` (default on); set it
+to `0` to disable and manage browsers yourself.
 
 ## Run
 
@@ -136,6 +141,8 @@ Start the server separately with `dryhack-mcp --transport http`.
 | `DRYHACK_COMMAND_TIMEOUT` | `120` | Per-command timeout (seconds) |
 | `DRYHACK_WORKDIR` | cwd | Working directory for commands |
 | `DRYHACK_OUTPUT_LIMIT` | `65536` | Max stdout/stderr bytes captured |
+| `DRYHACK_BROWSER_AUTO_INSTALL` | `1` | Auto-download the browser binary on first use (`browser` tool) |
+| `DRYHACK_BROWSER_INSTALL_TIMEOUT` | `900` | Timeout (s) for the on-demand `playwright install` download |
 | `DRYHACK_HTTP_HOST` | `127.0.0.1` | Default HTTP bind host |
 | `DRYHACK_HTTP_PORT` | `8000` | Default HTTP bind port |
 
@@ -191,9 +198,11 @@ browser(action="goto", url="https://target.example/",
         init_script="Object.defineProperty(navigator,'webdriver',{get:()=>false})")
 ```
 
-Playwright runs in a dedicated worker thread (the MCP server owns the asyncio
-loop, and Playwright's sync API cannot run inside a live loop). The same
-authorized-use scope rules as the other tools apply.
+Playwright ships with dryhack-mcp and runs in a dedicated worker thread (the MCP
+server owns the asyncio loop, and Playwright's sync API cannot run inside a live
+loop). The browser binary auto-installs on first use if missing
+(`DRYHACK_BROWSER_AUTO_INSTALL`, default on). The same authorized-use scope
+rules as the other tools apply.
 
 ## authorize (per-call scope)
 

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/dryhack_mcp/__init__.py

@@ -1,3 +1,3 @@
 """DryHack-MCP: offensive-security MCP server for authorized penetration testing."""
 
-__version__ = "2.2.0"
+__version__ = "2.3.1"

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/dryhack_mcp/config.py

@@ -23,6 +23,22 @@ WORKDIR = _get("DRYHACK_WORKDIR", os.getcwd())
 OUTPUT_BYTE_LIMIT = int(_get("DRYHACK_OUTPUT_LIMIT", "65536") or "65536")
 
 
+# ---- Browser tool (Playwright) -----------------------------------------------
+# Auto-download the requested browser binary on first use if it is missing
+# (the binaries are not shipped via pip). Disable by setting to 0/false/no.
+BROWSER_AUTO_INSTALL = _get("DRYHACK_BROWSER_AUTO_INSTALL", "1").lower() not in (
+    "0",
+    "false",
+    "no",
+    "off",
+)
+
+# Timeout (seconds) for the on-demand `playwright install <browser>` download.
+BROWSER_INSTALL_TIMEOUT = int(
+    _get("DRYHACK_BROWSER_INSTALL_TIMEOUT", "900") or "900"
+)
+
+
 # ---- Transport ---------------------------------------------------------------
 # Default HTTP bind address when running in http mode.
 HTTP_HOST = _get("DRYHACK_HTTP_HOST", "127.0.0.1")

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/dryhack_mcp/tools/browser_tool.py

@@ -6,10 +6,13 @@ and exploitation: navigation, DOM interaction, arbitrary JavaScript injection
 file upload, cookie/header/storage manipulation, screenshots, PDF capture and
 multi-step action chains — all in a single MCP call.
 
-Playwright is an *optional* dependency (installed via the ``browser`` extra:
-``pip install 'dryhack-mcp[browser]'`` followed by ``playwright install``). It is
-imported lazily so the core server keeps depending only on ``mcp``; if it is not
-installed the tool returns an actionable install hint instead of crashing.
+Playwright is a bundled runtime dependency, so a plain ``pip install
+dryhack-mcp`` / ``uvx dryhack-mcp`` already ships it. The browser *binaries*
+(Chromium/Firefox/WebKit) are not distributed via pip, so on first use the tool
+auto-runs ``playwright install <browser>`` when the requested binary is missing
+(controlled by ``DRYHACK_BROWSER_AUTO_INSTALL``, default on). Playwright is
+still imported lazily and, if it is somehow absent, the tool returns an
+actionable install hint instead of crashing.
 
 Playwright's sync API cannot run inside a live asyncio event loop (the MCP
 server runs one), so every browser session is executed in a dedicated worker
@@ -424,6 +427,65 @@ def _build_context_options(session: Dict[str, Any]) -> Dict[str, Any]:
     return opts
 
 
+def _auto_install_browser(browser_name: str) -> Tuple[bool, str]:
+    """Best-effort ``playwright install <browser>`` for the current interpreter.
+
+    The browser binaries are not shipped via pip, so the first time a given
+    engine is used we download it on demand. Returns (ok, log_tail).
+    """
+    import subprocess
+    import sys
+
+    try:
+        proc = subprocess.run(
+            [sys.executable, "-m", "playwright", "install", browser_name],
+            capture_output=True,
+            text=True,
+            timeout=config.BROWSER_INSTALL_TIMEOUT,
+        )
+        log = ((proc.stdout or "") + (proc.stderr or "")).strip()
+        return proc.returncode == 0, log[-1500:]
+    except Exception as exc:  # noqa: BLE001 - report, don't crash
+        return False, f"{type(exc).__name__}: {exc}"
+
+
+def _launch_browser(
+    browser_type,
+    browser_name: str,
+    launch_kwargs: Dict[str, Any],
+    session: Optional[Dict[str, Any]] = None,
+):
+    """Launch the browser, auto-installing its binary on first use if missing.
+
+    On a successful on-demand install, records a human-readable note in
+    ``session["_install_note"]`` so the caller can surface the one-time download
+    in the tool output (otherwise the first call looks like a silent hang).
+    """
+    try:
+        return browser_type.launch(**launch_kwargs)
+    except Exception as exc:  # noqa: BLE001
+        msg = str(exc)
+        binary_missing = (
+            "Executable doesn't exist" in msg
+            or "playwright install" in msg.lower()
+            or "please run the following command" in msg.lower()
+        )
+        if binary_missing and config.BROWSER_AUTO_INSTALL:
+            ok, log = _auto_install_browser(browser_name)
+            if ok:
+                if session is not None:
+                    session["_install_note"] = (
+                        f"auto-installed the '{browser_name}' browser binary on "
+                        "first use (one-time download)"
+                    )
+                return browser_type.launch(**launch_kwargs)
+            raise RuntimeError(
+                f"{browser_name} binary missing and auto-install failed. "
+                f"Run `playwright install {browser_name}` manually.\n{log}"
+            ) from exc
+        raise
+
+
 def _run_session(
     steps: List[Dict[str, Any]],
     session: Dict[str, Any],
@@ -434,16 +496,19 @@ def _run_session(
     except ImportError:
         return (
             [],
-            "playwright is not installed. Install the optional extra:\n"
-            "  pip install 'dryhack-mcp[browser]'\n"
-            "  playwright install",
+            "playwright is not importable (it ships with dryhack-mcp). "
+            "Reinstall with:\n"
+            "  pip install --force-reinstall dryhack-mcp\n"
+            "or install directly:\n"
+            "  pip install 'playwright>=1.40' && playwright install",
         )
 
     results: List[Dict[str, Any]] = []
     default_timeout = session.get("timeout")
 
     with sync_playwright() as pw:
-        browser_type = getattr(pw, session.get("browser_type", "chromium"))
+        browser_name = session.get("browser_type", "chromium")
+        browser_type = getattr(pw, browser_name)
         launch_kwargs: Dict[str, Any] = {"headless": session.get("headless", True)}
         if session.get("slow_mo") is not None:
             launch_kwargs["slow_mo"] = session["slow_mo"]
@@ -454,7 +519,7 @@ def _run_session(
         if session.get("proxy") is not None:
             launch_kwargs["proxy"] = session["proxy"]
 
-        browser = browser_type.launch(**launch_kwargs)
+        browser = _launch_browser(browser_type, browser_name, launch_kwargs, session)
         try:
             context = browser.new_context(**_build_context_options(session))
             if default_timeout is not None:
@@ -510,8 +575,11 @@ def _run_session_threaded(
 
     thread = threading.Thread(target=_worker, daemon=True)
     thread.start()
-    # Generous ceiling so a per-step Playwright timeout fires first.
-    thread.join(timeout=(session.get("timeout") or config.COMMAND_TIMEOUT * 1000) / 1000 + 60)
+    # Generous ceiling so a per-step Playwright timeout fires first. The extra
+    # allowance covers a possible first-use `playwright install` download.
+    base = (session.get("timeout") or config.COMMAND_TIMEOUT * 1000) / 1000
+    install_allowance = config.BROWSER_INSTALL_TIMEOUT if config.BROWSER_AUTO_INSTALL else 60
+    thread.join(timeout=base + install_allowance)
     if thread.is_alive():
         return [], "browser session exceeded the overall time budget"
     return box.get("results", []), box.get("error")
@@ -637,6 +705,9 @@ def browser(
         f"$ browser[{session['browser_type']}, "
         f"headless={session['headless']}] {len(normalized)} step(s)"
     )
+    install_note = session.get("_install_note")
+    if install_note:
+        header = f"{header}\n[setup] {install_note}"
     if error:
         return f"{header}\n[error] {error}"
 

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/dryhack_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dryhack-mcp
-Version: 2.2.0
+Version: 2.3.1
 Summary: DryHack-MCP - an MCP server providing offensive-security tooling (curl, python, shell, Playwright browser) and a scope-gated authorize engine for authorized penetration testing.
 Author: Afrizal F.A
 License: MIT License
@@ -36,6 +36,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mcp<2,>=1.2.0
+Requires-Dist: playwright>=1.40
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: ruff>=0.1; extra == "dev"
@@ -88,16 +89,21 @@ python3 -m pip install -e ".[dev]"
 
 ### Browser tool (Playwright)
 
-The `browser` tool needs the optional `browser` extra plus the Playwright
-browser binaries:
+Playwright is a **core dependency**, so a plain `pip install dryhack-mcp` /
+`uvx dryhack-mcp` already ships it — no extra needed. The browser *binaries*
+(Chromium/Firefox/WebKit) are not distributed via pip, so the first time the
+`browser` tool launches an engine it **auto-runs `playwright install <browser>`**
+if the binary is missing.
+
+To pre-install the binaries (optional, avoids the one-time first-use download):
 
 ```bash
-python3 -m pip install 'dryhack-mcp[browser]'
-playwright install        # or: playwright install chromium
+playwright install            # all engines
+playwright install chromium   # just chromium
 ```
 
-If Playwright is not installed, the `browser` tool returns an install hint
-instead of failing — the rest of the server keeps working.
+Auto-install is controlled by `DRYHACK_BROWSER_AUTO_INSTALL` (default on); set it
+to `0` to disable and manage browsers yourself.
 
 ## Run
 
@@ -181,6 +187,8 @@ Start the server separately with `dryhack-mcp --transport http`.
 | `DRYHACK_COMMAND_TIMEOUT` | `120` | Per-command timeout (seconds) |
 | `DRYHACK_WORKDIR` | cwd | Working directory for commands |
 | `DRYHACK_OUTPUT_LIMIT` | `65536` | Max stdout/stderr bytes captured |
+| `DRYHACK_BROWSER_AUTO_INSTALL` | `1` | Auto-download the browser binary on first use (`browser` tool) |
+| `DRYHACK_BROWSER_INSTALL_TIMEOUT` | `900` | Timeout (s) for the on-demand `playwright install` download |
 | `DRYHACK_HTTP_HOST` | `127.0.0.1` | Default HTTP bind host |
 | `DRYHACK_HTTP_PORT` | `8000` | Default HTTP bind port |
 
@@ -236,9 +244,11 @@ browser(action="goto", url="https://target.example/",
         init_script="Object.defineProperty(navigator,'webdriver',{get:()=>false})")
 ```
 
-Playwright runs in a dedicated worker thread (the MCP server owns the asyncio
-loop, and Playwright's sync API cannot run inside a live loop). The same
-authorized-use scope rules as the other tools apply.
+Playwright ships with dryhack-mcp and runs in a dedicated worker thread (the MCP
+server owns the asyncio loop, and Playwright's sync API cannot run inside a live
+loop). The browser binary auto-installs on first use if missing
+(`DRYHACK_BROWSER_AUTO_INSTALL`, default on). The same authorized-use scope
+rules as the other tools apply.
 
 ## authorize (per-call scope)
 

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/dryhack_mcp.egg-info/requires.txt

@@ -1,4 +1,5 @@
 mcp<2,>=1.2.0
+playwright>=1.40
 
 [browser]
 playwright>=1.40

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dryhack-mcp"
-version = "2.2.0"
+version = "2.3.1"
 description = "DryHack-MCP - an MCP server providing offensive-security tooling (curl, python, shell, Playwright browser) and a scope-gated authorize engine for authorized penetration testing."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -19,10 +19,13 @@ classifiers = [
 ]
 dependencies = [
     "mcp>=1.2.0,<2",
+    "playwright>=1.40",
 ]
 
 [project.optional-dependencies]
 dev = ["pytest>=7.0", "ruff>=0.1"]
+# Kept as a back-compat alias; Playwright is now a core dependency, so the
+# `browser` tool works out of the box with a plain install.
 browser = ["playwright>=1.40"]
 
 [project.scripts]

{dryhack_mcp-2.2.0 → dryhack_mcp-2.3.1}/tests/test_browser.py

@@ -36,8 +36,8 @@ class BrowserToolTests(unittest.TestCase):
             result = browser(action="goto", url="https://example.com")
         finally:
             builtins.__import__ = real_import
-        self.assertIn("playwright is not installed", result)
-        self.assertIn("dryhack-mcp[browser]", result)
+        self.assertIn("playwright is not importable", result)
+        self.assertIn("playwright", result.lower())
 
     def test_single_action_maps_convenience_params(self):
         captured = {}
@@ -93,5 +93,74 @@ class BrowserToolTests(unittest.TestCase):
         )
 
 
+    def test_launch_auto_installs_missing_binary_then_retries(self):
+        calls = {"launch": 0, "install": 0}
+
+        class FakeBrowserType:
+            def launch(self, **kwargs):
+                calls["launch"] += 1
+                if calls["launch"] == 1:
+                    raise RuntimeError(
+                        "Executable doesn't exist at /path/chrome. "
+                        "Please run the following command: playwright install"
+                    )
+                return "browser-handle"
+
+        def fake_install(browser_name):
+            calls["install"] += 1
+            return True, "ok"
+
+        original = browser_tool._auto_install_browser
+        browser_tool._auto_install_browser = fake_install
+        original_flag = browser_tool.config.BROWSER_AUTO_INSTALL
+        browser_tool.config.BROWSER_AUTO_INSTALL = True
+        try:
+            handle = browser_tool._launch_browser(FakeBrowserType(), "chromium", {})
+        finally:
+            browser_tool._auto_install_browser = original
+            browser_tool.config.BROWSER_AUTO_INSTALL = original_flag
+
+        self.assertEqual(handle, "browser-handle")
+        self.assertEqual(calls["launch"], 2)  # failed once, retried once
+        self.assertEqual(calls["install"], 1)
+
+    def test_launch_records_install_note_in_session(self):
+        state = {"launch": 0}
+
+        class FakeBrowserType:
+            def launch(self, **kwargs):
+                state["launch"] += 1
+                if state["launch"] == 1:
+                    raise RuntimeError("Executable doesn't exist; playwright install")
+                return "handle"
+
+        session = {}
+        original = browser_tool._auto_install_browser
+        browser_tool._auto_install_browser = lambda name: (True, "ok")
+        original_flag = browser_tool.config.BROWSER_AUTO_INSTALL
+        browser_tool.config.BROWSER_AUTO_INSTALL = True
+        try:
+            browser_tool._launch_browser(FakeBrowserType(), "chromium", {}, session)
+        finally:
+            browser_tool._auto_install_browser = original
+            browser_tool.config.BROWSER_AUTO_INSTALL = original_flag
+
+        self.assertIn("_install_note", session)
+        self.assertIn("chromium", session["_install_note"])
+
+    def test_launch_does_not_autoinstall_when_disabled(self):
+        class FakeBrowserType:
+            def launch(self, **kwargs):
+                raise RuntimeError("Executable doesn't exist; playwright install")
+
+        original_flag = browser_tool.config.BROWSER_AUTO_INSTALL
+        browser_tool.config.BROWSER_AUTO_INSTALL = False
+        try:
+            with self.assertRaises(RuntimeError):
+                browser_tool._launch_browser(FakeBrowserType(), "chromium", {})
+        finally:
+            browser_tool.config.BROWSER_AUTO_INSTALL = original_flag
+
+
 if __name__ == "__main__":
     unittest.main()