You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
73 lines
2.7 KiB
73 lines
2.7 KiB
5 months ago
|
From 42bd030d29b392baed1d427916200df75f4a4a12 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bert JW Regeer <bertjw@regeer.org>
|
||
|
|
Date: Sat, 12 Mar 2022 18:35:01 -0700
|
||
|
|
Subject: [PATCH 3/8] Update tests to remove invalid chunked encoding
|
||
|
|
chunk-size
|
||
|
|
|
||
|
|
RFC7230 states the following:
|
||
|
|
|
||
|
|
chunk = chunk-size [ chunk-ext ] CRLF
|
||
|
|
chunk-data CRLF
|
||
|
|
chunk-size = 1*HEXDIG
|
||
|
|
|
||
|
|
Where chunk-ext is:
|
||
|
|
|
||
|
|
chunk-ext = *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
|
||
|
|
|
||
|
|
Only if there is a chunk-ext should there be a `;` after the 1*HEXDIG.
|
||
|
|
And a chunk-ext that is empty is invalid.
|
||
|
|
|
||
|
|
(cherry picked from commit 884bed167d09c3d5fdf0730e2ca2564eefdd4534)
|
||
|
|
---
|
||
|
|
waitress/tests/test_functional.py | 6 +++---
|
||
|
|
waitress/tests/test_parser.py | 2 +-
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/waitress/tests/test_functional.py b/waitress/tests/test_functional.py
|
||
|
|
index 8f4b262..33f1317 100644
|
||
|
|
--- a/waitress/tests/test_functional.py
|
||
|
|
+++ b/waitress/tests/test_functional.py
|
||
|
|
@@ -301,7 +301,7 @@ class EchoTests(object):
|
||
|
|
self.assertFalse("transfer-encoding" in headers)
|
||
|
|
|
||
|
|
def test_chunking_request_with_content(self):
|
||
|
|
- control_line = b"20;\r\n" # 20 hex = 32 dec
|
||
|
|
+ control_line = b"20\r\n" # 20 hex = 32 dec
|
||
|
|
s = b"This string has 32 characters.\r\n"
|
||
|
|
expected = s * 12
|
||
|
|
header = tobytes("GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n")
|
||
|
|
@@ -320,7 +320,7 @@ class EchoTests(object):
|
||
|
|
self.assertFalse("transfer-encoding" in headers)
|
||
|
|
|
||
|
|
def test_broken_chunked_encoding(self):
|
||
|
|
- control_line = "20;\r\n" # 20 hex = 32 dec
|
||
|
|
+ control_line = "20\r\n" # 20 hex = 32 dec
|
||
|
|
s = "This string has 32 characters.\r\n"
|
||
|
|
to_send = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
|
||
|
|
to_send += control_line + s + "\r\n"
|
||
|
|
@@ -344,7 +344,7 @@ class EchoTests(object):
|
||
|
|
self.assertRaises(ConnectionClosed, read_http, fp)
|
||
|
|
|
||
|
|
def test_broken_chunked_encoding_missing_chunk_end(self):
|
||
|
|
- control_line = "20;\r\n" # 20 hex = 32 dec
|
||
|
|
+ control_line = "20\r\n" # 20 hex = 32 dec
|
||
|
|
s = "This string has 32 characters.\r\n"
|
||
|
|
to_send = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
|
||
|
|
to_send += control_line + s
|
||
|
|
diff --git a/waitress/tests/test_parser.py b/waitress/tests/test_parser.py
|
||
|
|
index eabf353..420f280 100644
|
||
|
|
--- a/waitress/tests/test_parser.py
|
||
|
|
+++ b/waitress/tests/test_parser.py
|
||
|
|
@@ -152,7 +152,7 @@ class TestHTTPRequestParser(unittest.TestCase):
|
||
|
|
b"Transfer-Encoding: chunked\r\n"
|
||
|
|
b"X-Foo: 1\r\n"
|
||
|
|
b"\r\n"
|
||
|
|
- b"1d;\r\n"
|
||
|
|
+ b"1d\r\n"
|
||
|
|
b"This string has 29 characters\r\n"
|
||
|
|
b"0\r\n\r\n"
|
||
|
|
)
|
||
|
|
--
|
||
|
|
2.45.2
|
||
|
|
|