hermes-agent/hermes_cli/credential_lifecycle.py
Teknium 9a987f142d
fix(credentials): unified provider key delete/update across .env, auth.json, config.yaml (#67213)
* fix(env): recognize export-prefixed .env lines in save/remove (#40041)

load_env() parses bash-compatible 'export KEY=value' lines (#6659), so a
hand-added 'export GITHUB_TOKEN=ghp_...' shows as set (green light) in the
desktop Tools & Keys page. But save_env_value/remove_env_value only matched
plain 'KEY=' lines:

- DELETE /api/env 404'd ('not found in .env') — the token could not be
  removed through the UI
- PUT /api/env appended a SECOND line; a later delete removed the new line
  while the export line silently resurrected the old value

Both writers now match assignments through a shared _env_line_defines_key()
helper that understands the export prefix. Commented-out lines are still
ignored.

Regression tests drive the real dashboard endpoint handlers against a temp
HERMES_HOME with runtime-constructed classic-PAT-shaped fixtures, covering
save-does-not-500, export-line remove, export-line replace-without-duplicate,
and the plain-line path staying intact.

Fixes #40041

* fix(credentials): unify provider key delete/update across .env, auth.json, config.yaml (#51071 #59761 #62269)

A provider API key can live in three stores at once: ~/.hermes/.env,
auth.json credential_pool (env-seeded 'env:<VAR>' entries persisted by the
pool loader), and config.yaml mirrors (model.api_key, auxiliary.*.api_key,
custom_providers[*].api_key). The desktop/dashboard endpoints and the TUI
gateway RPCs only ever mutated .env, so the stores diverged:

- #51071/#59761: DELETE /api/env removed the key from .env but left the
  credential_pool entry (the loader is additive-only and never prunes),
  so the provider kept appearing in the model picker — surviving restart
  via the stale pool entry + provider_models_cache.json row.
- #62269: PUT /api/env rewrote .env but left the OLD key in config.yaml
  (model.api_key wins over env at client construction), producing 401s
  with a key the UI no longer showed.

New hermes_cli/credential_lifecycle.py is the single choke point:

- remove_provider_env_credential(): clears the .env entry, prunes
  env:<VAR> pool entries across ALL providers (a shared var like
  GITHUB_TOKEN can seed several), suppresses the env source so a lingering
  shell export can't re-seed it (matching 'hermes auth remove' semantics),
  drops the affected providers' model-cache rows, and scrubs value-matched
  config.yaml api_key mirrors. Returns 'found' spanning every store so a
  stale pool-only entry is cleanable through the same delete button.
- save_provider_env_credential(): writes .env, rotates any config.yaml
  mirror that held the PREVIOUS value (value-matched — an unrelated inline
  key is untouched), and lifts a prior env-source suppression so re-adding
  behaves like 'hermes auth add'.

OAuth preservation: only entries with source == 'env:<VAR>' are pruned.
OAuth/device-code/manual/borrowed pool entries and providers.<id> OAuth
token blocks are never touched by a key-only delete. (model.disconnect in
the TUI gateway still clears OAuth via clear_provider_auth — that surface
is a full provider disconnect, which is the documented intent there.)

Rerouted call sites: PUT/DELETE /api/env (dashboard + desktop),
tui_gateway model.save_key / model.disconnect, save_env_value_secure
(TUI/gateway secret capture), and hermes config set/unset for env-shaped
keys.

E2E tests drive the real endpoint handlers against temp-HERMES_HOME
fixtures (.env + auth.json + config.yaml with runtime-constructed fake
keys) and assert cross-store consistency after delete/update, pool-reload
survival ('restart'), OAuth preservation, models-cache invalidation, and
the suppress/unsuppress round-trip.

Fixes #51071
Fixes #59761
Fixes #62269
2026-07-19 03:02:21 -07:00

272 lines
10 KiB
Python

"""Unified provider-credential lifecycle across every store Hermes reads.
A provider API key can live in up to THREE stores at once:
1. ``~/.hermes/.env`` — the canonical secret store
2. ``~/.hermes/auth.json`` →
``credential_pool.<provider>[*]`` — env-seeded pool entries
(``source == "env:<VAR>"``) persisted by the pool loader
3. ``~/.hermes/config.yaml`` — inline mirrors written by the
custom-endpoint flows (``model.api_key``, ``auxiliary.<task>.api_key``,
``custom_providers[*].api_key``)
Historically the desktop/dashboard endpoints (PUT/DELETE ``/api/env``) and the
TUI-gateway RPCs only mutated store 1. That divergence is the root cause of a
whole bug family:
* #51071 / #59761 — deleting a key removes it from ``.env`` but the stale
``credential_pool`` entry (and ``provider_models_cache.json`` row)
survives, so the provider keeps appearing in the model picker, even
across restarts (the pool loader is additive-only).
* #62269 — updating a key rewrites ``.env`` but leaves the OLD key in a
higher-precedence ``config.yaml`` mirror (``model.api_key`` wins over
env at client construction), producing persistent 401s with a key the
UI no longer shows.
This module is the single choke point: every surface that saves or removes a
provider credential should route through :func:`save_provider_env_credential`
/ :func:`remove_provider_env_credential` so all three stores stay consistent.
OAuth preservation contract: removal only prunes credential-pool entries whose
``source`` is exactly ``env:<VAR>``. OAuth/device-code/manual/borrowed entries
(``device_code``, ``manual*``, ``gh_cli``, ``claude_code``, ``oauth``, …) and
the ``providers.<id>`` OAuth token blocks in auth.json are never touched —
deleting an API key must not revoke an OAuth grant for the same provider.
Secrecy contract: no function in this module logs, prints, or returns a
credential value. Results carry key NAMES and config PATHS only.
"""
from __future__ import annotations
from typing import Any, Dict, List
__all__ = [
"save_provider_env_credential",
"remove_provider_env_credential",
"purge_env_credential_references",
]
def _providers_for_env_var(env_var: str) -> List[str]:
"""Provider ids whose registered api_key_env_vars include ``env_var``."""
try:
from hermes_cli.auth import PROVIDER_REGISTRY
except Exception:
return []
hits: List[str] = []
for pid, cfg in PROVIDER_REGISTRY.items():
try:
if env_var in (cfg.api_key_env_vars or ()):
hits.append(pid)
except Exception:
continue
return hits
def _prune_env_pool_entries(env_var: str) -> List[str]:
"""Drop ``credential_pool`` entries seeded from ``env:<env_var>``.
Operates across ALL providers in the pool (the source string names the
env var unambiguously, and shared vars like GITHUB_TOKEN may seed more
than one provider). Entries with any other source — OAuth, device-code,
manual, borrowed-CLI — are preserved verbatim, as are the
``providers.<id>`` OAuth blocks.
Returns the list of provider ids that had entries pruned.
"""
from hermes_cli.auth import _auth_store_lock, _load_auth_store, _save_auth_store
source = f"env:{env_var}"
pruned: List[str] = []
with _auth_store_lock():
auth_store = _load_auth_store()
pool = auth_store.get("credential_pool")
if not isinstance(pool, dict):
return pruned
changed = False
for provider in list(pool.keys()):
entries = pool[provider]
if not isinstance(entries, list):
continue
kept = [
entry
for entry in entries
if not (isinstance(entry, dict) and entry.get("source") == source)
]
if len(kept) == len(entries):
continue
changed = True
pruned.append(provider)
if kept:
pool[provider] = kept
else:
del pool[provider]
if changed:
_save_auth_store(auth_store)
return pruned
def _scrub_config_yaml_mirrors(old_value: str, new_value: str | None) -> List[str]:
"""Reconcile config.yaml api_key mirrors that hold ``old_value``.
Value-matched on purpose: we only touch a config entry when it provably
holds the SAME credential that just changed in ``.env`` — an independent
key the user configured for a different endpoint is left alone.
``new_value=None`` removes the mirror field; a string replaces it.
Operates on the RAW user config (never the defaults-merged view) so the
write doesn't bake defaults into the user's file. Returns the dotted
paths that were updated (names only — never values).
"""
if not old_value:
return []
from utils import atomic_yaml_write, fast_safe_load
from hermes_cli.config import (
get_config_path,
require_readable_config_before_write,
)
config_path = get_config_path()
if not config_path.exists():
return []
try:
with open(config_path, encoding="utf-8") as f:
user_config = fast_safe_load(f) or {}
except Exception:
return []
if not isinstance(user_config, dict):
return []
touched: List[str] = []
def _fix(section: Any, key_path: str) -> None:
if not isinstance(section, dict):
return
# "api" is the legacy alias for model.api_key kept by older configs.
for field in ("api_key", "api"):
current = section.get(field)
if isinstance(current, str) and current == old_value:
if new_value:
section[field] = new_value
else:
section.pop(field, None)
touched.append(f"{key_path}.{field}")
_fix(user_config.get("model"), "model")
aux = user_config.get("auxiliary")
if isinstance(aux, dict):
for task, slot_cfg in aux.items():
_fix(slot_cfg, f"auxiliary.{task}")
custom = user_config.get("custom_providers")
if isinstance(custom, list):
for idx, entry in enumerate(custom):
_fix(entry, f"custom_providers.{idx}")
elif isinstance(custom, dict):
for name, entry in custom.items():
_fix(entry, f"custom_providers.{name}")
if touched:
require_readable_config_before_write(config_path)
atomic_yaml_write(config_path, user_config, sort_keys=False)
return touched
def purge_env_credential_references(
env_var: str, *, clear_models_cache: bool = True
) -> Dict[str, Any]:
"""Remove non-.env references to an env-var credential.
Prunes ``credential_pool`` env-seeded entries and (optionally) the
affected providers' rows in ``provider_models_cache.json`` so the model
picker stops advertising a provider whose key is gone (#59761).
"""
pruned = _prune_env_pool_entries(env_var)
providers = sorted(set(pruned) | set(_providers_for_env_var(env_var)))
# Make the removal sticky the same way `hermes auth remove` does: a
# lingering shell export (or another live process's os.environ) would
# otherwise re-seed the pool entry on the next load_pool(). The matching
# save path lifts the suppression on an explicit re-add.
try:
from hermes_cli.auth import suppress_credential_source
for provider in providers:
suppress_credential_source(provider, f"env:{env_var}")
except Exception:
pass
if clear_models_cache and providers:
try:
from hermes_cli.models import clear_provider_models_cache
for provider in providers:
clear_provider_models_cache(provider)
except Exception:
# Cache cleanup is best-effort — a failure here must not block
# the credential removal itself.
pass
return {"pool_pruned": pruned, "providers": providers}
def save_provider_env_credential(env_var: str, value: str) -> Dict[str, Any]:
"""Save/update a credential in ``.env`` and reconcile every mirror.
After the ``.env`` write, any config.yaml mirror that held the PREVIOUS
value of this var (``model.api_key`` etc.) is updated to the new value so
a stale higher-precedence copy cannot shadow the rotation (#62269).
Suppressed ``env:<VAR>`` pool sources are re-enabled so a deliberate
re-add through the UI behaves like ``hermes auth add``.
"""
from hermes_cli.config import load_env, save_env_value
old_value = load_env().get(env_var)
save_env_value(env_var, value)
config_updates: List[str] = []
if value and old_value and old_value != value:
config_updates = _scrub_config_yaml_mirrors(old_value, value)
# A prior UI/CLI removal may have suppressed this env source; a fresh
# save is an explicit re-add, so lift the suppression for every provider
# that reads this var.
try:
from hermes_cli.auth import unsuppress_credential_source
for provider in _providers_for_env_var(env_var):
unsuppress_credential_source(provider, f"env:{env_var}")
except Exception:
pass
return {"ok": True, "key": env_var, "config_updates": config_updates}
def remove_provider_env_credential(env_var: str) -> Dict[str, Any]:
"""Remove a credential from EVERY store it lives in.
Clears the ``.env`` entry (and process env), prunes env-seeded
``credential_pool`` entries, drops the affected providers' model-cache
rows, and removes any config.yaml mirror holding the same value.
OAuth/device-code/manual credentials are preserved (see module docstring).
``found`` is True when ANY store held the credential — callers that
previously 404'd on ".env miss" should key off this instead so a stale
pool-only entry can still be cleaned up through the same button.
"""
from hermes_cli.config import load_env, remove_env_value
old_value = load_env().get(env_var)
removed_from_env = remove_env_value(env_var)
refs = purge_env_credential_references(env_var)
config_scrubbed = _scrub_config_yaml_mirrors(old_value, None) if old_value else []
return {
"ok": True,
"key": env_var,
"removed": removed_from_env,
"pool_pruned": refs["pool_pruned"],
"providers": refs["providers"],
"config_scrubbed": config_scrubbed,
"found": bool(removed_from_env or refs["pool_pruned"] or config_scrubbed),
}