From a0bddbc13b608dab7eab8eecabc81355d379142e Mon Sep 17 00:00:00 2001
From: Alex Schapiro <bearsyankees@gmail.com>
Date: Sun, 19 Jul 2026 17:07:10 +0000
Subject: [PATCH] fix(update): verify release checksum, clean up staged binary,
 roll back Windows rename on failure

---
 strix/interface/update_check.py | 62 +++++++++++++++++++++++++++++----
 tests/test_update_check.py      | 19 ++++++----
 2 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/strix/interface/update_check.py b/strix/interface/update_check.py
index b30ca335..b3260fe0 100644
--- a/strix/interface/update_check.py
+++ b/strix/interface/update_check.py
@@ -9,6 +9,7 @@ path for the standalone binary install.
 
 from __future__ import annotations
 
+import hashlib
 import json
 import logging
 import os
@@ -114,6 +115,32 @@ def _fetch_latest_version() -> str | None:
         return None
 
 
+def _fetch_asset_digest(version: str, filename: str) -> str | None:
+    """Return the expected sha256 (hex) for a release asset, if the API provides one."""
+    try:
+        response = requests.get(
+            f"https://api.github.com/repos/{GITHUB_REPO}/releases/tags/v{version}",
+            timeout=REQUEST_TIMEOUT_SECONDS,
+        )
+        response.raise_for_status()
+        for asset in response.json().get("assets", []):
+            if asset.get("name") == filename:
+                digest = asset.get("digest") or ""
+                if digest.startswith("sha256:"):
+                    return digest.removeprefix("sha256:")
+    except Exception:  # noqa: BLE001
+        logger.debug("release asset digest lookup failed", exc_info=True)
+    return None
+
+
+def _sha256_file(path: Path) -> str:
+    digest = hashlib.sha256()
+    with path.open("rb") as f:
+        for chunk in iter(lambda: f.read(1 << 20), b""):
+            digest.update(chunk)
+    return digest.hexdigest()
+
+
 def _read_cache() -> dict[str, object]:
     try:
         with _CACHE_PATH.open(encoding="utf-8") as f:
@@ -237,6 +264,17 @@ def _download_and_replace(version: str, target: str, console: Console) -> bool:
                 for chunk in response.iter_content(chunk_size=1 << 20):
                     f.write(chunk)
 
+        expected_digest = _fetch_asset_digest(version, filename)
+        if expected_digest:
+            actual_digest = _sha256_file(archive_path)
+            if actual_digest != expected_digest:
+                raise RuntimeError(
+                    f"checksum mismatch for {filename}: "
+                    f"expected sha256 {expected_digest}, got {actual_digest}"
+                )
+        else:
+            console.print("[dim yellow]No published checksum available; skipping verification[/]")
+
         if is_windows:
             with zipfile.ZipFile(archive_path) as zf:
                 zf.extract(binary_name, tmp_dir)
@@ -248,13 +286,23 @@ def _download_and_replace(version: str, target: str, console: Console) -> bool:
         new_binary.chmod(new_binary.stat().st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
 
         staged = current_exe.with_name(current_exe.name + ".new")
-        shutil.copy2(new_binary, staged)
-        if is_windows:
-            # Windows can't replace a running executable in place; move it aside first.
-            old = current_exe.with_name(current_exe.name + ".old")
-            old.unlink(missing_ok=True)
-            current_exe.rename(old)
-        staged.replace(current_exe)
+        try:
+            shutil.copy2(new_binary, staged)
+            if is_windows:
+                # Windows can't replace a running executable in place; move it aside first.
+                old = current_exe.with_name(current_exe.name + ".old")
+                old.unlink(missing_ok=True)
+                current_exe.rename(old)
+                try:
+                    staged.replace(current_exe)
+                except Exception:
+                    old.rename(current_exe)
+                    raise
+            else:
+                staged.replace(current_exe)
+        except Exception:
+            staged.unlink(missing_ok=True)
+            raise
     return True
 
 
diff --git a/tests/test_update_check.py b/tests/test_update_check.py
index a62a6822..6ef40ac8 100644
--- a/tests/test_update_check.py
+++ b/tests/test_update_check.py
@@ -1,9 +1,12 @@
+import hashlib
+import io
 import json
 import platform
 import time
 from pathlib import Path
 
 import pytest
+from rich.console import Console
 
 from strix.interface import update_check
 
@@ -109,13 +112,11 @@ def test_get_upgrade_command_all_methods() -> None:
     assert update_check.get_upgrade_command("pip") == "pip install --upgrade strix-agent"
 
 
-def test_self_update_non_binary_prints_command(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
-) -> None:
+def test_self_update_non_binary_prints_command(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(update_check, "is_binary_install", lambda: False)
-    assert update_check.self_update() is False
-    out = capsys.readouterr().out
-    assert "upgrade" in out
+    buffer = io.StringIO()
+    assert update_check.self_update(Console(file=buffer)) is False
+    assert "upgrade" in buffer.getvalue()
 
 
 def test_self_update_already_latest(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -125,6 +126,12 @@ def test_self_update_already_latest(monkeypatch: pytest.MonkeyPatch) -> None:
     assert update_check.self_update() is True
 
 
+def test_sha256_file(tmp_path: Path) -> None:
+    path = tmp_path / "blob"
+    path.write_bytes(b"strix")
+    assert update_check._sha256_file(path) == hashlib.sha256(b"strix").hexdigest()
+
+
 def test_release_target(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(platform, "system", lambda: "Linux")
     monkeypatch.setattr(platform, "machine", lambda: "x86_64")