From 90263e93c51968da276e72d8f658a5620cd01e06 Mon Sep 17 00:00:00 2001 From: jesus Date: Fri, 18 Sep 2026 22:30:36 +0000 Subject: [PATCH] fix(auth): validate user object_permission relation from prisma row Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- litellm/proxy/auth/auth_checks.py | 12 +++++++++-- .../auth/test_object_permission_loading.py | 21 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py index cc2192bd4e8..51b4fe75143 100644 --- a/litellm/proxy/auth/auth_checks.py +++ b/litellm/proxy/auth/auth_checks.py @@ -173,7 +173,7 @@ class _PrismaVectorStoreRow(Protocol): def __iter__(self) -> Iterator[tuple[str, object]]: ... -class _PrismaUserRow(_PrismaModelDumpRow, Protocol): +class _PrismaUserRow(Protocol): user_id: str @property @@ -182,6 +182,9 @@ class _PrismaUserRow(_PrismaModelDumpRow, Protocol): @organization_memberships.setter def organization_memberships(self, value: Sequence[_PrismaModelDumpRow] | None) -> None: ... + @property + def object_permission(self) -> _PrismaModelDumpRow | None: ... + def __iter__(self) -> Iterator[tuple[str, object]]: ... @@ -2652,7 +2655,12 @@ async def get_user_object( ] response.organization_memberships = _dumped_memberships - _response = LiteLLM_UserTable.model_validate(response.model_dump()) + _object_permission: Final = ( + LiteLLM_ObjectPermissionTable.model_validate(response.object_permission.model_dump()) + if response.object_permission is not None + else None + ) + _response = LiteLLM_UserTable.model_validate({**dict(response), "object_permission": _object_permission}) _response = await _backfill_null_user_email( prisma_client=prisma_client, user_api_key_cache=user_api_key_cache, diff --git a/tests/test_litellm/proxy/auth/test_object_permission_loading.py b/tests/test_litellm/proxy/auth/test_object_permission_loading.py index 3194984577c..b588956678e 100644 --- a/tests/test_litellm/proxy/auth/test_object_permission_loading.py +++ b/tests/test_litellm/proxy/auth/test_object_permission_loading.py @@ -21,6 +21,14 @@ class _PrismaObjectPermissionStub(BaseModel): mcp_tool_search_enabled: bool +class _PrismaUserRowStub(BaseModel): + user_id: str + user_email: str | None = None + object_permission_id: str | None = None + object_permission: _PrismaObjectPermissionStub | None = None + organization_memberships: list[object] | None = None + + @pytest.mark.asyncio async def test_get_key_object_loads_object_permission(): """ @@ -175,7 +183,6 @@ async def test_get_user_object_loads_object_permission(): """ Test that get_user_object automatically loads object_permission when object_permission_id exists. """ - from litellm.models.user import LiteLLM_UserTable from litellm.proxy.auth.auth_checks import get_user_object mock_prisma_client = MagicMock() @@ -184,16 +191,14 @@ async def test_get_user_object_loads_object_permission(): mock_cache.async_get_cache = AsyncMock(return_value=None) mock_cache.async_set_cache = AsyncMock() - mock_user = LiteLLM_UserTable( + mock_user = _PrismaUserRowStub( user_id="test_user", user_email="test@example.com", object_permission_id="test_perm_id", - object_permission=None, - ) - setattr( - mock_user, - "object_permission", - _PrismaObjectPermissionStub(object_permission_id="test_perm_id", mcp_tool_search_enabled=True), + object_permission=_PrismaObjectPermissionStub( + object_permission_id="test_perm_id", + mcp_tool_search_enabled=True, + ), ) mock_prisma_client.db.litellm_usertable.find_unique = AsyncMock(return_value=mock_user)