Skip to content

Commit 25b8e17

Browse files
authored
Enforce FormParser limits in parser callbacks (#3331)
1 parent dba1c4b commit 25b8e17

2 files changed

Lines changed: 39 additions & 11 deletions

File tree

‎starlette/formparsers.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,32 @@ def __init__(
6969
self.max_fields = max_fields
7070
self.max_part_size = max_part_size
7171
self.messages: list[tuple[FormMessage, bytes]] = []
72+
self._current_field_size = 0
73+
self._current_fields = 0
7274

7375
def on_field_start(self) -> None:
76+
self._current_field_size = 0
7477
message = (FormMessage.FIELD_START, b"")
7578
self.messages.append(message)
7679

7780
def on_field_name(self, data: bytes, start: int, end: int) -> None:
81+
self._current_field_size += end - start
82+
if self._current_field_size > self.max_part_size:
83+
raise MultiPartException(f"Field exceeded maximum size of {int(self.max_part_size / 1024)}KB.")
7884
message = (FormMessage.FIELD_NAME, data[start:end])
7985
self.messages.append(message)
8086

8187
def on_field_data(self, data: bytes, start: int, end: int) -> None:
88+
self._current_field_size += end - start
89+
if self._current_field_size > self.max_part_size:
90+
raise MultiPartException(f"Field exceeded maximum size of {int(self.max_part_size / 1024)}KB.")
8291
message = (FormMessage.FIELD_DATA, data[start:end])
8392
self.messages.append(message)
8493

8594
def on_field_end(self) -> None:
95+
self._current_fields += 1
96+
if self._current_fields > self.max_fields:
97+
raise MultiPartException(f"Too many fields. Maximum number of fields is {self.max_fields}.")
8698
message = (FormMessage.FIELD_END, b"")
8799
self.messages.append(message)
88100

@@ -106,7 +118,6 @@ async def parse(self) -> FormData:
106118
field_value = bytearray()
107119

108120
items: list[tuple[str, str | UploadFile]] = []
109-
field_count = 0
110121

111122
# Feed the parser with data from the request.
112123
async for chunk in self.stream:
@@ -121,17 +132,10 @@ async def parse(self) -> FormData:
121132
field_name = bytearray()
122133
field_value = bytearray()
123134
elif message_type == FormMessage.FIELD_NAME:
124-
if len(field_name) + len(field_value) + len(message_bytes) > self.max_part_size:
125-
raise MultiPartException(f"Field exceeded maximum size of {int(self.max_part_size / 1024)}KB.")
126135
field_name.extend(message_bytes)
127136
elif message_type == FormMessage.FIELD_DATA:
128-
if len(field_name) + len(field_value) + len(message_bytes) > self.max_part_size:
129-
raise MultiPartException(f"Field exceeded maximum size of {int(self.max_part_size / 1024)}KB.")
130137
field_value.extend(message_bytes)
131138
elif message_type == FormMessage.FIELD_END:
132-
field_count += 1
133-
if field_count > self.max_fields:
134-
raise MultiPartException(f"Too many fields. Maximum number of fields is {self.max_fields}.")
135139
name = unquote_plus(field_name.decode("latin-1"))
136140
value = unquote_plus(field_value.decode("latin-1"))
137141
items.append((name, value))

‎tests/test_formparsers.py‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44
import threading
5-
from collections.abc import Generator
5+
from collections.abc import AsyncGenerator, Generator
66
from contextlib import AbstractContextManager, nullcontext as does_not_raise
77
from io import BytesIO
88
from pathlib import Path
@@ -13,8 +13,8 @@
1313
import pytest
1414

1515
from starlette.applications import Starlette
16-
from starlette.datastructures import UploadFile
17-
from starlette.formparsers import MultiPartException, MultiPartParser, _user_safe_decode
16+
from starlette.datastructures import Headers, UploadFile
17+
from starlette.formparsers import FormParser, MultiPartException, MultiPartParser, _user_safe_decode
1818
from starlette.requests import Request
1919
from starlette.responses import JSONResponse
2020
from starlette.routing import Mount
@@ -589,6 +589,30 @@ def test_urlencoded_max_part_size_is_customizable(
589589
assert res.text == "Field exceeded maximum size of 10KB."
590590

591591

592+
@pytest.mark.anyio
593+
async def test_urlencoded_limits_stop_parsing_within_a_single_chunk() -> None:
594+
async def single_chunk(body: bytes) -> AsyncGenerator[bytes, None]:
595+
yield body
596+
597+
headers = Headers({"content-type": "application/x-www-form-urlencoded"})
598+
599+
too_many = "&".join(f"f{i}=" for i in range(100_000)).encode()
600+
stream = single_chunk(too_many)
601+
parser = FormParser(headers, stream, max_fields=10)
602+
with pytest.raises(MultiPartException, match="Too many fields"):
603+
await parser.parse()
604+
await stream.aclose()
605+
assert parser._current_fields == 11
606+
607+
too_big = ("field=" + "x" * (1024 * 1024 * 50)).encode()
608+
stream = single_chunk(too_big)
609+
parser = FormParser(headers, stream, max_part_size=1024)
610+
with pytest.raises(MultiPartException, match="Field exceeded maximum size"):
611+
await parser.parse()
612+
await stream.aclose()
613+
assert sum(len(data) for _, data in parser.messages) <= 1024
614+
615+
592616
def test_user_safe_decode_helper() -> None:
593617
result = _user_safe_decode(b"\xc4\x99\xc5\xbc\xc4\x87", "utf-8")
594618
assert result == "ężć"

0 commit comments

Comments
 (0)