fix(security): narrow Bedrock subprocess strip to inference bearer token only
Scopes the AWS_SDK subprocess strip down from the full AWS credential chain to just AWS_BEARER_TOKEN_BEDROCK — the only Hermes-managed *inference* secret (analogous to OPENAI_API_KEY). The general AWS credential chain (AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY / AWS_SESSION_TOKEN / AWS_PROFILE / config + role pointers) is intentionally left inheritable. Why: per SECURITY.md §3.2 the local terminal is the user's trusted operator shell. Hard-blocklisting the general chain would (a) regress *every* user who runs aws/terraform/cdk/boto3 in the agent terminal — not just Bedrock users, since PROVIDER_REGISTRY is iterated unconditionally at import — and (b) be unrecoverable, because env_passthrough.py refuses to re-allow anything in _HERMES_PROVIDER_ENV_BLOCKLIST (GHSA-rhgp-j443-p4rf). The narrow strip closes the reported leak (opencode enumerating the Bedrock catalog off the leaked bearer token) with no capability loss. Keeps zapabob's self-healing auth_type=="aws_sdk" mechanism so any future SDK-cred provider is covered automatically. Tests: bearer token stripped + general chain preserved (no-regression guard), on both the runtime strip path and the blocklist-membership path. Co-authored-by: zapabob <1920071390@campus.ouj.ac.jp>
This commit is contained in:
committed by
Teknium
co-authored by
zapabob
parent
95b5b72404
commit
6bebab4761
+17
-15
@@ -75,22 +75,24 @@ def _resolve_safe_cwd(cwd: str) -> str:
|
||||
# Hermes-internal env vars that should NOT leak into terminal subprocesses.
|
||||
_HERMES_PROVIDER_ENV_FORCE_PREFIX = "_HERMES_FORCE_"
|
||||
|
||||
# Hermes-managed AWS *inference* credentials for ``auth_type="aws_sdk"``
|
||||
# providers (Bedrock). Scoped DELIBERATELY NARROW: this lists only the
|
||||
# Bedrock-specific bearer token, which is a Hermes inference secret exactly
|
||||
# analogous to ``OPENAI_API_KEY`` — nobody drives the ``aws``/``terraform``/
|
||||
# ``boto3`` toolchain off it, so stripping it from terminal/execute_code
|
||||
# subprocesses costs no user capability.
|
||||
#
|
||||
# The GENERAL AWS credential chain (AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
|
||||
# AWS_SESSION_TOKEN, AWS_PROFILE, and the config/role pointers) is INTENTIONALLY
|
||||
# left inheritable. Per SECURITY.md §3.2 the local terminal is the user's
|
||||
# trusted operator shell; the agent having the same general AWS access the
|
||||
# user's own shell has is the intended posture, not a leak. Hard-blocklisting
|
||||
# those vars would (a) regress every user who runs aws/terraform/cdk/boto3 in
|
||||
# the agent terminal — not just Bedrock users, since the registry is iterated
|
||||
# unconditionally — and (b) be unrecoverable, because env_passthrough.py
|
||||
# refuses to re-allow anything in this blocklist (GHSA-rhgp-j443-p4rf). See
|
||||
# issue #32314 discussion.
|
||||
_AWS_SDK_CREDENTIAL_ENV_VARS = frozenset({
|
||||
"AWS_ACCESS_KEY_ID",
|
||||
"AWS_SECRET_ACCESS_KEY",
|
||||
"AWS_SESSION_TOKEN",
|
||||
"AWS_SECURITY_TOKEN",
|
||||
"AWS_PROFILE",
|
||||
"AWS_DEFAULT_PROFILE",
|
||||
"AWS_SHARED_CREDENTIALS_FILE",
|
||||
"AWS_CONFIG_FILE",
|
||||
"AWS_WEB_IDENTITY_TOKEN_FILE",
|
||||
"AWS_ROLE_ARN",
|
||||
"AWS_ROLE_SESSION_NAME",
|
||||
"AWS_CONTAINER_CREDENTIALS_RELATIVE_URI",
|
||||
"AWS_CONTAINER_CREDENTIALS_FULL_URI",
|
||||
"AWS_CONTAINER_AUTHORIZATION_TOKEN",
|
||||
"AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE",
|
||||
"AWS_BEARER_TOKEN_BEDROCK",
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user