From b3bab0065f83c3ddeb8fc64bc1882aca4c151041 Mon Sep 17 00:00:00 2001 From: jesus Date: Fri, 6 Nov 2026 03:43:06 +0000 Subject: [PATCH] fix(usage-export): mask acronym-cased and unseparated credential names in exported metadata --- .../sensitive_data_masker.py | 4 +-- .../repositories/daily_activity_repository.py | 26 ++++++++++++++++++- .../test_sensitive_data_masker.py | 15 ++++++++++- .../test_daily_activity_repository.py | 8 ++++++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/litellm/litellm_core_utils/sensitive_data_masker.py b/litellm/litellm_core_utils/sensitive_data_masker.py index 62958a2d8a7..2e6d54d19d8 100644 --- a/litellm/litellm_core_utils/sensitive_data_masker.py +++ b/litellm/litellm_core_utils/sensitive_data_masker.py @@ -31,7 +31,7 @@ _DEFAULT_SENSITIVE_PATTERNS: Final = frozenset( ) -_CAMEL_BOUNDARY: Final = re.compile(r"(?<=[a-z0-9])(?=[A-Z])") +_CAMEL_BOUNDARY: Final = re.compile(r"(?<=[a-z0-9])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])") def _object_items(data: Mapping[str, object]) -> ItemsView[str, object]: @@ -92,7 +92,7 @@ class SensitiveDataMasker: # Split on underscores and hyphens (and, when opted in, camelCase boundaries too) and check whether any # segment matches the pattern. This avoids false positives like "max_tokens" matching "token" - # but still catches "api_key", "access_token" and, with split_camel_case, "apiKey" and "clientSecret". + # but still catches "api_key", "access_token" and, with split_camel_case, "apiKey", "APIKey" and "AWSSecret". key_lower: Final = str(key).lower().replace("-", "_") camel_lower: Final = ( _CAMEL_BOUNDARY.sub("_", str(key)).lower().replace("-", "_") if self.split_camel_case else key_lower diff --git a/litellm/repositories/daily_activity_repository.py b/litellm/repositories/daily_activity_repository.py index bafd69172b8..a66d86da1d5 100644 --- a/litellm/repositories/daily_activity_repository.py +++ b/litellm/repositories/daily_activity_repository.py @@ -143,7 +143,31 @@ def _daily_rows_table( raise AssertionError("unreachable") -_EXPORT_METADATA_MASKER: Final = SensitiveDataMasker(non_sensitive_overrides=frozenset(), split_camel_case=True) +_EXPORT_UNSEPARATED_CREDENTIAL_NAMES: Final[frozenset[str]] = frozenset( + { + "apikey", + "apitoken", + "accesskey", + "accesstoken", + "authkey", + "authtoken", + "bearertoken", + "clientsecret", + "passwd", + "privatekey", + "pwd", + "refreshtoken", + "secretkey", + "sessiontoken", + "signingkey", + "webhooksecret", + } +) +_EXPORT_METADATA_MASKER: Final = SensitiveDataMasker( + non_sensitive_overrides=frozenset(), + extra_sensitive_patterns=_EXPORT_UNSEPARATED_CREDENTIAL_NAMES, + split_camel_case=True, +) def _redacted_metadata(metadata: Mapping[str, object]) -> Mapping[str, object]: diff --git a/tests/unit/litellm_core_utils/test_sensitive_data_masker.py b/tests/unit/litellm_core_utils/test_sensitive_data_masker.py index 13b61e4cebf..34934a0bca1 100644 --- a/tests/unit/litellm_core_utils/test_sensitive_data_masker.py +++ b/tests/unit/litellm_core_utils/test_sensitive_data_masker.py @@ -614,7 +614,20 @@ def test_redact_credentials_in_payload_leaves_a_realistic_tool_schema_intact(): assert result["api_key"] == "REDACTED" -@pytest.mark.parametrize("key", ["apiKey", "clientSecret", "accessToken", "secretAccessKey", "x-apiKey"]) +@pytest.mark.parametrize( + "key", + [ + "apiKey", + "clientSecret", + "accessToken", + "secretAccessKey", + "x-apiKey", + "APIKey", + "OpenAIAPIKey", + "AWSSecret", + "XAPIKey", + ], +) def test_split_camel_case_opt_in_catches_camel_case_credential_names(key: str): assert SensitiveDataMasker(split_camel_case=True).is_sensitive_key(key) is True diff --git a/tests/unit/repositories/test_daily_activity_repository.py b/tests/unit/repositories/test_daily_activity_repository.py index e14f49cfbe6..b554c72af0a 100644 --- a/tests/unit/repositories/test_daily_activity_repository.py +++ b/tests/unit/repositories/test_daily_activity_repository.py @@ -693,6 +693,10 @@ async def test_export_redacts_credential_named_values_inside_metadata_objects() "owners": [{"name": "ops", "password": "pw"}], "scim_roles": ["admin"], "langfuse": {"apiKey": "lf", "logging": [{"callback_vars": {"langfuse_secret_key": "s"}}]}, + "OpenAIAPIKey": "sk-acronym", + "apikey": "sk-unseparated", + "APIKEY": "sk-upper", + "passwd": "pw-short", }, "user_metadata": { "department": "research", @@ -716,6 +720,10 @@ async def test_export_redacts_credential_named_values_inside_metadata_objects() "webhook": {"url": "https://hooks.example", "auth_token": "REDACTED", "clientSecret": "REDACTED"}, "owners": [{"name": "ops", "password": "REDACTED"}], "langfuse": {"apiKey": "REDACTED"}, + "OpenAIAPIKey": "REDACTED", + "apikey": "REDACTED", + "APIKEY": "REDACTED", + "passwd": "REDACTED", } assert rows[0].user_metadata == { "department": "research",