mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-08 08:08:37 +00:00
* fix(auth): return a generic 401 for an unknown key The wrong-key 401 shipped the internal verification table name and the submitted key's full SHA-256 hash to any unauthenticated caller. Both now go to the proxy's own log and the response carries only "Invalid API key provided." The Admin UI detected a dead session by string-matching that message, so it now reads the structured error type instead. * Update ui/litellm-dashboard/src/lib/http/client.ts Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * fix(auth): log the missing key hash where every resolve path passes Review catch: JWT key-mapping misses resolve through IdentityStore without touching the main key path, so logging the hash there left those callers with nothing but the generic 401. Log it at the store's raise site instead, which every resolve path shares, and drop the now-duplicate log. * test(auth): inject a key-less client instead of patching the DB fetch The store test tripped TQ008 by patching _fetch_key_object_from_db_with_reconnect. Hand IdentityStore a client whose get_data returns no row instead, so the miss is driven through the real lookup rather than around it. * fix(auth): log the unknown key's hash once on the auth failure line The per-lookup warnings in get_key_object and IdentityStore logged whatever value they were handed, which on the failure-logging path is the raw key a caller sent (a provider key included), let a newline in ?key= forge log lines, and fired on lookups that expect a miss. The hash now rides KeyNotFoundError onto the single existing auth failure log line next to the requester IP, with control characters escaped. Also drops the new comments and updates skipped tests that quoted the old message. * test(auth): add the blank lines ruff format expects before _InFlightCountingPrisma * test(integration): expect the generic wrong-key 401 in the management lifecycle tests * fix(auth): keep the operator wording on the unknown-key log line and drop the redundant 401 rewrite * test(auth): cover the generic unknown-key 401 across routes, proxies, and a worker kill * test(auth): cover the realtime upgrade refusing an unknown key without echoing it --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
232 lines
11 KiB
Python
232 lines
11 KiB
Python
import uuid
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
from hashlib import sha256
|
|
from typing import Final
|
|
|
|
import httpx
|
|
from integration._support.client import Gateway, eventually, object_value, string_value
|
|
from integration._support.database import read_rows
|
|
from pydantic import JsonValue
|
|
|
|
CONCURRENT_CREATES: Final = 8
|
|
|
|
|
|
def _membership_rows(organization_id: str) -> list[dict[str, JsonValue]]:
|
|
return read_rows(
|
|
'SELECT user_id, user_role FROM "LiteLLM_OrganizationMembership" WHERE organization_id = %s',
|
|
(organization_id,),
|
|
)
|
|
|
|
|
|
def _listed(gateway: Gateway, organization_id: str) -> dict[str, JsonValue]:
|
|
response: Final = gateway.request("GET", "/organization/list")
|
|
assert response.status_code == 200, response.text
|
|
entries: Final = response.json()
|
|
assert isinstance(entries, list)
|
|
matches: Final = [entry for entry in entries if entry["organization_id"] == organization_id]
|
|
assert len(matches) == 1, f"{organization_id} listed {len(matches)} times"
|
|
return object_value(matches[0])
|
|
|
|
|
|
def test_concurrent_creates_with_one_alias_each_persist_a_distinct_organization(gateway: Gateway) -> None:
|
|
alias: Final = f"integration-{uuid.uuid4().hex}"
|
|
|
|
def create(_: int) -> httpx.Response:
|
|
return gateway.request("POST", "/organization/new", {"organization_alias": alias})
|
|
|
|
with ThreadPoolExecutor(max_workers=CONCURRENT_CREATES) as pool:
|
|
responses: Final = tuple(pool.map(create, range(CONCURRENT_CREATES)))
|
|
created: Final = tuple(response.json() for response in responses if response.status_code == 200)
|
|
with gateway.scenario() as scenario:
|
|
for body in created:
|
|
scenario.cleanups.callback(
|
|
scenario.delete_organization, string_value(body["organization_id"]), string_value(body["budget_id"])
|
|
)
|
|
assert [response.status_code for response in responses] == [200] * CONCURRENT_CREATES, [
|
|
response.text for response in responses
|
|
]
|
|
identities: Final = {string_value(body["organization_id"]) for body in created}
|
|
assert len(identities) == CONCURRENT_CREATES
|
|
rows: Final = read_rows(
|
|
'SELECT organization_id FROM "LiteLLM_OrganizationTable" WHERE organization_alias = %s', (alias,)
|
|
)
|
|
assert {string_value(row["organization_id"]) for row in rows} == identities
|
|
|
|
|
|
def test_list_returns_each_organization_with_its_budget_and_members(gateway: Gateway) -> None:
|
|
with gateway.scenario() as scenario:
|
|
organization_id: Final = scenario.organization(max_budget=3.5, tpm_limit=120)
|
|
member: Final = scenario.org_member(organization_id, role="internal_user")
|
|
listed: Final = _listed(gateway, organization_id)
|
|
budget: Final = object_value(listed["litellm_budget_table"])
|
|
assert (budget["max_budget"], budget["tpm_limit"]) == (3.5, 120)
|
|
members: Final = listed["members"]
|
|
assert isinstance(members, list)
|
|
assert [(object_value(entry)["user_id"], object_value(entry)["user_role"]) for entry in members] == [
|
|
(member, "internal_user")
|
|
]
|
|
|
|
|
|
def test_member_role_update_and_removal_persist_and_read_back(gateway: Gateway) -> None:
|
|
with gateway.scenario() as scenario:
|
|
organization_id: Final = scenario.organization()
|
|
member: Final = scenario.org_member(organization_id, role="internal_user")
|
|
assert _membership_rows(organization_id) == [{"user_id": member, "user_role": "internal_user"}]
|
|
updated: Final = gateway.request(
|
|
"PATCH",
|
|
"/organization/member_update",
|
|
{"organization_id": organization_id, "user_id": member, "role": "org_admin"},
|
|
)
|
|
assert updated.status_code == 200, updated.text
|
|
assert _membership_rows(organization_id) == [{"user_id": member, "user_role": "org_admin"}]
|
|
info_members: Final = gateway.get("/organization/info", {"organization_id": organization_id})["members"]
|
|
assert isinstance(info_members, list)
|
|
assert [object_value(entry)["user_role"] for entry in info_members] == ["org_admin"]
|
|
removed: Final = gateway.request(
|
|
"DELETE", "/organization/member_delete", {"organization_id": organization_id, "user_id": member}
|
|
)
|
|
assert removed.status_code == 200, removed.text
|
|
assert _membership_rows(organization_id) == []
|
|
assert _listed(gateway, organization_id)["members"] == []
|
|
|
|
|
|
def _observed(upstream: httpx.Client) -> list[dict[str, JsonValue]]:
|
|
response: Final = upstream.get("/__observations")
|
|
response.raise_for_status()
|
|
requests: Final = response.json()["requests"]
|
|
assert isinstance(requests, list)
|
|
return requests
|
|
|
|
|
|
def _chat(proxy: Gateway, model: str, key: str, text: str) -> httpx.Response:
|
|
return proxy.request(
|
|
"POST",
|
|
"/v1/chat/completions",
|
|
{"model": model, "messages": [{"role": "user", "content": text}]},
|
|
key=key,
|
|
)
|
|
|
|
|
|
def _observation(text: str) -> dict[str, JsonValue]:
|
|
return {
|
|
"path": "/v1/chat/completions",
|
|
"authorization": "Bearer integration-provider-key",
|
|
"body": {"messages": [{"role": "user", "content": text}], "model": "gpt-4o-mini"},
|
|
"method": "POST",
|
|
"api_key": "",
|
|
}
|
|
|
|
|
|
def _token_not_found_error() -> dict[str, JsonValue]:
|
|
return {
|
|
"error": {
|
|
"message": "Authentication Error, Invalid API key provided.",
|
|
"type": "token_not_found_in_db",
|
|
"param": "key",
|
|
"code": "401",
|
|
}
|
|
}
|
|
|
|
|
|
def _new_key(gateway: Gateway, **fields: JsonValue) -> str:
|
|
created: Final = gateway.post("/key/generate", fields)
|
|
return string_value(created["key"])
|
|
|
|
|
|
def _key_rows(*hashes: str) -> list[dict[str, JsonValue]]:
|
|
return read_rows(
|
|
'SELECT token FROM "LiteLLM_VerificationToken" WHERE token = ANY(%s)',
|
|
(list(hashes),),
|
|
)
|
|
|
|
|
|
def test_organization_delete_revokes_org_and_team_keys_on_gateway_and_peer(gateway: Gateway, peer: Gateway) -> None:
|
|
with (
|
|
gateway.scenario() as scenario,
|
|
httpx.Client(base_url=gateway.upstream_url, timeout=5, trust_env=False) as upstream,
|
|
):
|
|
model: Final = scenario.model()
|
|
created_org: Final = gateway.post(
|
|
"/organization/new", {"organization_alias": f"integration-{uuid.uuid4().hex}"}
|
|
)
|
|
scenario.cleanups.callback(scenario.delete_budget, string_value(created_org["budget_id"]))
|
|
organization_id: Final = string_value(created_org["organization_id"])
|
|
other_organization_id: Final = scenario.organization()
|
|
member: Final = scenario.user()
|
|
membership: Final = gateway.request(
|
|
"POST",
|
|
"/organization/member_add",
|
|
{"organization_id": organization_id, "member": {"role": "internal_user", "user_id": member}},
|
|
)
|
|
assert membership.status_code == 200, membership.text
|
|
assert _membership_rows(organization_id) == [{"user_id": member, "user_role": "internal_user"}]
|
|
team_id: Final = string_value(
|
|
gateway.post(
|
|
"/team/new",
|
|
{"team_alias": f"integration-{uuid.uuid4().hex}", "organization_id": organization_id},
|
|
)["team_id"]
|
|
)
|
|
organization_key: Final = _new_key(gateway, organization_id=organization_id)
|
|
team_key: Final = _new_key(gateway, team_id=team_id)
|
|
other_key: Final = _new_key(gateway, organization_id=other_organization_id)
|
|
warmed_info: Final = peer.request("GET", "/organization/info", params={"organization_id": organization_id})
|
|
assert warmed_info.status_code == 200, warmed_info.text
|
|
|
|
assert _observed(upstream) == []
|
|
for proxy in (gateway, peer):
|
|
for key in (organization_key, team_key, other_key):
|
|
text: Final = f"warm {uuid.uuid4().hex}"
|
|
response: Final = _chat(proxy, model, key, text)
|
|
assert response.status_code == 200, response.text
|
|
assert _observed(upstream) == [_observation(text)]
|
|
|
|
deleted: Final = gateway.request("DELETE", "/organization/delete", {"organization_ids": [organization_id]})
|
|
assert deleted.status_code == 200, deleted.text
|
|
|
|
for key in (organization_key, team_key):
|
|
refused: Final = _chat(gateway, model, key, f"refused {uuid.uuid4().hex}")
|
|
assert refused.status_code == 401, refused.text
|
|
assert refused.json() == _token_not_found_error(), refused.text
|
|
for key in (organization_key, team_key):
|
|
refused_peer: Final = eventually(
|
|
lambda k=key: _chat(peer, model, k, f"refused {uuid.uuid4().hex}"),
|
|
lambda response: response.status_code == 401,
|
|
seconds=10,
|
|
)
|
|
assert refused_peer.json() == _token_not_found_error(), refused_peer.text
|
|
refused_observations: Final = _observed(upstream)
|
|
assert refused_observations == [], refused_observations
|
|
for proxy in (gateway, peer):
|
|
for key in (organization_key, team_key):
|
|
refused_again: Final = _chat(proxy, model, key, f"refused {uuid.uuid4().hex}")
|
|
assert refused_again.status_code == 401, refused_again.text
|
|
assert _observed(upstream) == []
|
|
|
|
for proxy in (gateway, peer):
|
|
text: Final = f"served {uuid.uuid4().hex}"
|
|
response: Final = _chat(proxy, model, other_key, text)
|
|
assert response.status_code == 200, response.text
|
|
assert _observed(upstream) == [_observation(text)]
|
|
|
|
hashed: Final = tuple(sha256(key.encode()).hexdigest() for key in (organization_key, team_key))
|
|
assert _key_rows(*hashed) == []
|
|
assert read_rows('SELECT team_id FROM "LiteLLM_TeamTable" WHERE team_id = %s', (team_id,)) == []
|
|
assert _membership_rows(organization_id) == []
|
|
assert (
|
|
read_rows(
|
|
'SELECT organization_id FROM "LiteLLM_OrganizationTable" WHERE organization_id = %s',
|
|
(organization_id,),
|
|
)
|
|
== []
|
|
)
|
|
info: Final = gateway.request("GET", "/organization/info", params={"organization_id": organization_id})
|
|
assert info.status_code == 404, info.text
|
|
assert info.json() == {"detail": {"error": "Organization not found"}}, info.text
|
|
peer_info: Final = eventually(
|
|
lambda: peer.request("GET", "/organization/info", params={"organization_id": organization_id}),
|
|
lambda response: response.status_code == 404,
|
|
seconds=10,
|
|
)
|
|
assert peer_info.json() == {"detail": {"error": "Organization not found"}}, peer_info.text
|
|
alive: Final = gateway.request("GET", "/organization/info", params={"organization_id": other_organization_id})
|
|
assert alive.status_code == 200, alive.text
|