scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-07 08:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

Simplify substring search — remove admin-only gating

Browse source 
Substring matching for user_id and key_alias now applies unconditionally.
The admin-only flag was unnecessary since user_ids are typically UUIDs/emails
where substring collisions are not a practical concern. Updated existing test
to assert the new filter structure.
This commit is contained in:
Ryan Crabbe 2026-03-28 14:50:31 -07:00
parent 8881c36405
commit 65df501f15
No known key found for this signature in database
2 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
litellm/proxy/management_endpoints/key_management_endpoints.py
View file

@ -4280,13 +4280,11 @@ async def list_keys(
else:
admin_team_ids = None
use_substring_matching = True
if not user_id and user_api_key_dict.user_role not in [
LitellmUserRoles.PROXY_ADMIN.value,
LitellmUserRoles.PROXY_ADMIN_VIEW_ONLY.value,
]:
user_id = user_api_key_dict.user_id
use_substring_matching = False
response = await _list_key_helper(
prisma_client=prisma_client,
@ -4307,7 +4305,6 @@ async def list_keys(
status=status,
project_id=project_id,
access_group_id=access_group_id,
use_substring_matching=use_substring_matching,
)
verbose_proxy_logger.debug("Successfully prepared response")
@ -4525,7 +4522,6 @@ def _build_key_filter_conditions(
include_created_by_keys: bool = False,
project_id: Optional[str] = None,
access_group_id: Optional[str] = None,
use_substring_matching: bool = False,
) -> Dict[str, Union[str, Dict[str, Any], List[Dict[str, Any]]]]:
"""Build filter conditions for key listing.
@ -4547,21 +4543,15 @@ def _build_key_filter_conditions(
# Base conditions for user's own keys
user_condition: Dict[str, Any] = {}
if user_id and isinstance(user_id, str):
if use_substring_matching:
user_condition["user_id"] = {
"contains": user_id,
"mode": "insensitive",
}
else:
user_condition["user_id"] = user_id
user_condition["user_id"] = {
"contains": user_id,
"mode": "insensitive",
}
if key_alias and isinstance(key_alias, str):
if use_substring_matching:
user_condition["key_alias"] = {
"contains": key_alias,
"mode": "insensitive",
}
else:
user_condition["key_alias"] = key_alias
user_condition["key_alias"] = {
"contains": key_alias,
"mode": "insensitive",
}
if exclude_team_id and isinstance(exclude_team_id, str):
user_condition["team_id"] = {"not": exclude_team_id}
if organization_id and isinstance(organization_id, str):
@ -4664,7 +4654,6 @@ async def _list_key_helper(
status: Optional[str] = None,
project_id: Optional[str] = None,
access_group_id: Optional[str] = None,
use_substring_matching: bool = False,
) -> KeyListResponseObject:
"""
Helper function to list keys
@ -4700,7 +4689,6 @@ async def _list_key_helper(
include_created_by_keys=include_created_by_keys,
project_id=project_id,
access_group_id=access_group_id,
use_substring_matching=use_substring_matching,
)
# Calculate skip for pagination

4
tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py
View file

@ -6588,9 +6588,9 @@ async def test_build_key_filter_member_team_service_accounts():
# Should have 2 conditions: user's own keys + member team service accounts
assert len(or_conditions) == 2
# First: user's own keys
# First: user's own keys (substring match)
user_cond = or_conditions[0]
assert user_cond["user_id"] == user_id
assert user_cond["user_id"] == {"contains": user_id, "mode": "insensitive"}
# Second: service accounts for member teams (user_id=None AND team_id in member teams)
service_account_cond = or_conditions[1]