pentool 0.2.1__tar.gz → 0.2.2__tar.gz

{pentool-0.2.1 → pentool-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pentool
-Version: 0.2.1
+Version: 0.2.2
 Summary: Modern Web Pentesting TUI - Professional security testing tool
 Author-email: Pentool Team <dev@pentool.pro>
 License: AGPL-3.0

{pentool-0.2.1 → pentool-0.2.2}/pentool/__init__.py

@@ -1,6 +1,6 @@
 """Pentool — professional web security testing toolkit with Textual TUI."""
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __author__ = "pentool"
 
 

{pentool-0.2.1 → pentool-0.2.2}/pentool/cli/main.py

@@ -126,6 +126,7 @@ def update_cmd(check_only: bool) -> None:
         click.echo("Upgrading via pip...")
         if do_pip_upgrade():
             click.echo("Upgrade successful. Restart Pentool to use the new version.")
+            _sync_pro_package_after_upgrade()
         else:
             click.echo(
                 "pip upgrade failed. You can update manually:\n"
@@ -135,6 +136,32 @@ def update_cmd(check_only: bool) -> None:
             raise SystemExit(1)
 
 
+def _sync_pro_package_after_upgrade() -> None:
+    """Re-download the PRO package too, if one is active on this machine.
+
+    `pip install --upgrade pentool` only touches the FREE package — the PRO
+    package lives separately in ~/.pentool/pro/ and is otherwise only ever
+    (re)downloaded by check_and_update_pro_package(), which normally runs in
+    the background on TUI startup. Doing it here too means a CLI-driven
+    upgrade doesn't leave a stale PRO build around until the next TUI launch.
+    Best-effort — never fails the overall upgrade if this part doesn't work.
+    """
+    import asyncio
+
+    from pentool.core.license import PRO_PACKAGE_DIR, check_and_update_pro_package
+
+    if not PRO_PACKAGE_DIR.exists():
+        return  # PRO was never activated on this machine — nothing to sync
+
+    try:
+        click.echo("Checking for a newer PRO build...")
+        updated = asyncio.run(check_and_update_pro_package())
+        if updated:
+            click.echo("PRO package updated to the latest build.")
+    except Exception as exc:
+        click.echo(f"Could not check for a PRO update: {exc}", err=True)
+
+
 @cli.group()
 def license() -> None:
     """License management: trial, activation, status."""

{pentool-0.2.1 → pentool-0.2.2}/pentool/core/license.py

@@ -503,6 +503,13 @@ def _current_platform() -> str:
     return "linux"
 
 
+# File recording which PRO build is currently unpacked into PRO_PACKAGE_DIR —
+# lets check_and_update_pro_package() tell "same build as last time" apart
+# from "a new build was published" without re-downloading the archive to
+# compare it. See _fetch_pro_build_id() / /api/pro/version on the Worker.
+_PRO_BUILD_MARKER = PRO_PACKAGE_DIR / ".build_id"
+
+
 async def download_pro_package(key: str, machine_id: str) -> bool:
     """Download, verify, and install the obfuscated PRO package.
 
@@ -555,6 +562,85 @@ async def download_pro_package(key: str, machine_id: str) -> bool:
         finally:
             tmp_archive.unlink(missing_ok=True)
 
+        # Record which build this is, so a later check_and_update_pro_package()
+        # can tell "nothing changed" from "a new build was published" without
+        # re-downloading the archive just to compare it.
+        try:
+            build_id = await _fetch_pro_build_id(plat)
+            if build_id:
+                _PRO_BUILD_MARKER.write_text(build_id, encoding="utf-8")
+        except Exception:
+            pass  # non-fatal — worst case, next check just re-downloads once more
+
         return True
     except Exception:
         return False
+
+
+async def _fetch_pro_build_id(plat: str) -> str | None:
+    """Query /api/pro/version for the current PRO release's build_id.
+
+    No license key needed — this only identifies which build is published,
+    not whether the caller is entitled to it (that's still enforced by
+    /api/download re-validating the key server-side). Returns None on any
+    failure (network, missing asset, etc.) — callers should treat that as
+    "couldn't check, don't act on it" rather than "no update available".
+    """
+    try:
+        import aiohttp
+        async with aiohttp.ClientSession(
+            timeout=aiohttp.ClientTimeout(total=8)
+        ) as session:
+            async with session.get(
+                f"{_LICENSE_API_BASE}/api/pro/version",
+                params={"platform": plat},
+                ssl=False,
+            ) as resp:
+                if resp.status != 200:
+                    return None
+                data = await resp.json()
+                return data.get("build_id")
+    except Exception:
+        return None
+
+
+async def check_and_update_pro_package() -> bool:
+    """Re-download the PRO package if a newer build has been published.
+
+    Called on TUI startup (background worker, same pattern as
+    _check_for_updates for the pip package) and after `pentool update` — this
+    is what closes the gap where pentool-pro ships a fix but a machine that
+    already activated its license keeps running the stale code from
+    ~/.pentool/pro/ forever, because download_pro_package() otherwise only
+    ever runs once, at initial activation/trial-start.
+
+    Silently does nothing (returns False) if:
+      - there's no active PRO license (nothing to update)
+      - the PRO package was never downloaded in the first place (that's
+        activate_license's job, not this one)
+      - the version check or download fails for any reason
+
+    Returns True if a new build was found and successfully installed.
+    """
+    info = get_license()
+    if not info.valid or not info.features:
+        return False
+    if not PRO_PACKAGE_DIR.exists():
+        return False  # never activated on this machine — nothing to refresh
+
+    plat = _current_platform()
+    remote_build_id = await _fetch_pro_build_id(plat)
+    if not remote_build_id:
+        return False  # couldn't reach the server — don't touch anything
+
+    local_build_id = None
+    try:
+        if _PRO_BUILD_MARKER.exists():
+            local_build_id = _PRO_BUILD_MARKER.read_text(encoding="utf-8").strip()
+    except Exception:
+        pass
+
+    if local_build_id == remote_build_id:
+        return False  # already on the latest build
+
+    return await download_pro_package(info.license_key, info.machine_id)

{pentool-0.2.1 → pentool-0.2.2}/pentool/tui/app.py

@@ -408,6 +408,12 @@ class PentoolApp(App):
         if getattr(self._cfg, "check_updates", True):
             self.run_worker(self._check_for_updates(), exclusive=False, thread=False)
 
+        # Check for a newer PRO build in background (if a PRO license is
+        # active) — closes the gap where pentool-pro ships a fix but an
+        # already-activated machine keeps running the stale code forever,
+        # since the PRO package otherwise only downloads once, at activation.
+        self.run_worker(self._check_for_pro_update(), exclusive=False, thread=False)
+
     async def _auto_open_last_project(self) -> None:
         """Open the last project from recent_projects at startup."""
         await asyncio.sleep(0.2)  # give Textual time to render the UI
@@ -439,6 +445,30 @@ class PentoolApp(App):
         except Exception as exc:
             logger.debug("APP: update check failed: %s", exc)
 
+    async def _check_for_pro_update(self) -> None:
+        """Re-download the PRO package in the background if a newer build
+        has been published, then notify so the user knows to restart.
+
+        No-op (silently) if there's no active PRO license or the package was
+        never downloaded in the first place — see
+        pentool.core.license.check_and_update_pro_package for the actual
+        build_id comparison logic.
+        """
+        import asyncio as _asyncio
+        await _asyncio.sleep(4.0)  # after the pip-update check, UI settled
+        try:
+            from pentool.core.license import check_and_update_pro_package
+            updated = await check_and_update_pro_package()
+            if updated:
+                self.notify(
+                    "PRO package updated to the latest build — restart Pentool to use it.",
+                    severity="information",
+                    timeout=10,
+                )
+                logger.info("APP: PRO package updated to a newer build")
+        except Exception as exc:
+            logger.debug("APP: PRO update check failed: %s", exc)
+
     def _setup_auto_save(self) -> None:
         """Configure / restart the auto-save timer from the current config.
 

{pentool-0.2.1 → pentool-0.2.2}/pentool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pentool
-Version: 0.2.1
+Version: 0.2.2
 Summary: Modern Web Pentesting TUI - Professional security testing tool
 Author-email: Pentool Team <dev@pentool.pro>
 License: AGPL-3.0

{pentool-0.2.1 → pentool-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pentool"
-version = "0.2.1"
+version = "0.2.2"
 description = "Modern Web Pentesting TUI - Professional security testing tool"
 authors = [
     {name = "Pentool Team", email = "dev@pentool.pro"}