hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

refactor(dashboard): hoist /api/env preview check out of the write thread

Browse Source 
Why: PUT /api/env raised the preview rejection as ValueError inside the
profile-scoped thread only because _env_write_errors(http_passthrough=False)
would downgrade an HTTPException to a 500. The check needs neither the
profile scope nor the thread, so run it up front and raise HTTPException(400)
directly like the messaging and custom-endpoint sites; the original one-line
lambda is restored. Also drop the ad-hoc ${…} regex copy in favour of the
existing _ENV_REF_RE.fullmatch from hermes_cli.config (identical matches).
Behaviour unchanged: 400 and secret intact (gate/probes/S1_e2e.py CLEAN).
This commit is contained in:
kshitijk4poor
2026-09-24 14:14:47 +05:30
committed by kshitij
parent ea478da401
commit b9a50ddf1e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hermes_cli/web_routers/config_env.py
View File

@@ -24,7 +24,7 @@ from hermes_cli.web_server_profiles import (
_approval_mode_of, _broadcast_gateway_session_info, _is_other_profile, _parse_model_entries,
)
from fastapi import HTTPException, Request
from hermes_cli.config import DEFAULT_CONFIG, OPTIONAL_ENV_VARS, read_raw_config, require_readable_config_before_write, custom_endpoint_key_env, coerce_provider_id, find_provider_entry, get_compatible_custom_providers, _deep_merge
from hermes_cli.config import DEFAULT_CONFIG, OPTIONAL_ENV_VARS, read_raw_config, require_readable_config_before_write, custom_endpoint_key_env, coerce_provider_id, find_provider_entry, get_compatible_custom_providers, _ENV_REF_RE, _deep_merge
from hermes_cli.config_providers import _canonical_api_mode, _custom_provider_entry_to_provider_config
from hermes_cli.web_models import ConfigUpdate, EnvVarUpdate, EnvVarDelete, EnvVarReveal, CustomEndpointUpdate
from typing import Any, Dict, List, Optional, Tuple
@@ -295,15 +295,16 @@ async def set_env_var(body: EnvVarUpdate, profile: Optional[str] = None):
# mirror still holding the previous value of this var (model.api_key /
# auxiliary.*.api_key / custom_providers[*]), so a rotation can't leave a
# stale higher-precedence copy that keeps authenticating with the old key.
# Display-only previews (sentinel or legacy mask) must never gain write authority.
# Checked before the error mapper: it turns HTTPException into a 500 at this site.
if is_redacted_credential_preview(body.value):
raise HTTPException(status_code=400, detail=REDACTED_CREDENTIAL_WRITE_DETAIL)
with _env_write_errors("PUT /api/env failed", http_passthrough=False):
from hermes_cli.credential_lifecycle import save_provider_env_credential
def _save():
if is_redacted_credential_preview(body.value):
raise ValueError(REDACTED_CREDENTIAL_WRITE_DETAIL)
return save_provider_env_credential(body.key, body.value)
return await scoped_to_thread(body.profile or profile, _save)
return await scoped_to_thread(
body.profile or profile, lambda: save_provider_env_credential(body.key, body.value)
)
# Live credential probes keyed by env var: (url, auth) where auth is "bearer"
@@ -628,7 +629,7 @@ def _write_custom_endpoint(cfg: Dict[str, Any], body: CustomEndpointUpdate) -> T
if submitted_key:
# ``${KEY_ENV}`` is the GET display for key_env entries; the helper covers the
# sentinel and legacy masks. Either one is display-only, current or stale.
if re.fullmatch(r"\$\{[^}]+\}", submitted_key) or is_redacted_credential_preview(submitted_key):
if _ENV_REF_RE.fullmatch(submitted_key) or is_redacted_credential_preview(submitted_key):
raise HTTPException(status_code=400, detail=REDACTED_CREDENTIAL_WRITE_DETAIL)
save_env_value(env_var, submitted_key)
entry["key_env"] = env_var