Teknium
3c7069bdcb
authz_mixin, browser_control_broker, delivery, delivery_ledger, display_config, drain_control, hosted_room_links/peer/policy_checkpoint, hosted_rooms, platform_registry, relay/__init__, relay/ws_transport, run.py and slash_commands.py (comments), session_context, session_state, streaming_tts_consumer, turn_lease and small modules. - HostedRoomPolicyCheckpoint._apply_event -> per-kind handler table - WebSocketRelayTransport._handle_frame -> frame-handler table - GatewayAuthorizationMixin: unified adapter setting/flag/extra readers - dead symbols removed (verified zero references): RoomLinkProbe/select_room_link, relay_bot_username, is_restart_loop_tripped, debug_rows, DeadTargetRegistry.all_dead, BrowserControlBroker.detach_owner/_prune_tickets, StreamingTTSConsumer.started/_enqueue_done/ _iter_stream_chunks/_next_stream_chunk, RecoverableHandleCache.status_for, _auth_env, _copy_default_catalog, _parse_timestamp_prefix, _present_* helpers, _send_result_error_kind, _truthy_env, SessionFieldView/TurnLeaseTokenView dunder shims, and their orphaned tests. - lost WHY/invariant text from the earlier compaction restored compactly (541 hunks audited)
80 lines
3.0 KiB
Python
80 lines
3.0 KiB
Python
"""Shared config→env bridge for media-delivery policy.
|
|
|
|
``validate_media_delivery_path`` (gateway/platforms/base.py) reads its policy
|
|
from environment variables:
|
|
|
|
- ``HERMES_MEDIA_DELIVERY_STRICT`` <- gateway.strict
|
|
- ``HERMES_MEDIA_ALLOW_DIRS`` <- gateway.media_delivery_allow_dirs
|
|
- ``HERMES_MEDIA_TRUST_RECENT_FILES`` <- gateway.trust_recent_files
|
|
|
|
The translation used to run only in gateway startup, so standalone delivery
|
|
paths (``hermes cron run``, ``hermes send``, a standalone cron tick) filtered
|
|
MEDIA paths under a different policy and silently dropped attachments in
|
|
strict/allowlisted deployments (text is unaffected -- only media goes through
|
|
path validation). ``apply_media_policy_env()`` is the shared,
|
|
idempotent helper every delivery entrypoint calls before filtering media paths.
|
|
|
|
Precedence: an explicitly-set environment variable WINS over config.yaml, so a
|
|
shell-exported override (and gateway startup's own earlier run) survives.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
from typing import Any, Dict, Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_STRICT_ENV = "HERMES_MEDIA_DELIVERY_STRICT"
|
|
_ALLOW_DIRS_ENV = "HERMES_MEDIA_ALLOW_DIRS"
|
|
_TRUST_RECENT_ENV = "HERMES_MEDIA_TRUST_RECENT_FILES"
|
|
|
|
|
|
def _load_gateway_cfg(config: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
|
|
if config is None:
|
|
try:
|
|
from hermes_cli.config import load_config
|
|
|
|
config = load_config() or {}
|
|
except Exception:
|
|
return {}
|
|
gateway_cfg = config.get("gateway", {})
|
|
return gateway_cfg if isinstance(gateway_cfg, dict) else {}
|
|
|
|
|
|
def _set_env_default(env: str, value: str) -> None:
|
|
"""Set ``env`` only when unset/empty and ``value`` is non-empty (env wins)."""
|
|
if value and not os.environ.get(env):
|
|
os.environ[env] = value
|
|
|
|
|
|
def _allow_dirs_str(allow_dirs: Any) -> str:
|
|
if isinstance(allow_dirs, str):
|
|
return allow_dirs
|
|
if isinstance(allow_dirs, (list, tuple)):
|
|
return os.pathsep.join(str(p) for p in allow_dirs if p)
|
|
return ""
|
|
|
|
|
|
def apply_media_policy_env(config: Optional[Dict[str, Any]] = None) -> None:
|
|
"""Bridge gateway media-policy settings from config.yaml into the env.
|
|
|
|
Idempotent and env-wins: a variable already present is never overwritten.
|
|
Never raises — a policy-bridge failure must not break delivery; the
|
|
validator falls back to its defaults exactly as before.
|
|
"""
|
|
try:
|
|
gateway_cfg = _load_gateway_cfg(config)
|
|
if not gateway_cfg:
|
|
return
|
|
for key, env in (("strict", _STRICT_ENV), ("trust_recent_files", _TRUST_RECENT_ENV)):
|
|
flag = gateway_cfg.get(key)
|
|
if flag is not None:
|
|
_set_env_default(env, "1" if flag else "0")
|
|
allow_dirs = gateway_cfg.get("media_delivery_allow_dirs")
|
|
if allow_dirs:
|
|
_set_env_default(_ALLOW_DIRS_ENV, _allow_dirs_str(allow_dirs))
|
|
except Exception: # noqa: BLE001 - policy bridge must never break delivery
|
|
logger.debug("apply_media_policy_env failed", exc_info=True)
|