60e531cb52
The #107002 guard keeps an inline ``-c`` program's trailing argv as data. Every Hermes launcher runs the entry point IN the ``-c`` process, so the guard hid real gateways on every OS (#124318, #124588): - the store launcher / Windows updater relaunch (_launchers.runtime_command) - the published launcher script (POSIX shell launcher: every PM-install systemd/launchd gateway) and its Windows .cmd base64 wrapper - the venv_sync re-entry, whose argv is assigned inside the source gateway.status.inline_bootstrap_argv recognises exactly those emitted source shapes, anchored at both ends so a program merely CARRYING one (the restart watcher's respawn argv) still never matches, and rewrites the process to the equivalent ``python -m <entry> <argv>``. /proc, psutil and ``ps`` space-join argv, which splits the source across tokens; the shortest token run ending in a recognised tail is the source whichever reader joined it. Both canonical matchers (looks_like_gateway_command_line and update_cmd_windows._hermes_holder_subcommand) use it. Live on a real PM install (Linux, bwrap): a gateway started through the installed launcher script or runtime_command read "Gateway is not running" on main; with this change both read running, find_gateway_pids and get_running_pid see them. Drops the four #124318 known_failure gates in tests/e2e/core/windows_update. Co-authored-by: Hermes Agent <dmyou@users.noreply.github.com> Co-authored-by: JoaoMarcos44 <joaomarcosdias444@gmail.com> Co-authored-by: DianaBudin <dianabudin0307@gmail.com>
56 lines
2.8 KiB
Python
56 lines
2.8 KiB
Python
"""A gateway started through one of Hermes' own inline bootstraps is a gateway on every OS (#124318).
|
|
|
|
The store launcher (``_launchers.runtime_command``, also the Windows updater's relaunch), the
|
|
published launcher script (POSIX shell launcher and the Windows ``.cmd`` base64 wrapper) and the
|
|
``venv_sync`` re-entry all run ``python -I -c <source> …`` with the entry point IN that process.
|
|
The #107002 guard that keeps an inline program's trailing argv as data made all of them invisible.
|
|
The readers hand the matchers different strings: ``/proc``, psutil and ``ps`` space-join argv (the
|
|
source splits across tokens); Windows CIM reports the CreateProcess line (``list2cmdline``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import base64
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from gateway.status import looks_like_gateway_command_line
|
|
from hermes_cli import _launchers, venv_sync
|
|
from hermes_cli.update_cmd_windows import _hermes_holder_subcommand
|
|
|
|
ROOT = Path("/opt/Hermes Agent/hermes-agent")
|
|
PY = "/opt/venv/bin/python3"
|
|
_SCRIPT = _launchers._launcher_script("hermes", ROOT, None)
|
|
_JOINS = {"space-joined": " ".join, "windows": subprocess.list2cmdline}
|
|
|
|
|
|
def _forms(argv: list[str]) -> dict[str, list[str]]:
|
|
return {
|
|
"store-launcher": _launchers.runtime_command(ROOT, argv, python=Path(PY)),
|
|
"launcher-script": [PY, "-I", "-c", _SCRIPT, *argv],
|
|
"cmd-launcher": [PY, "-I", "-c", f"import base64; exec(base64.b64decode('{base64.b64encode(_SCRIPT.encode()).decode()}'))", *argv],
|
|
"venv-reentry": venv_sync.relaunch_command(
|
|
Path(PY), ROOT, [str(ROOT / "hermes_cli" / "main.py"), *argv], ["/old/python", "-m", "hermes_cli.main", *argv],
|
|
"hermes_cli.main"),
|
|
}
|
|
|
|
|
|
@pytest.mark.parametrize("join", _JOINS)
|
|
@pytest.mark.parametrize("form", _forms([]))
|
|
def test_bootstrap_launched_gateway_is_a_gateway(form: str, join: str) -> None:
|
|
command_line = _JOINS[join]([str(t) for t in _forms(["gateway", "run", "--replace"])[form]])
|
|
assert looks_like_gateway_command_line(command_line)
|
|
assert _hermes_holder_subcommand(command_line) == "gateway"
|
|
|
|
|
|
@pytest.mark.parametrize("join", _JOINS)
|
|
def test_bootstrap_argv_is_identity_only_for_the_process_running_it(join: str) -> None:
|
|
store = [str(t) for t in _launchers.runtime_command(ROOT, ["gateway", "run"], python=Path(PY))]
|
|
chat = _JOINS[join]([str(t) for t in _launchers.runtime_command(ROOT, ["chat"], python=Path(PY))])
|
|
# The restart watcher CARRIES a store-launcher gateway command it spawns later (#107002).
|
|
watcher = _JOINS[join]([PY, "-c", "import os, sys, time\npid = int(sys.argv[1]); cmd = sys.argv[2:]\n", "1234", *store])
|
|
assert not looks_like_gateway_command_line(chat) and _hermes_holder_subcommand(chat) == "chat"
|
|
assert not looks_like_gateway_command_line(watcher) and _hermes_holder_subcommand(watcher) is None
|