scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-22 00:31:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 51

fix(auth): only fail closed on DB outages during org lookup

Browse source 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
jesus 2026-09-17 22:28:11 +00:00
parent ee9294af53
commit c4ad6194a0
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
litellm/proxy/auth/user_api_key_auth.py
View file

@ -2637,11 +2637,16 @@ async def _inherit_org_identity(
)
except OrganizationNotFoundError:
return
except Exception: # noqa: BLE001 # DB outage handling is decided by allow_requests_on_db_unavailable
if not PrismaDBExceptionHandler.should_allow_request_on_db_unavailable():
except Exception as e: # noqa: BLE001 # only a DB outage may fail auth here, anything else degrades to no org limits
if (
PrismaDBExceptionHandler.is_database_service_unavailable_error_in_chain(e)
and not PrismaDBExceptionHandler.should_allow_request_on_db_unavailable()
):
raise
verbose_proxy_logger.debug("org lookup failed, continuing without org limits", exc_info=True)
return
if org_object is None:
return
user_api_key_auth_obj.organization_alias = org_object.organization_alias
user_api_key_auth_obj.organization_metadata = org_object.metadata
budget: Final = org_object.litellm_budget_table

9
tests/test_litellm/proxy/auth/test_user_api_key_auth.py
View file

@ -5818,6 +5818,7 @@ async def test_centralized_common_checks_backfills_org_id_from_team(key_org_id,
("org-missing", None, None, None, None, "missing", False, False, "org-missing", None, (None, None, None)),
("org-db-failure-allowed", None, None, None, None, "db_failure", True, False, "org-db-failure-allowed", None, (None, None, None)),
("org-db-failure-denied", None, None, None, None, "db_failure", False, True, "org-db-failure-denied", None, (None, None, None)),
("org-bad-row", None, None, None, None, "bad_row", False, False, "org-bad-row", None, (None, None, None)),
("org-nobudget", None, None, None, None, "no_budget", False, False, "org-nobudget", "acme-org", (None, None, None)),
],
)
@ -5895,10 +5896,12 @@ async def test_centralized_common_checks_inherits_org_identity(
if lookup_mode == "missing":
mock_get_org_object.side_effect = OrganizationNotFoundError("x")
elif lookup_mode == "db_failure":
mock_get_org_object.side_effect = RuntimeError("db unavailable")
mock_get_org_object.side_effect = ConnectionRefusedError("db unavailable")
elif lookup_mode == "bad_row":
mock_get_org_object.side_effect = ValueError("row failed validation")
if expect_lookup_error:
with pytest.raises(RuntimeError, match="db unavailable"):
with pytest.raises(ConnectionRefusedError, match="db unavailable"):
await _run_centralized_common_checks(
user_api_key_auth_obj=token,
request=request,
@ -5943,7 +5946,7 @@ async def test_centralized_common_checks_inherits_org_identity(
mock_get_org_object.assert_awaited_once()
assert mock_get_org_object.await_args.kwargs["org_id"] == expected_org_id
assert mock_get_org_object.await_args.kwargs["include_budget_table"] is True
if lookup_mode not in {"missing", "db_failure"}:
if lookup_mode not in {"missing", "db_failure", "bad_row"}:
assert token.organization_metadata == {"model_rpm_limit": {"gpt-4o": 2}}
finally:
for k, v in originals.items():