Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions h11/_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,22 @@ def next_event(self) -> Union[Event, Type[NEED_DATA], Type[PAUSED]]:
if self.their_state is ERROR:
raise RemoteProtocolError("Can't receive data when peer state is ERROR")
try:
# Snapshot length so we can measure how many bytes a completed
# header event consumed (request/response line + headers).
before = len(self._receive_buffer)
event = self._extract_next_receive_event()
if event not in [NEED_DATA, PAUSED]:
# Enforce max_incomplete_event_size for completed header events
# too (python-hyper/h11#182). Oversized headers that arrive in
# one chunk previously parsed successfully, while the same
# bytes split across packets hit the NEED_DATA size check —
# making enforcement depend on TCP framing.
if isinstance(event, (Request, InformationalResponse, Response)):
consumed = before - len(self._receive_buffer)
if consumed > self._max_incomplete_event_size:
raise RemoteProtocolError(
"Receive buffer too long", error_status_hint=431
)
self._process_event(self.their_role, cast(Event, event))
if event is NEED_DATA:
if len(self._receive_buffer) > self._max_incomplete_event_size:
Expand Down
10 changes: 10 additions & 0 deletions h11/tests/test_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,16 @@ def test_max_incomplete_event_size_countermeasure() -> None:
c.next_event()


# Complete oversized headers in a single chunk must also be rejected
# (previously only incomplete buffers above the limit were checked).
oversized = b"GET / HTTP/1.0\r\nBig: " + b"a" * 200 + b"\r\n\r\n"
assert len(oversized) > 100
c = Connection(SERVER, max_incomplete_event_size=100)
c.receive_data(oversized)
with pytest.raises(RemoteProtocolError):
c.next_event()


def test_reuse_simple() -> None:
p = ConnectionPair()
p.send(
Expand Down