mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-30 06:41:51 +00:00
a618789dba
Two parallel public-path allowlists drifted: _PUBLIC_API_PATHS in
hermes_cli/web_server.py (legacy _SESSION_TOKEN middleware) and
_GATE_PUBLIC_PREFIXES in hermes_cli/dashboard_auth/middleware.py
(OAuth gate). The legacy list included /api/status (documented as a
non-sensitive read-only liveness target); the OAuth gate's list did not.
Effect: every wildcard-subdomain agent surfaced as STARTING/down to the
portal even though the dashboard was serving correctly. Nous account
service (src/server/agents/fly-provider.ts
getInstanceRuntimeStatus) fetches ``/api/status`` without a cookie
as its sole liveness probe; the OAuth gate's 401 looked identical to
'agent dead' on the portal side.
Fix: lift the allowlist into hermes_cli/dashboard_auth/public_paths.py
and have both middlewares import it. _path_is_public now consults
the shared frozenset first, then falls back to the gate's
auth-bootstrap/static prefix list. Future additions to the public list
hit both gates automatically.
Endpoint inventory (verified safe to remain public):
* /api/status — version, gateway state, active session count,
auth-gate shape. Portal liveness probe target.
* /api/config/defaults — config-defaults feed for the SPA's Config page
* /api/config/schema — config schema for the SPA's Config page
* /api/model/info — model catalogue metadata (context windows)
* /api/dashboard/themes — theme manifests for the skin engine
* /api/dashboard/plugins — plugin manifests for the dashboard
No user data, no session content, no secrets. Same shape an external
monitoring agent would hit on /healthz.
Tests:
* New: test_gated_status_is_public (regression guard with the NAS
fly-provider.ts liveness-probe rationale spelled out in the docstring)
* New: test_other_public_api_paths_are_public_under_gate (parametrised
over the rest of PUBLIC_API_PATHS — proves 401 / 302-to-login is
never the response)
* New: docker integration check #3 in
test_dashboard_oauth_gate_engaged_by_default — /api/status
remains 200 under the gate AND reports auth_required=True so the
portal can distinguish modes
* Updated: test_full_login_round_trip_unlocks_gated_api now probes
/api/sessions instead of /api/status (status is public, so it
can no longer distinguish 'logged in' from 'gate accidentally
disabled')
* Updated: TestApi401Envelope (the no-cookie / invalid-cookie /
dead-cookie tests) probes /api/sessions for the same reason
* Updated: docker integration check #2 in
test_dashboard_oauth_gate_engaged_by_default probes
/api/sessions to prove the gate is intercepting
* Removed: dead _login() helper in
test_dashboard_auth_status_endpoint.py (no longer needed since
/api/status is reachable cold)
Companion to docs/handover/hermes-agent-dashboard-s6-insecure-fix.md
(the --insecure flag fix that shipped earlier).
98 lines
3.9 KiB
Python
98 lines
3.9 KiB
Python
"""Phase 7 — /api/status exposes auth-gate state + AuthWidget integration.
|
|
|
|
The dashboard's status endpoint now reports ``auth_required`` and
|
|
``auth_providers`` so the AuthWidget + StatusPage can render the
|
|
correct "gated / loopback" badge without a separate round trip. This
|
|
test asserts both shapes (gated and loopback).
|
|
|
|
The AuthWidget itself is .tsx — no Python test here. The widget's
|
|
behaviour (renders nothing on 401, shows truncated user_id, etc.) is
|
|
documented in AuthWidget.tsx; covered manually via the Phase 4.2
|
|
smoke test against staging Portal.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
|
|
from hermes_cli import web_server
|
|
from hermes_cli.dashboard_auth import clear_providers, register_provider
|
|
from tests.hermes_cli.conftest_dashboard_auth import StubAuthProvider
|
|
|
|
# These tests mutate ``web_server.app.state.auth_required`` so they share
|
|
# the same xdist group as the other dashboard-auth gated_app tests.
|
|
pytestmark = pytest.mark.xdist_group("dashboard_auth_app_state")
|
|
|
|
|
|
@pytest.fixture
|
|
def gated_client():
|
|
clear_providers()
|
|
register_provider(StubAuthProvider())
|
|
prev_host = getattr(web_server.app.state, "bound_host", None)
|
|
prev_port = getattr(web_server.app.state, "bound_port", None)
|
|
prev_required = getattr(web_server.app.state, "auth_required", None)
|
|
web_server.app.state.bound_host = "fly-app.fly.dev"
|
|
web_server.app.state.bound_port = 443
|
|
web_server.app.state.auth_required = True
|
|
client = TestClient(web_server.app, base_url="https://fly-app.fly.dev")
|
|
yield client
|
|
clear_providers()
|
|
web_server.app.state.bound_host = prev_host
|
|
web_server.app.state.bound_port = prev_port
|
|
web_server.app.state.auth_required = prev_required
|
|
|
|
|
|
@pytest.fixture
|
|
def loopback_client():
|
|
clear_providers()
|
|
prev_host = getattr(web_server.app.state, "bound_host", None)
|
|
prev_port = getattr(web_server.app.state, "bound_port", None)
|
|
prev_required = getattr(web_server.app.state, "auth_required", None)
|
|
web_server.app.state.bound_host = "127.0.0.1"
|
|
web_server.app.state.bound_port = 8080
|
|
web_server.app.state.auth_required = False
|
|
client = TestClient(web_server.app, base_url="http://127.0.0.1:8080")
|
|
yield client
|
|
web_server.app.state.bound_host = prev_host
|
|
web_server.app.state.bound_port = prev_port
|
|
web_server.app.state.auth_required = prev_required
|
|
|
|
|
|
def test_status_reports_auth_required_in_gated_mode(gated_client):
|
|
# No ``_login()`` call — ``/api/status`` is in the shared
|
|
# ``PUBLIC_API_PATHS`` allowlist precisely so external probes (and
|
|
# the SPA's pre-login bootstrap) can read the gate's shape without
|
|
# a cookie. Hit it cold.
|
|
r = gated_client.get("/api/status")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["auth_required"] is True
|
|
assert body["auth_providers"] == ["stub"]
|
|
|
|
|
|
def test_status_reports_auth_disabled_in_loopback_mode(loopback_client):
|
|
r = loopback_client.get("/api/status")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["auth_required"] is False
|
|
# Loopback mode has no registered providers (the Nous plugin's env
|
|
# vars aren't set in test).
|
|
assert body["auth_providers"] == []
|
|
|
|
|
|
def test_status_preserves_existing_fields(loopback_client):
|
|
"""Defence-in-depth: adding auth_required/auth_providers must not
|
|
have dropped any previous field (the dashboard's React StatusPage
|
|
relies on the full payload shape)."""
|
|
r = loopback_client.get("/api/status")
|
|
body = r.json()
|
|
expected_keys = {
|
|
"version", "release_date", "hermes_home", "config_path", "env_path",
|
|
"config_version", "latest_config_version", "gateway_running",
|
|
"gateway_pid", "gateway_health_url", "gateway_state",
|
|
"gateway_platforms", "gateway_exit_reason", "gateway_updated_at",
|
|
"active_sessions", "auth_required", "auth_providers",
|
|
}
|
|
missing = expected_keys - set(body.keys())
|
|
assert not missing, f"/api/status dropped fields: {missing}"
|