fix(macos): harden TCC check against codesign timeouts, clarify scope
Review feedback (AI review on #86391): - guard _macos_desktop_dr subprocess.run against TimeoutExpired/FileNotFoundError so a hanging codesign degrades to the unreadable-DR warning, never crashing the doctor run (matches the file's existing subprocess guard pattern) - select the desktop bundle by newest-mtime across release/mac-*/Hermes.app, matching _desktop_packaged_executable, instead of a fixed arch order - note the cdhash-match proxy assumption at the classification site - document why /Applications/Hermes.app (Hermes-Setup launcher, com.nousresearch.hermes.setup, certificate-anchored) is deliberately not probed - extend the repair hint to cover per-service resets - regression tests: codesign timeout and missing-codesign paths
This commit is contained in:
+30
-14
@@ -1072,6 +1072,11 @@ def check_macos_tcc_grants() -> None:
|
||||
"(could not read code-signing requirement of the desktop bundle)",
|
||||
)
|
||||
return
|
||||
# The DR string is the only readable signal — TCC.db itself needs Full
|
||||
# Disk Access. A cdhash anchor marks the pre-#73681 ad-hoc identity
|
||||
# (rebuild ⇒ new cdhash ⇒ stale grants); its absence marks identifier-
|
||||
# pinned. Treat the match as a proxy for the signing class, not a
|
||||
# contract on DR wording.
|
||||
if "cdhash" in dr.lower():
|
||||
check_warn(
|
||||
"macOS TCC grants will reset after every update",
|
||||
@@ -1087,8 +1092,9 @@ def check_macos_tcc_grants() -> None:
|
||||
)
|
||||
check_info(
|
||||
"If macOS still re-prompts for permissions (toggle shows ON): the stored "
|
||||
"grant is stale — run `tccutil reset ScreenCapture com.nousresearch.hermes`, "
|
||||
"toggle it ON in System Settings, then fully quit & relaunch Hermes once."
|
||||
"grant is stale — run `tccutil reset ScreenCapture com.nousresearch.hermes` "
|
||||
"(repeat per affected service), toggle it ON in System Settings, then "
|
||||
"fully quit & relaunch Hermes once."
|
||||
)
|
||||
|
||||
|
||||
@@ -1096,15 +1102,20 @@ def _desktop_app_bundle() -> Path | None:
|
||||
"""Locate the locally-built desktop app bundle, if any.
|
||||
|
||||
Mirrors the install layout the self-updater produces
|
||||
(``apps/desktop/release/mac-<arch>/Hermes.app``).
|
||||
(``apps/desktop/release/mac-<arch>/Hermes.app``) — the only layout whose
|
||||
ad-hoc re-signed bundle can invalidate TCC grants. When multiple arch
|
||||
trees coexist (stale cross-build), the newest wins, matching
|
||||
``_desktop_packaged_executable``'s selection. ``/Applications/Hermes.app``
|
||||
is deliberately not probed: it is the separately-signed Hermes-Setup
|
||||
launcher (``com.nousresearch.hermes.setup``, certificate-anchored), whose
|
||||
grants are stable by construction and unaffected by rebuilds.
|
||||
"""
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
release_dir = root / "apps" / "desktop" / "release"
|
||||
for arch in ("mac-arm64", "mac-x64"):
|
||||
app = release_dir / arch / "Hermes.app"
|
||||
if app.is_dir():
|
||||
return app
|
||||
return None
|
||||
candidates = [p for p in release_dir.glob("mac*/Hermes.app") if p.is_dir()]
|
||||
if not candidates:
|
||||
return None
|
||||
return max(candidates, key=lambda p: p.stat().st_mtime)
|
||||
|
||||
|
||||
def _macos_desktop_dr(app: Path) -> str | None:
|
||||
@@ -1112,12 +1123,17 @@ def _macos_desktop_dr(app: Path) -> str | None:
|
||||
codesign = shutil.which("codesign")
|
||||
if not codesign:
|
||||
return None
|
||||
proc = subprocess.run(
|
||||
[codesign, "-d", "--requirements", "-", str(app)],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=15,
|
||||
)
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
[codesign, "-d", "--requirements", "-", str(app)],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=15,
|
||||
)
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
||||
# Never let a hanging codesign abort the whole doctor run — the
|
||||
# caller falls through to its "could not read" warning.
|
||||
return None
|
||||
if proc.returncode != 0:
|
||||
return None
|
||||
return (proc.stdout or "") + (proc.stderr or "")
|
||||
|
||||
@@ -7023,8 +7023,9 @@ def _cmd_update_impl(args, gateway_mode: bool):
|
||||
print(
|
||||
" ℹ macOS: if Hermes re-prompts for permissions you already "
|
||||
"granted (toggle shows ON), the stored grant is stale — run "
|
||||
"`tccutil reset ScreenCapture com.nousresearch.hermes`, toggle "
|
||||
"it ON in System Settings, then fully quit & relaunch once."
|
||||
"`tccutil reset ScreenCapture com.nousresearch.hermes` (repeat "
|
||||
"per affected service), toggle it ON in System Settings, then "
|
||||
"fully quit & relaunch once."
|
||||
)
|
||||
|
||||
# ── Post-update state.db integrity guard (#68474) ─────────────────
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
"""Tests for hermes_cli.doctor."""
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import types
|
||||
import io
|
||||
@@ -1605,3 +1606,35 @@ class TestMacOSTCCGrants:
|
||||
out = capsys.readouterr().out
|
||||
assert "could not read code-signing requirement" in out
|
||||
assert "stable" not in out
|
||||
|
||||
def test_warns_when_codesign_times_out(self, monkeypatch, capsys, tmp_path):
|
||||
"""A hanging codesign must degrade to the unreadable-DR warning, never crash."""
|
||||
monkeypatch.setattr(doctor_mod.sys, "platform", "darwin")
|
||||
monkeypatch.setattr(
|
||||
doctor_mod,
|
||||
"_desktop_app_bundle",
|
||||
lambda: tmp_path / "Hermes.app",
|
||||
)
|
||||
|
||||
def _timeout(*args, **kwargs):
|
||||
raise subprocess.TimeoutExpired(cmd=["codesign"], timeout=15)
|
||||
|
||||
monkeypatch.setattr(doctor_mod.subprocess, "run", _timeout)
|
||||
doctor_mod.check_macos_tcc_grants()
|
||||
out = capsys.readouterr().out
|
||||
assert "could not read code-signing requirement" in out
|
||||
assert "stable" not in out
|
||||
|
||||
def test_warns_when_codesign_missing(self, monkeypatch, capsys, tmp_path):
|
||||
"""No codesign binary → same graceful unreadable-DR warning."""
|
||||
monkeypatch.setattr(doctor_mod.sys, "platform", "darwin")
|
||||
monkeypatch.setattr(
|
||||
doctor_mod,
|
||||
"_desktop_app_bundle",
|
||||
lambda: tmp_path / "Hermes.app",
|
||||
)
|
||||
monkeypatch.setattr(doctor_mod.shutil, "which", lambda _name: None)
|
||||
doctor_mod.check_macos_tcc_grants()
|
||||
out = capsys.readouterr().out
|
||||
assert "could not read code-signing requirement" in out
|
||||
assert "stable" not in out
|
||||
|
||||
Reference in New Issue
Block a user