scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-06 02:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 103

fix(proxy): don't parse protobuf request bodies as JSON

Browse source
This commit is contained in:
Ishaan Jaff 2026-09-30 00:40:10 -07:00
parent c5e24539a6
commit e73ab9eaf9
No known key found for this signature in database
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
litellm/proxy/common_utils/http_parsing_utils.py
View file

@ -21,6 +21,9 @@ from litellm.proxy.common_utils.callback_utils import (
from litellm.types.router import Deployment
_FORM_CONTENT_TYPES: Final[frozenset[str]] = frozenset({"application/x-www-form-urlencoded", "multipart/form-data"})
# Binary bodies (e.g. OTLP trace exports on POST /v1/traces) are not JSON: arbitrary bytes used to
# hit the JSON surrogate-repair path and fail auth with a 400. JSON under these types still parses.
_BINARY_CONTENT_TYPES: Final[frozenset[str]] = frozenset({"application/x-protobuf", "application/protobuf"})
_ANNOTATION_QUALIFIERS: Final[frozenset[object]] = frozenset({Annotated, NotRequired, ReadOnly, Required})
@ -119,6 +122,17 @@ def coerce_numeric_form_fields(
}
def _parse_binary_body(body: bytes) -> dict:
"""JSON sent under a binary content type still parses; real binary (protobuf) carries no params -> {}."""
if not body:
return {}
try:
parsed: Final = orjson.loads(body)
except orjson.JSONDecodeError:
return {}
return parsed if isinstance(parsed, dict) else {}
async def _read_request_body(request: Request | None) -> dict:
"""
Safely read the request body and parse it as JSON.
@ -141,7 +155,9 @@ async def _read_request_body(request: Request | None) -> dict:
_request_headers: Final[dict] = _safe_get_request_headers(request=request)
content_type: Final = _request_headers.get("content-type", "")
if _is_form_content_type(content_type):
if _normalize_media_type(content_type) in _BINARY_CONTENT_TYPES:
parsed_body = _parse_binary_body(await request.body())
elif _is_form_content_type(content_type):
try:
form_data: Final = await request.form()
except Exception as e: