mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 11:22:02 +03:00
d9102dc190
default_ls_remote was the one plugin network call still running git bare: ambient config, inherited stdin, no GIT_TERMINAL_PROMPT. With PM's PortableGit now chosen first, a remote that asks for credentials makes git run PortableGit's system credential.helper (a GUI chooser), and the call outlives its own 30 s timeout. It runs on every gateway boot and in `hermes plugins check-updates`. @jquesnelle reproduced it on Windows 11. Route it through _run_plugin_git with auth_url=source, as clone and pull already are: noninteractive_git_env blanks the helper and the prompt, and a stored credential is attached only when the remote refuses anonymous access. cwd stays the process cwd, so a relative local source resolves as before.
129 lines
5.3 KiB
Python
129 lines
5.3 KiB
Python
"""Tests for plugins_cmd._resolve_git_executable: which git plugin git operations run."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def resolve_git():
|
|
from hermes_cli import plugins_cmd as pc
|
|
|
|
return pc._resolve_git_executable
|
|
|
|
|
|
def _stub_executable(path: Path, body: str = "") -> Path:
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
path.write_text(body, encoding="utf-8")
|
|
path.chmod(0o755)
|
|
return path
|
|
|
|
|
|
def _pm_reports_git(monkeypatch, binary: Path | None) -> None:
|
|
import pm
|
|
from types import SimpleNamespace
|
|
|
|
installed = None if binary is None else SimpleNamespace(path=binary.parent.parent, version="pinned", binary=binary)
|
|
monkeypatch.setattr(pm, "installed_package", lambda name, **_kw: installed if name == "git" else None)
|
|
|
|
|
|
@pytest.mark.platforms("any")
|
|
@pytest.mark.parametrize("pm_has_git", [True, False], ids=["pm-git", "no-pm-git"])
|
|
def test_plugin_git_prefers_pm_pinned_git_over_path(resolve_git, tmp_path, monkeypatch, pm_has_git):
|
|
"""Plugin git operations run the git PM pinned for this install, not one the user put on PATH;
|
|
with no PM git, the PATH git still answers."""
|
|
suffix = ".exe" if os.name == "nt" else ""
|
|
path_git = _stub_executable(tmp_path / "user-bin" / f"git{suffix}")
|
|
pinned = _stub_executable(tmp_path / "tools" / "git-2.53.0+3-win32-x64" / "cmd" / f"git{suffix}")
|
|
monkeypatch.setenv("PATH", str(path_git.parent))
|
|
_pm_reports_git(monkeypatch, pinned if pm_has_git else None)
|
|
assert Path(shutil.which("git") or "") == path_git
|
|
|
|
assert Path(resolve_git() or "") == (pinned if pm_has_git else path_git)
|
|
|
|
|
|
@pytest.mark.platforms("any")
|
|
def test_plugin_git_rechecks_pm_after_pin_is_installed(resolve_git, tmp_path, monkeypatch):
|
|
"""An existing gateway must use a PM git installed after its first plugin lookup.
|
|
|
|
A process previously using a PATH git must not keep it after pm repair makes
|
|
the pinned git available; callers should not need a gateway restart.
|
|
"""
|
|
suffix = ".exe" if os.name == "nt" else ""
|
|
path_git = _stub_executable(tmp_path / "user-bin" / f"git{suffix}")
|
|
pinned = _stub_executable(tmp_path / "tools" / "git-2.53.0+3-win32-x64" / "cmd" / f"git{suffix}")
|
|
monkeypatch.setenv("PATH", str(path_git.parent))
|
|
|
|
_pm_reports_git(monkeypatch, None)
|
|
assert Path(resolve_git() or "") == path_git
|
|
|
|
_pm_reports_git(monkeypatch, pinned)
|
|
assert Path(resolve_git() or "") == pinned
|
|
|
|
|
|
@pytest.mark.platforms("posix")
|
|
def test_git_url_plugin_clone_runs_pm_pinned_git(resolve_git, tmp_path, monkeypatch):
|
|
"""A git-url install clones with PM's git even when PATH leads with a different git."""
|
|
import subprocess as sp
|
|
|
|
from hermes_cli.plugins_cmd import _clone_plugin_repo
|
|
|
|
real_git = shutil.which("git")
|
|
assert real_git, "the clone test needs a real git"
|
|
origin = tmp_path / "origin"
|
|
origin.mkdir()
|
|
for args in (["init", "-q", "-b", "main"],
|
|
["-c", "user.email=t@t", "-c", "user.name=t", "commit", "--allow-empty", "-qm", "init"]):
|
|
sp.run([real_git, *args], cwd=origin, check=True, capture_output=True)
|
|
head = sp.run([real_git, "rev-parse", "HEAD"], cwd=origin, check=True, capture_output=True,
|
|
text=True).stdout.strip()
|
|
decoy = _stub_executable(tmp_path / "user-bin" / "git", "#!/bin/sh\necho 'the PATH git ran' >&2\nexit 1\n")
|
|
monkeypatch.setenv("PATH", f"{decoy.parent}{os.pathsep}{os.environ['PATH']}")
|
|
_pm_reports_git(monkeypatch, Path(real_git))
|
|
|
|
assert _clone_plugin_repo(tmp_path / "clone", origin.as_uri(), None) == head
|
|
|
|
|
|
@pytest.mark.platforms("posix")
|
|
def test_update_check_never_runs_the_ambient_credential_helper(tmp_path, monkeypatch):
|
|
"""The update check runs on every gateway boot. A remote that asks for credentials must fail
|
|
there without running the git config's credential helper: PM's PortableGit names a GUI chooser
|
|
as its helper, and that dialog outlives the call's own timeout."""
|
|
import http.server
|
|
import threading
|
|
|
|
from hermes_cli import plugins_cmd
|
|
from hermes_cli.plugins_updates import default_ls_remote
|
|
|
|
class AsksForCredentials(http.server.BaseHTTPRequestHandler):
|
|
def do_GET(self):
|
|
self.send_response(401)
|
|
self.send_header("WWW-Authenticate", 'Basic realm="plugins"')
|
|
self.send_header("Content-Length", "0")
|
|
self.end_headers()
|
|
|
|
def log_message(self, *_args):
|
|
pass
|
|
|
|
server = http.server.ThreadingHTTPServer(("127.0.0.1", 0), AsksForCredentials)
|
|
threading.Thread(target=server.serve_forever, daemon=True).start()
|
|
ran = tmp_path / "helper-ran"
|
|
helper = _stub_executable(tmp_path / "helper", f"#!/bin/sh\ntouch '{ran}'\n")
|
|
config = tmp_path / "gitconfig"
|
|
config.write_text(f"[credential]\n\thelper = {helper}\n", encoding="utf-8")
|
|
monkeypatch.setenv("GIT_CONFIG_GLOBAL", str(config))
|
|
monkeypatch.setenv("GIT_TERMINAL_PROMPT", "0") # a run that reaches git's prompt fails, never waits
|
|
monkeypatch.setattr(plugins_cmd, "_resolve_git_executable", lambda: shutil.which("git"))
|
|
try:
|
|
with pytest.raises(RuntimeError):
|
|
default_ls_remote(f"http://127.0.0.1:{server.server_port}/plugin.git")
|
|
finally:
|
|
server.shutdown()
|
|
server.server_close()
|
|
|
|
assert not ran.exists(), "ls-remote ran the ambient credential helper"
|