From f245001e261f6c85fbfe7c809b9359d261b8671c Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Sat, 5 Sep 2026 03:36:39 -0700 Subject: [PATCH] fix(credentials): stop the read-back walk one level past where the masker stops The masker checks its depth before recursing into a child object, so it still masks the leaves of an object twenty levels down; the read-back walk checked the same number on entry and passed that object through untouched, which stored the mask. The walk now stops at the level below the cap, and the regression test builds the echo with the masker itself at the last masked level and one past it --- .../proxy/credential_endpoints/endpoints.py | 2 +- .../credential_endpoints/test_endpoints.py | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/litellm/proxy/credential_endpoints/endpoints.py b/litellm/proxy/credential_endpoints/endpoints.py index f489aef4664..5b8496f2e92 100644 --- a/litellm/proxy/credential_endpoints/endpoints.py +++ b/litellm/proxy/credential_endpoints/endpoints.py @@ -344,7 +344,7 @@ def _keeps_leaf(key: str, value: object, stored: Mapping[str, object]) -> bool: def _with_stored_leaves( requested: Mapping[str, object], stored: Mapping[str, object], depth: int = 0 ) -> Mapping[str, object]: - if depth >= _MASKED_READ_BACK_DEPTH: + if depth > _MASKED_READ_BACK_DEPTH: return requested branches: Final = MappingProxyType( {key: fields for key, value in requested.items() if (fields := _fields(value)) is not None} diff --git a/tests/test_litellm/proxy/credential_endpoints/test_endpoints.py b/tests/test_litellm/proxy/credential_endpoints/test_endpoints.py index 0bb0ca7d101..92620a3ee7c 100644 --- a/tests/test_litellm/proxy/credential_endpoints/test_endpoints.py +++ b/tests/test_litellm/proxy/credential_endpoints/test_endpoints.py @@ -1,6 +1,7 @@ """Tests for the credential management endpoints.""" import json +from functools import reduce from unittest.mock import AsyncMock, MagicMock, patch import pytest @@ -8,6 +9,7 @@ from fastapi.testclient import TestClient import litellm from litellm.litellm_core_utils.credential_accessor import CredentialAccessor +from litellm.litellm_core_utils.litellm_logging import _get_masked_values from litellm.proxy._types import UserAPIKeyAuth from litellm.proxy.auth.user_api_key_auth import user_api_key_auth from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper, encrypt_value_helper @@ -435,6 +437,24 @@ def test_update_credential_drops_a_masked_leaf_the_stored_object_no_longer_has(c } +@pytest.mark.parametrize("levels", (20, 21)) +def test_update_credential_keeps_a_secret_exactly_as_deep_as_the_masker_masks(credential_store, levels): + """The masker stops masking at a fixed depth and the read-back check has to stop at the same + one: at the last masked level the echo is a placeholder that must take the stored leaf, and one + level past it the echo is the secret itself. Either way the write must hold the real secret.""" + nested = reduce(lambda inner, _level: {"credentials": inner}, range(levels), {"api_key": "leaf-secret-1234"}) + served = CredentialItem(credential_name="existing", credential_values=nested, credential_info={}) + update_by_name = _serve_credential(credential_store, served) + read_back = _get_masked_values(served.credential_values, unmasked_length=4, number_of_asterisks=4) + + response = _patch_credential( + "existing", {"credential_name": "existing", "credential_values": read_back, "credential_info": {}} + ) + + assert response.status_code == 200, response.text + assert _written_values(update_by_name) == nested + + def test_delete_credential_answers_404_when_the_credential_does_not_exist(credential_store): """Regression: prisma's ``delete`` hands back None when the ``where`` clause matched no row instead of raising, and the handler never looked. Deleting a name that was never stored