Skip to content

fix: problematic parsing leniency in parsing chunk extensions #3327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
6 changes: 5 additions & 1 deletion gunicorn/http/body.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys

from gunicorn.http.errors import (NoMoreData, ChunkMissingTerminator,
InvalidChunkSize)
InvalidChunkSize, InvalidChunkExtension)


class ChunkedReader:
Expand Down Expand Up @@ -91,6 +91,10 @@ def parse_chunk_size(self, unreader, data=None):
chunk_size, *chunk_ext = line.split(b";", 1)
if chunk_ext:
chunk_size = chunk_size.rstrip(b" \t")
# Security: Don't allow CRs and LFs in chunk extensions
# This can cause request smuggling issues with some proxies
if any(c in chunk_ext[0] for c in (b"\n", b"\r")):
raise InvalidChunkExtension(chunk_ext[0])
if any(n not in b"0123456789abcdefABCDEF" for n in chunk_size):
raise InvalidChunkSize(chunk_size)
if len(chunk_size) == 0:
Expand Down
8 changes: 8 additions & 0 deletions gunicorn/http/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ def __str__(self):
return "Invalid chunk size: %r" % self.data


class InvalidChunkExtension(IOError):
def __init__(self, data):
self.data = data

def __str__(self):
return "Invalid chunk extension: %r" % self.data


class ChunkMissingTerminator(IOError):
def __init__(self, term):
self.term = term
Expand Down
7 changes: 7 additions & 0 deletions tests/requests/invalid/chunked_14.http
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
POST /chunked_newline_in_chunk_ext HTTP/1.1\r\n
Transfer-Encoding: chunked\r\n
\r\n
5;foo\nbar\r\n
hello\r\n
0\r\n
\r\n
2 changes: 2 additions & 0 deletions tests/requests/invalid/chunked_14.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from gunicorn.http.errors import InvalidChunkExtension
request = InvalidChunkExtension