mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-27 11:22:03 +00:00
cb9cb6ba1c
Task 2.0a of the safe-shutdown drain-coordination plan. Widens the dashboard auth framework GENERICALLY to support non-interactive (service-to-service) bearer-token auth, mirroring the existing supports_password precedent. This is a reusable capability — any future machine-credential provider plugs in without core changes (decisions.md Q-C). The drain bearer-secret plugin (Task 2.0b) is the first consumer, not the definition. - base.py: add TokenPrincipal dataclass (the token analog of Session) + supports_token capability flag + verify_token() on the ABC (default raises NotImplementedError so a misconfigured provider fails loud). Contract mirrors verify_session stacking: return None for unrecognised tokens (never raise), raise ProviderError only on a genuine backing-store outage. - registry.py: list_token_providers() — the supports_token subset, in registration order. Empty when none registered (token routes fail closed). - token_auth.py (new): route-agnostic seam. Routes opt in via register_token_route(exact path); token_auth_middleware owns the auth decision for those routes only — authenticate via stacked providers, attach request.state.token_principal + token_authenticated, pass through. 401 on missing/unrecognised token, 503 when a provider was unreachable, untouched passthrough for non-token routes. Fails closed (never open). - web_server.py: install the seam OUTERMOST (registered last → runs first). Both downstream gates (legacy auth_middleware + gated_auth_middleware) honour request.state.token_authenticated and skip enforcement, so a token-authed service request is never bounced to /login. - audit.py: TOKEN_AUTH_SUCCESS / TOKEN_AUTH_FAILURE events. Tests: tests/hermes_cli/test_dashboard_token_auth.py — ABC flag default, verify_token NotImplementedError, registry filter, bearer extraction (case-insensitive scheme, malformed/non-bearer → ""), provider stacking (first-match-wins, unreachable-remembered, unreachable-then-valid, buggy provider doesn't crash the gate), and the seam's passthrough/401/503/ fail-closed behaviour. 29 new tests; full dashboard-auth suite 169 passed. Intentionally deferred: - The concrete shared-bearer-secret provider plugin — Task 2.0b. - The begin/cancel-drain endpoint that registers itself as a token route — Task 2.1. Build status: dashboard-auth + plugin-hook suites green.
72 lines
2.3 KiB
Python
72 lines
2.3 KiB
Python
"""Module-level registry for DashboardAuthProvider instances.
|
|
|
|
Plugins call ``register_provider`` via the plugin context hook at startup.
|
|
The auth gate middleware iterates ``list_providers()`` and uses
|
|
``get_provider`` to dispatch on the session's ``provider`` field.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
from typing import List, Optional
|
|
|
|
from hermes_cli.dashboard_auth.base import (
|
|
DashboardAuthProvider,
|
|
assert_protocol_compliance,
|
|
)
|
|
|
|
_log = logging.getLogger(__name__)
|
|
_lock = threading.Lock()
|
|
_providers: dict[str, DashboardAuthProvider] = {}
|
|
|
|
|
|
def register_provider(provider: DashboardAuthProvider) -> None:
|
|
"""Register a provider.
|
|
|
|
Raises:
|
|
TypeError: on protocol violation.
|
|
ValueError: if a provider with the same name is already registered.
|
|
"""
|
|
assert_protocol_compliance(type(provider))
|
|
with _lock:
|
|
if provider.name in _providers:
|
|
raise ValueError(
|
|
f"dashboard-auth provider already registered: {provider.name!r}"
|
|
)
|
|
_providers[provider.name] = provider
|
|
_log.info(
|
|
"dashboard-auth: registered provider %r (%s)",
|
|
provider.name, provider.display_name,
|
|
)
|
|
|
|
|
|
def get_provider(name: str) -> Optional[DashboardAuthProvider]:
|
|
"""Return the registered provider for ``name``, or None if unknown."""
|
|
with _lock:
|
|
return _providers.get(name)
|
|
|
|
|
|
def list_providers() -> List[DashboardAuthProvider]:
|
|
"""All registered providers, in registration order."""
|
|
with _lock:
|
|
return list(_providers.values())
|
|
|
|
|
|
def list_token_providers() -> List[DashboardAuthProvider]:
|
|
"""Registered providers that support non-interactive token auth.
|
|
|
|
The subset of ``list_providers()`` whose ``supports_token`` flag is True,
|
|
in registration order. The ``token_auth`` middleware seam consults these
|
|
(and only these) when a token-authable route is hit, so OAuth/password-only
|
|
providers are never asked to ``verify_token``. Returns an empty list when
|
|
no token provider is registered — a token-authable route then fails
|
|
closed (401), never open.
|
|
"""
|
|
with _lock:
|
|
return [p for p in _providers.values() if getattr(p, "supports_token", False)]
|
|
|
|
|
|
def clear_providers() -> None:
|
|
"""Test-only: drop all registrations."""
|
|
with _lock:
|
|
_providers.clear()
|