mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
Rewrite all import statements, patch() targets, sys.modules keys, importlib.import_module() strings, and subprocess -m references to use hermes_agent.* paths. Strip sys.path.insert hacks from production code (rely on editable install). Update COMPONENT_PREFIXES for logger filtering. Fix 3 hardcoded getLogger() calls to use __name__. Update transport and tool registry discovery paths. Update plugin module path strings. Add legacy process-name patterns for gateway PID detection. Add main() to skills_sync for console_script entry point. Fix _get_bundled_dir() path traversal after move. Part of #14182, #14183
341 lines
13 KiB
Python
341 lines
13 KiB
Python
import queue
|
|
import threading
|
|
import time
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import hermes_agent.cli.repl as cli_module
|
|
from hermes_agent.cli.repl import HermesCLI
|
|
|
|
|
|
class _FakeBuffer:
|
|
def __init__(self, text="", cursor_position=None):
|
|
self.text = text
|
|
self.cursor_position = len(text) if cursor_position is None else cursor_position
|
|
|
|
def reset(self, append_to_history=False):
|
|
self.text = ""
|
|
self.cursor_position = 0
|
|
|
|
|
|
def _make_cli_stub():
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli._approval_state = None
|
|
cli._approval_deadline = 0
|
|
cli._approval_lock = threading.Lock()
|
|
cli._sudo_state = None
|
|
cli._sudo_deadline = 0
|
|
cli._modal_input_snapshot = None
|
|
cli._invalidate = MagicMock()
|
|
cli._app = SimpleNamespace(invalidate=MagicMock(), current_buffer=_FakeBuffer())
|
|
return cli
|
|
|
|
|
|
class TestCliApprovalUi:
|
|
def test_sudo_prompt_restores_existing_draft_after_response(self):
|
|
cli = _make_cli_stub()
|
|
cli._app.current_buffer = _FakeBuffer("draft command", cursor_position=5)
|
|
result = {}
|
|
|
|
def _run_callback():
|
|
result["value"] = cli._sudo_password_callback()
|
|
|
|
with patch.object(cli_module, "_cprint"):
|
|
thread = threading.Thread(target=_run_callback, daemon=True)
|
|
thread.start()
|
|
|
|
deadline = time.time() + 2
|
|
while cli._sudo_state is None and time.time() < deadline:
|
|
time.sleep(0.01)
|
|
|
|
assert cli._sudo_state is not None
|
|
assert cli._app.current_buffer.text == ""
|
|
|
|
cli._app.current_buffer.text = "secret"
|
|
cli._app.current_buffer.cursor_position = len("secret")
|
|
cli._sudo_state["response_queue"].put("secret")
|
|
|
|
thread.join(timeout=2)
|
|
|
|
assert result["value"] == "secret"
|
|
assert cli._app.current_buffer.text == "draft command"
|
|
assert cli._app.current_buffer.cursor_position == 5
|
|
|
|
def test_approval_callback_includes_view_for_long_commands(self):
|
|
cli = _make_cli_stub()
|
|
command = "sudo dd if=/tmp/githubcli-keyring.gpg of=/usr/share/keyrings/githubcli-archive-keyring.gpg bs=4M status=progress"
|
|
result = {}
|
|
|
|
def _run_callback():
|
|
result["value"] = cli._approval_callback(command, "disk copy")
|
|
|
|
thread = threading.Thread(target=_run_callback, daemon=True)
|
|
thread.start()
|
|
|
|
deadline = time.time() + 2
|
|
while cli._approval_state is None and time.time() < deadline:
|
|
time.sleep(0.01)
|
|
|
|
assert cli._approval_state is not None
|
|
assert "view" in cli._approval_state["choices"]
|
|
|
|
cli._approval_state["response_queue"].put("deny")
|
|
thread.join(timeout=2)
|
|
assert result["value"] == "deny"
|
|
|
|
def test_handle_approval_selection_view_expands_in_place(self):
|
|
cli = _make_cli_stub()
|
|
cli._approval_state = {
|
|
"command": "sudo dd if=/tmp/in of=/usr/share/keyrings/githubcli-archive-keyring.gpg bs=4M status=progress",
|
|
"description": "disk copy",
|
|
"choices": ["once", "session", "always", "deny", "view"],
|
|
"selected": 4,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
cli._handle_approval_selection()
|
|
|
|
assert cli._approval_state is not None
|
|
assert cli._approval_state["show_full"] is True
|
|
assert "view" not in cli._approval_state["choices"]
|
|
assert cli._approval_state["selected"] == 3
|
|
assert cli._approval_state["response_queue"].empty()
|
|
|
|
def test_approval_display_places_title_inside_box_not_border(self):
|
|
cli = _make_cli_stub()
|
|
cli._approval_state = {
|
|
"command": "sudo dd if=/tmp/in of=/usr/share/keyrings/githubcli-archive-keyring.gpg bs=4M status=progress",
|
|
"description": "disk copy",
|
|
"choices": ["once", "session", "always", "deny", "view"],
|
|
"selected": 0,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
fragments = cli._get_approval_display_fragments()
|
|
rendered = "".join(text for _style, text in fragments)
|
|
lines = rendered.splitlines()
|
|
|
|
assert lines[0].startswith("╭")
|
|
assert "Dangerous Command" not in lines[0]
|
|
assert any("Dangerous Command" in line for line in lines[1:3])
|
|
assert "Show full command" in rendered
|
|
assert "githubcli-archive-keyring.gpg" not in rendered
|
|
|
|
def test_approval_display_shows_full_command_after_view(self):
|
|
cli = _make_cli_stub()
|
|
full_command = "sudo dd if=/tmp/in of=/usr/share/keyrings/githubcli-archive-keyring.gpg bs=4M status=progress"
|
|
cli._approval_state = {
|
|
"command": full_command,
|
|
"description": "disk copy",
|
|
"choices": ["once", "session", "always", "deny"],
|
|
"selected": 0,
|
|
"show_full": True,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
fragments = cli._get_approval_display_fragments()
|
|
rendered = "".join(text for _style, text in fragments)
|
|
|
|
assert "..." not in rendered
|
|
assert "githubcli-" in rendered
|
|
assert "archive-" in rendered
|
|
assert "keyring.gpg" in rendered
|
|
assert "status=progress" in rendered
|
|
|
|
def test_approval_display_preserves_command_and_choices_with_long_description(self):
|
|
"""Regression: long tirith descriptions used to push approve/deny off-screen.
|
|
|
|
The panel must always render the command and every choice, even when
|
|
the description would otherwise wrap into 10+ lines. The description
|
|
gets truncated with a marker instead.
|
|
"""
|
|
cli = _make_cli_stub()
|
|
long_desc = (
|
|
"Security scan — [CRITICAL] Destructive shell command with wildcard expansion: "
|
|
"The command performs a recursive deletion of log files which may contain "
|
|
"audit information relevant to active incident investigations, running services "
|
|
"that rely on log files for state, rotated archives, and other system artifacts. "
|
|
"Review whether this is intended before approving. Consider whether a targeted "
|
|
"deletion with more specific filters would better match the intent."
|
|
)
|
|
cli._approval_state = {
|
|
"command": "rm -rf /var/log/apache2/*.log",
|
|
"description": long_desc,
|
|
"choices": ["once", "session", "always", "deny"],
|
|
"selected": 0,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
# Simulate a compact terminal where the old unbounded panel would overflow.
|
|
import shutil as _shutil
|
|
|
|
with patch("hermes_agent.cli.repl.shutil.get_terminal_size",
|
|
return_value=_shutil.os.terminal_size((100, 20))):
|
|
fragments = cli._get_approval_display_fragments()
|
|
|
|
rendered = "".join(text for _style, text in fragments)
|
|
|
|
# Command must be fully visible (rm -rf /var/log/apache2/*.log is short).
|
|
assert "rm -rf /var/log/apache2/*.log" in rendered
|
|
|
|
# Every choice must render — this is the core bug: approve/deny were
|
|
# getting clipped off the bottom of the panel.
|
|
assert "Allow once" in rendered
|
|
assert "Allow for this session" in rendered
|
|
assert "Add to permanent allowlist" in rendered
|
|
assert "Deny" in rendered
|
|
|
|
# The bottom border must render (i.e. the panel is self-contained).
|
|
assert rendered.rstrip().endswith("╯")
|
|
|
|
# The description gets truncated — marker should appear.
|
|
assert "(description truncated)" in rendered
|
|
|
|
def test_approval_display_skips_description_on_very_short_terminal(self):
|
|
"""On a 12-row terminal, only the command and choices have room.
|
|
|
|
The description is dropped entirely rather than partially shown, so the
|
|
choices never get clipped.
|
|
"""
|
|
cli = _make_cli_stub()
|
|
cli._approval_state = {
|
|
"command": "rm -rf /var/log/apache2/*.log",
|
|
"description": "recursive delete",
|
|
"choices": ["once", "session", "always", "deny"],
|
|
"selected": 0,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
import shutil as _shutil
|
|
|
|
with patch("hermes_agent.cli.repl.shutil.get_terminal_size",
|
|
return_value=_shutil.os.terminal_size((100, 12))):
|
|
fragments = cli._get_approval_display_fragments()
|
|
|
|
rendered = "".join(text for _style, text in fragments)
|
|
|
|
# Command visible.
|
|
assert "rm -rf /var/log/apache2/*.log" in rendered
|
|
# All four choices visible.
|
|
for label in ("Allow once", "Allow for this session",
|
|
"Add to permanent allowlist", "Deny"):
|
|
assert label in rendered, f"choice {label!r} missing"
|
|
|
|
def test_approval_display_truncates_giant_command_in_view_mode(self):
|
|
"""If the user hits /view on a massive command, choices still render.
|
|
|
|
The command gets truncated with a marker; the description gets dropped
|
|
if there's no remaining row budget.
|
|
"""
|
|
cli = _make_cli_stub()
|
|
# 50 lines of command when wrapped at ~64 chars.
|
|
giant_cmd = "bash -c 'echo " + ("x" * 3000) + "'"
|
|
cli._approval_state = {
|
|
"command": giant_cmd,
|
|
"description": "shell command via -c/-lc flag",
|
|
"choices": ["once", "session", "always", "deny"],
|
|
"selected": 0,
|
|
"show_full": True,
|
|
"response_queue": queue.Queue(),
|
|
}
|
|
|
|
import shutil as _shutil
|
|
|
|
with patch("hermes_agent.cli.repl.shutil.get_terminal_size",
|
|
return_value=_shutil.os.terminal_size((100, 24))):
|
|
fragments = cli._get_approval_display_fragments()
|
|
|
|
rendered = "".join(text for _style, text in fragments)
|
|
|
|
# All four choices visible even with a huge command.
|
|
for label in ("Allow once", "Allow for this session",
|
|
"Add to permanent allowlist", "Deny"):
|
|
assert label in rendered, f"choice {label!r} missing"
|
|
|
|
# Command got truncated with a marker.
|
|
assert "(command truncated" in rendered
|
|
|
|
|
|
class TestApprovalCallbackThreadLocalWiring:
|
|
"""Regression guard for the thread-local callback freeze (#13617 / #13618).
|
|
|
|
After 62348cff made _approval_callback / _sudo_password_callback thread-local
|
|
(ACP GHSA-qg5c-hvr5-hjgr), the CLI agent thread could no longer see callbacks
|
|
registered in the main thread — the dangerous-command prompt silently fell
|
|
back to stdin input() and deadlocked against prompt_toolkit. The fix is to
|
|
register the callbacks INSIDE the agent worker thread (matching the ACP
|
|
pattern). These tests lock in that invariant.
|
|
"""
|
|
|
|
def test_main_thread_registration_is_invisible_to_child_thread(self):
|
|
"""Confirms the underlying threading.local semantics that drove the bug.
|
|
|
|
If this ever starts passing as "visible", the thread-local isolation
|
|
is gone and the ACP race GHSA-qg5c-hvr5-hjgr may be back.
|
|
"""
|
|
from hermes_agent.tools.terminal import (
|
|
set_approval_callback,
|
|
_get_approval_callback,
|
|
)
|
|
|
|
def main_cb(_cmd, _desc):
|
|
return "once"
|
|
|
|
set_approval_callback(main_cb)
|
|
try:
|
|
seen = {}
|
|
|
|
def _child():
|
|
seen["value"] = _get_approval_callback()
|
|
|
|
t = threading.Thread(target=_child, daemon=True)
|
|
t.start()
|
|
t.join(timeout=2)
|
|
assert seen["value"] is None
|
|
finally:
|
|
set_approval_callback(None)
|
|
|
|
def test_child_thread_registration_is_visible_and_cleared_in_finally(self):
|
|
"""The fix pattern: register INSIDE the worker thread, clear in finally.
|
|
|
|
This is exactly what cli.py's run_agent() closure does. If this test
|
|
fails, the CLI approval prompt freeze (#13617) has regressed.
|
|
"""
|
|
from hermes_agent.tools.terminal import (
|
|
set_approval_callback,
|
|
set_sudo_password_callback,
|
|
_get_approval_callback,
|
|
_get_sudo_password_callback,
|
|
)
|
|
|
|
def approval_cb(_cmd, _desc):
|
|
return "once"
|
|
|
|
def sudo_cb():
|
|
return "hunter2"
|
|
|
|
seen = {}
|
|
|
|
def _worker():
|
|
# Mimic cli.py's run_agent() thread target.
|
|
set_approval_callback(approval_cb)
|
|
set_sudo_password_callback(sudo_cb)
|
|
try:
|
|
seen["approval"] = _get_approval_callback()
|
|
seen["sudo"] = _get_sudo_password_callback()
|
|
finally:
|
|
set_approval_callback(None)
|
|
set_sudo_password_callback(None)
|
|
seen["approval_after"] = _get_approval_callback()
|
|
seen["sudo_after"] = _get_sudo_password_callback()
|
|
|
|
t = threading.Thread(target=_worker, daemon=True)
|
|
t.start()
|
|
t.join(timeout=2)
|
|
|
|
assert seen["approval"] is approval_cb
|
|
assert seen["sudo"] is sudo_cb
|
|
# Finally block must clear both slots — otherwise a reused thread
|
|
# would hold a stale reference to a disposed CLI instance.
|
|
assert seen["approval_after"] is None
|
|
assert seen["sudo_after"] is None
|