mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-08 13:12:08 +00:00
Replaces the POSIX `/bin/bash -c "$(curl …)"` invocation with a download-then-exec flow: curl the upstream install.sh into a mkstemp temp file (unpredictable name, 0600) and run it as a plain argv list. No shell=True, no command substitution. The temp script is removed in a finally block; download failures return cleanly without exec. Salvages the intent of #34974 by @ErnestHysa. His original patch targeted a fixed /tmp/cua-driver-install.sh path (symlink/TOCTOU-prone on multi-user hosts) and predates Windows/Linux installer support; this version uses mkstemp and keeps the powershell path untouched. Co-authored-by: ErnestHysa <takis312@hotmail.com>
423 lines
18 KiB
Python
423 lines
18 KiB
Python
"""Tests for ``install_cua_driver`` upgrade semantics.
|
|
|
|
The cua-driver upstream installer always pulls the latest release tag, so
|
|
re-running it is the canonical upgrade path. ``install_cua_driver(upgrade=True)``
|
|
must:
|
|
|
|
* Be supported-platform-only — no-op silently elsewhere so ``hermes update``
|
|
can call it unconditionally without warning unsupported-platform users.
|
|
* Re-run the installer even when the binary is already on PATH (this is the
|
|
fix for the "we only pulled cua-driver once on enable" complaint).
|
|
* Preserve original ``upgrade=False`` behaviour for the toolset-enable flow:
|
|
skip if installed, install otherwise, warn on unsupported platforms.
|
|
|
|
The pre-install arch probe that used to live alongside this function was
|
|
deleted (see top-of-file comment in tools_config.py) — the upstream
|
|
installer has CUA_DRIVER_RS_BAKED_VERSION baked in by CD and errors
|
|
cleanly on missing-arch assets, and the upgrade path uses
|
|
``cua_driver_update_check()`` (which shells `cua-driver check-update
|
|
--json` against the already-installed binary).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
class TestInstallCuaDriverUpgrade:
|
|
def test_upgrade_on_unsupported_platform_is_silent_noop(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch.object(tools_config, "_print_warning") as warn, \
|
|
patch("platform.system", return_value="FreeBSD"):
|
|
assert tools_config.install_cua_driver(upgrade=True) is False
|
|
warn.assert_not_called()
|
|
|
|
def test_non_upgrade_on_unsupported_platform_warns(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch.object(tools_config, "_print_warning") as warn, \
|
|
patch("platform.system", return_value="FreeBSD"):
|
|
assert tools_config.install_cua_driver(upgrade=False) is False
|
|
warn.assert_called()
|
|
|
|
def test_upgrade_on_macos_with_binary_runs_installer(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/local/bin/" + n
|
|
if n in {"cua-driver", "curl"} else None), \
|
|
patch.object(tools_config, "_run_cua_driver_installer",
|
|
return_value=True) as runner, \
|
|
patch("subprocess.run"):
|
|
assert tools_config.install_cua_driver(upgrade=True) is True
|
|
runner.assert_called_once()
|
|
kwargs = runner.call_args.kwargs
|
|
assert kwargs.get("verbose") is False
|
|
|
|
def test_upgrade_on_macos_without_binary_runs_installer(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/bin/curl" if n == "curl" else None), \
|
|
patch.object(tools_config, "_run_cua_driver_installer",
|
|
return_value=True) as runner:
|
|
assert tools_config.install_cua_driver(upgrade=True) is True
|
|
runner.assert_called_once()
|
|
|
|
def test_upgrade_on_macos_non_writable_applications_skips_refresh(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/local/bin/" + n
|
|
if n in {"cua-driver", "curl"} else None), \
|
|
patch.object(tools_config, "_cua_install_target_writable",
|
|
return_value=False), \
|
|
patch.object(tools_config, "_run_cua_driver_installer") as runner, \
|
|
patch.object(tools_config, "_print_info") as info:
|
|
assert tools_config.install_cua_driver(upgrade=True) is True
|
|
runner.assert_not_called()
|
|
assert any(
|
|
"/Applications is not writable" in call.args[0]
|
|
for call in info.call_args_list
|
|
)
|
|
|
|
def test_fresh_install_on_macos_non_writable_applications_skips_install(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/bin/curl" if n == "curl" else None), \
|
|
patch.object(tools_config, "_cua_install_target_writable",
|
|
return_value=False), \
|
|
patch.object(tools_config, "_run_cua_driver_installer") as runner, \
|
|
patch.object(tools_config, "_print_info") as info:
|
|
assert tools_config.install_cua_driver(upgrade=False) is False
|
|
runner.assert_not_called()
|
|
assert any(
|
|
"/Applications is not writable" in call.args[0]
|
|
for call in info.call_args_list
|
|
)
|
|
|
|
def test_non_upgrade_on_macos_with_binary_skips_install(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/local/bin/" + n
|
|
if n in {"cua-driver", "curl"} else None), \
|
|
patch.object(tools_config, "_run_cua_driver_installer") as runner, \
|
|
patch("subprocess.run"):
|
|
assert tools_config.install_cua_driver(upgrade=False) is True
|
|
runner.assert_not_called()
|
|
|
|
def test_non_upgrade_on_macos_without_binary_runs_installer(self):
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/bin/curl" if n == "curl" else None), \
|
|
patch.object(tools_config, "_run_cua_driver_installer",
|
|
return_value=True) as runner:
|
|
assert tools_config.install_cua_driver(upgrade=False) is True
|
|
runner.assert_called_once()
|
|
|
|
|
|
class TestArchProbeRemoval:
|
|
"""Regression tests for the deletion of `_check_cua_driver_asset_for_arch`.
|
|
|
|
The old probe queried ``/releases/latest`` on trycua/cua and inspected
|
|
asset names. That was wrong in two ways:
|
|
|
|
1. cua-driver-rs releases are marked **prerelease** on every cut, so
|
|
``/releases/latest`` returns the Python ``cua-agent`` / ``cua-computer``
|
|
package instead — a release with zero binary assets. The probe then
|
|
reported "no asset for $arch" on Linux x86_64, Windows, macOS Intel,
|
|
Linux arm64 — every non-Apple-Silicon host.
|
|
2. Even with the right endpoint, it duplicated tag-resolution the upstream
|
|
installer already does correctly via ``CUA_DRIVER_RS_BAKED_VERSION``
|
|
(auto-baked by CD on every release).
|
|
|
|
The fix: stop probing. Trust the upstream installer for fresh installs
|
|
(it has the baked version + correct API fallback) and the
|
|
``cua-driver check-update --json`` MCP-binary native command for the
|
|
upgrade path.
|
|
"""
|
|
|
|
def test_probe_function_is_gone(self):
|
|
from hermes_cli import tools_config
|
|
assert not hasattr(tools_config, "_check_cua_driver_asset_for_arch")
|
|
assert not hasattr(tools_config, "_latest_cua_driver_rs_release")
|
|
|
|
def test_fresh_install_does_not_call_github_api(self):
|
|
"""Pre-install no longer probes the GitHub API — the upstream
|
|
``install.sh`` resolves the tag from its baked CUA_DRIVER_RS_BAKED_VERSION
|
|
line. install.sh errors cleanly when the arch has no asset, so the
|
|
probe was duplicate gatekeeping.
|
|
"""
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/bin/curl" if n == "curl" else None), \
|
|
patch("urllib.request.urlopen") as urlopen, \
|
|
patch.object(tools_config, "_run_cua_driver_installer",
|
|
return_value=True) as runner:
|
|
assert tools_config.install_cua_driver(upgrade=False) is True
|
|
runner.assert_called_once()
|
|
urlopen.assert_not_called()
|
|
|
|
def test_upgrade_with_binary_does_not_call_github_api_directly(self):
|
|
"""The upgrade path no longer hits GitHub from Python — it delegates
|
|
to the upstream ``install.sh`` (which has the baked release tag and
|
|
the proper API fallback). When cua-driver is already installed,
|
|
``cua_driver_update_check()`` (added in a separate change) further
|
|
short-circuits the network re-install via the binary's native
|
|
``check-update --json`` verb.
|
|
"""
|
|
from hermes_cli import tools_config
|
|
|
|
with patch("platform.system", return_value="Darwin"), \
|
|
patch.object(tools_config.shutil, "which",
|
|
side_effect=lambda n: "/usr/local/bin/" + n
|
|
if n in ("cua-driver", "curl") else None), \
|
|
patch("urllib.request.urlopen") as urlopen, \
|
|
patch("subprocess.run"), \
|
|
patch.object(tools_config, "_run_cua_driver_installer",
|
|
return_value=True) as runner:
|
|
assert tools_config.install_cua_driver(upgrade=True) is True
|
|
runner.assert_called_once()
|
|
# Probe deleted — no direct GitHub API call from Python.
|
|
urlopen.assert_not_called()
|
|
|
|
|
|
class TestStaleInstallLockClear:
|
|
"""_clear_stale_cua_install_lock: pre-clears the upstream installer's
|
|
concurrent-install lock only when the holder is provably dead (or the
|
|
lock is old and pid-less). Issue #58762."""
|
|
|
|
def _make_lock(self, tmp_path, pid=None):
|
|
import os
|
|
home = tmp_path / ".cua-driver"
|
|
lock = home / "packages" / ".install.lock.d"
|
|
lock.mkdir(parents=True)
|
|
if pid is not None:
|
|
(lock / "info").write_text(f"pid={pid}\n")
|
|
os.environ["CUA_DRIVER_RS_HOME"] = str(home)
|
|
return lock
|
|
|
|
def teardown_method(self):
|
|
import os
|
|
os.environ.pop("CUA_DRIVER_RS_HOME", None)
|
|
|
|
def test_dead_holder_lock_is_cleared(self, tmp_path):
|
|
from hermes_cli import tools_config
|
|
|
|
dead_pid = 4194000 # above default pid_max on most systems
|
|
lock = self._make_lock(tmp_path, pid=dead_pid)
|
|
with patch.object(tools_config, "_print_info"):
|
|
tools_config._clear_stale_cua_install_lock()
|
|
assert not lock.exists()
|
|
|
|
def test_live_holder_lock_is_kept(self, tmp_path):
|
|
import os
|
|
from hermes_cli import tools_config
|
|
|
|
lock = self._make_lock(tmp_path, pid=os.getpid())
|
|
tools_config._clear_stale_cua_install_lock()
|
|
assert lock.exists()
|
|
|
|
def test_pidless_fresh_lock_is_kept(self, tmp_path):
|
|
from hermes_cli import tools_config
|
|
|
|
lock = self._make_lock(tmp_path, pid=None)
|
|
tools_config._clear_stale_cua_install_lock()
|
|
assert lock.exists()
|
|
|
|
def test_pidless_old_lock_is_cleared(self, tmp_path):
|
|
import os
|
|
import time
|
|
from hermes_cli import tools_config
|
|
|
|
lock = self._make_lock(tmp_path, pid=None)
|
|
old = time.time() - (tools_config._CUA_LOCK_STALE_AFTER + 60)
|
|
os.utime(lock, (old, old))
|
|
with patch.object(tools_config, "_print_info"):
|
|
tools_config._clear_stale_cua_install_lock()
|
|
assert not lock.exists()
|
|
|
|
def test_no_lock_is_noop(self, tmp_path):
|
|
import os
|
|
os.environ["CUA_DRIVER_RS_HOME"] = str(tmp_path / ".cua-driver")
|
|
from hermes_cli import tools_config
|
|
tools_config._clear_stale_cua_install_lock() # must not raise
|
|
|
|
|
|
class TestInstallerTimeoutKillsProcessGroup:
|
|
"""On timeout the whole installer process group must be killed, so the
|
|
`curl | bash` grandchildren can't survive holding the install lock."""
|
|
|
|
def test_timeout_kills_process_group_and_returns_false(self, tmp_path):
|
|
import os
|
|
import signal
|
|
import subprocess
|
|
import sys as _sys
|
|
from unittest.mock import MagicMock
|
|
from hermes_cli import tools_config
|
|
|
|
killed = {}
|
|
|
|
fake_proc = MagicMock()
|
|
fake_proc.pid = 12345
|
|
# First communicate() raises TimeoutExpired, second (post-kill) returns.
|
|
fake_proc.communicate.side_effect = [
|
|
subprocess.TimeoutExpired(cmd="x", timeout=1),
|
|
("", None),
|
|
]
|
|
|
|
def fake_killpg(pgid, sig):
|
|
killed["pgid"] = pgid
|
|
killed["sig"] = sig
|
|
|
|
with patch("platform.system", return_value="Linux"), \
|
|
patch("subprocess.run", return_value=MagicMock(returncode=0, stderr="")), \
|
|
patch("subprocess.Popen", return_value=fake_proc), \
|
|
patch.object(tools_config.os, "getpgid", return_value=99999), \
|
|
patch.object(tools_config.os, "killpg", side_effect=fake_killpg), \
|
|
patch.object(tools_config, "_clear_stale_cua_install_lock"), \
|
|
patch.object(tools_config, "_print_warning"), \
|
|
patch.object(tools_config, "_print_info"):
|
|
ok = tools_config._run_cua_driver_installer(label="Refreshing", verbose=False)
|
|
|
|
assert ok is False
|
|
assert killed.get("pgid") == 99999
|
|
assert killed.get("sig") == signal.SIGKILL
|
|
# Post-kill reap happened.
|
|
assert fake_proc.communicate.call_count == 2
|
|
|
|
def test_timeout_ceiling_exceeds_upstream_lock_window(self):
|
|
from hermes_cli import tools_config
|
|
# The upstream installer waits up to 600s before reclaiming a stale
|
|
# lock; our ceiling must give that window room to complete.
|
|
assert tools_config._CUA_INSTALLER_TIMEOUT > tools_config._CUA_LOCK_STALE_AFTER
|
|
|
|
def test_installer_runs_in_new_session_on_posix(self, tmp_path):
|
|
import subprocess
|
|
from unittest.mock import MagicMock
|
|
from hermes_cli import tools_config
|
|
|
|
captured = {}
|
|
fake_proc = MagicMock()
|
|
fake_proc.pid = 1
|
|
fake_proc.returncode = 1
|
|
fake_proc.communicate.return_value = ("", None)
|
|
|
|
def fake_popen(*args, **kwargs):
|
|
captured.update(kwargs)
|
|
return fake_proc
|
|
|
|
with patch("platform.system", return_value="Linux"), \
|
|
patch("subprocess.run", return_value=MagicMock(returncode=0, stderr="")), \
|
|
patch("subprocess.Popen", side_effect=fake_popen), \
|
|
patch.object(tools_config, "_clear_stale_cua_install_lock"), \
|
|
patch.object(tools_config, "_print_warning"), \
|
|
patch.object(tools_config, "_print_info"):
|
|
tools_config._run_cua_driver_installer(label="Refreshing", verbose=False)
|
|
|
|
assert captured.get("start_new_session") is True
|
|
|
|
|
|
class TestInstallerNoShell:
|
|
"""The POSIX installer path must not use shell=True or command
|
|
substitution: the script is downloaded to a mkstemp file and exec'd
|
|
as a plain argv list (salvage of #34974's intent, without the fixed
|
|
/tmp path TOCTOU that PR introduced)."""
|
|
|
|
def _run(self, download_rc=0):
|
|
import subprocess
|
|
from unittest.mock import MagicMock
|
|
from hermes_cli import tools_config
|
|
|
|
calls = []
|
|
fake_proc = MagicMock()
|
|
fake_proc.pid = 1
|
|
fake_proc.returncode = 0
|
|
fake_proc.communicate.return_value = ("", None)
|
|
|
|
def fake_run(cmd, **kw):
|
|
calls.append(("run", cmd, kw))
|
|
m = MagicMock()
|
|
m.returncode = download_rc
|
|
m.stderr = "curl: (6) could not resolve" if download_rc else ""
|
|
return m
|
|
|
|
def fake_popen(cmd, **kw):
|
|
calls.append(("popen", cmd, kw))
|
|
return fake_proc
|
|
|
|
with patch("platform.system", return_value="Linux"), \
|
|
patch("subprocess.run", side_effect=fake_run), \
|
|
patch("subprocess.Popen", side_effect=fake_popen), \
|
|
patch.object(tools_config.shutil, "which", return_value="/usr/local/bin/cua-driver"), \
|
|
patch.object(tools_config, "_clear_stale_cua_install_lock"), \
|
|
patch.object(tools_config, "_print_warning"), \
|
|
patch.object(tools_config, "_print_info"), \
|
|
patch.object(tools_config, "_print_success"):
|
|
ok = tools_config._run_cua_driver_installer(label="Refreshing", verbose=False)
|
|
return ok, calls
|
|
|
|
def test_posix_path_downloads_then_execs_argv_list(self):
|
|
ok, calls = self._run()
|
|
assert ok is True
|
|
run_calls = [c for c in calls if c[0] == "run"]
|
|
popen_calls = [c for c in calls if c[0] == "popen"]
|
|
assert len(run_calls) == 1 and len(popen_calls) == 1
|
|
# Download: plain argv curl, no shell.
|
|
dl_cmd = run_calls[0][1]
|
|
assert isinstance(dl_cmd, list) and dl_cmd[0] == "curl"
|
|
# Exec: argv list ["/bin/bash", <mkstemp path>], shell=False.
|
|
exec_cmd, exec_kw = popen_calls[0][1], popen_calls[0][2]
|
|
assert isinstance(exec_cmd, list) and exec_cmd[0] == "/bin/bash"
|
|
assert "cua-driver-install-" in exec_cmd[1]
|
|
assert exec_kw.get("shell") is False
|
|
|
|
def test_download_failure_returns_false_without_exec(self):
|
|
ok, calls = self._run(download_rc=6)
|
|
assert ok is False
|
|
assert not [c for c in calls if c[0] == "popen"]
|
|
|
|
def test_temp_script_removed_after_run(self, tmp_path):
|
|
import os
|
|
captured = {}
|
|
import subprocess
|
|
from unittest.mock import MagicMock
|
|
from hermes_cli import tools_config
|
|
|
|
fake_proc = MagicMock()
|
|
fake_proc.pid = 1
|
|
fake_proc.returncode = 0
|
|
fake_proc.communicate.return_value = ("", None)
|
|
|
|
def fake_run(cmd, **kw):
|
|
m = MagicMock(); m.returncode = 0; m.stderr = ""
|
|
return m
|
|
|
|
def fake_popen(cmd, **kw):
|
|
captured["script"] = cmd[1]
|
|
return fake_proc
|
|
|
|
with patch("platform.system", return_value="Linux"), \
|
|
patch("subprocess.run", side_effect=fake_run), \
|
|
patch("subprocess.Popen", side_effect=fake_popen), \
|
|
patch.object(tools_config.shutil, "which", return_value="/usr/local/bin/cua-driver"), \
|
|
patch.object(tools_config, "_clear_stale_cua_install_lock"), \
|
|
patch.object(tools_config, "_print_warning"), \
|
|
patch.object(tools_config, "_print_info"), \
|
|
patch.object(tools_config, "_print_success"):
|
|
tools_config._run_cua_driver_installer(label="Refreshing", verbose=False)
|
|
|
|
assert "script" in captured
|
|
assert not os.path.exists(captured["script"])
|