4e2bd09229
After the native-identity change for custom roots (#105525 / PR #106611) a custom HERMES_HOME names its service `hermes-gateway-<8hex>`, but an install made before that change left the bare `hermes-gateway.service` user unit pinning that same root. `_systemd_unit_installed()` only probed the recomputed name, so `gateway restart/stop/status` saw no unit: `restart` fell through to a foreground `run_gateway()` while the still-enabled legacy unit's Restart=always looped on the instance lock ("Gateway already running") and the shell hung on the foreground gateway. `_bare_unit_pinned_home()` already made an installed bare SYSTEM unit the naming authority for root; the user scope now does the same with its own bare USER unit. A unit whose pinned HERMES_HOME resolves to this home is this home's service whatever it is named, so every lifecycle command (restart, stop, status, install-in-place, uninstall) discovers and adopts it. The match is exact-home only: a bare unit pinning another home — including the production default from a temp-home harness — still yields this home's own suffix, and an unprivileged process never reads the system unit (the profile-aliasing hazard the root gate existed for). No new legacy name is added to `_LEGACY_SERVICE_NAMES`: that sweep removes units, and the bare unit is the correct unit for a default home. WHEN L5 (lifecycle commands run against an env-bound home) / WHERE T4 (user systemd unit), T1. (cherry picked from commit 037ff16bea7d1e4ce513543ebd14320ccf49b1a3)
59 lines
2.7 KiB
Python
59 lines
2.7 KiB
Python
"""User systemd unit location and identity: the account home owns the unit dir (#98699) and a bare
|
|
``hermes-gateway.service`` pinning THIS home is this home's service (#109476)."""
|
|
|
|
import pytest
|
|
|
|
import hermes_cli.gateway as gateway
|
|
|
|
pytestmark = pytest.mark.platforms("linux")
|
|
|
|
|
|
def test_user_unit_dir_follows_the_account_home_not_a_profile_pinned_process_home(tmp_path, monkeypatch):
|
|
# ``hermes -p x gateway install`` launched from a process whose HOME profile isolation already
|
|
# pointed at the ACTIVE profile's ``{HERMES_HOME}/home``; the unit must land where
|
|
# ``systemctl --user`` looks — under the account home — not under that profile dir.
|
|
account_home = tmp_path / "account"
|
|
active_root = tmp_path / "active-profile-root"
|
|
process_home = active_root / "home"
|
|
process_home.mkdir(parents=True)
|
|
monkeypatch.setenv("HERMES_HOME", str(active_root))
|
|
monkeypatch.setenv("HOME", str(process_home))
|
|
monkeypatch.setenv("HERMES_REAL_HOME", str(account_home))
|
|
monkeypatch.delenv("XDG_CONFIG_HOME", raising=False)
|
|
|
|
unit_path = gateway.get_systemd_unit_path(system=False)
|
|
|
|
assert unit_path.parent == account_home / ".config" / "systemd" / "user"
|
|
assert not unit_path.is_relative_to(process_home)
|
|
|
|
|
|
def test_bare_user_unit_pinning_this_custom_home_is_adopted_by_lifecycle_commands(tmp_path, monkeypatch):
|
|
# A pre-#106611 install of a custom root left ``hermes-gateway.service`` (bare) pinning that root;
|
|
# the recomputed ``hermes-gateway-<hash>`` name made it invisible and ``restart`` ran foreground.
|
|
custom_root = tmp_path / "hermes"
|
|
custom_root.mkdir()
|
|
unit_dir = tmp_path / "xdg" / "systemd" / "user"
|
|
unit_dir.mkdir(parents=True)
|
|
monkeypatch.setenv("HERMES_HOME", str(custom_root))
|
|
monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "xdg"))
|
|
monkeypatch.setattr(gateway, "is_linux", lambda: True)
|
|
monkeypatch.setattr(gateway.os, "geteuid", lambda: 1000)
|
|
monkeypatch.setattr(gateway, "supports_systemd_services", lambda: True)
|
|
legacy_unit = unit_dir / "hermes-gateway.service"
|
|
|
|
# A bare unit that pins ANOTHER home is someone else's service: this home keeps its own name.
|
|
legacy_unit.write_text(
|
|
f'[Service]\nEnvironment="HERMES_HOME={tmp_path / "other"}"\nExecStart=/usr/bin/hermes gateway run\n',
|
|
encoding="utf-8",
|
|
)
|
|
assert gateway.get_service_name() != "hermes-gateway"
|
|
assert not gateway._systemd_unit_installed()
|
|
|
|
legacy_unit.write_text(
|
|
f'[Service]\nEnvironment="HERMES_HOME={custom_root}"\nRestart=always\nExecStart=/usr/bin/hermes gateway run\n',
|
|
encoding="utf-8",
|
|
)
|
|
assert gateway.get_service_name() == "hermes-gateway"
|
|
assert gateway.get_systemd_unit_path(system=False) == legacy_unit
|
|
assert gateway._systemd_unit_installed()
|