test: better handling of no content length

hivesolutions · May 30, 2024 · bea8295 · bea8295
1 parent b4399ca
commit bea8295
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+python_files = *.py
+testpaths = src/netius/test
diff --git a/src/netius/common/http.py b/src/netius/common/http.py
@@ -469,7 +469,13 @@ def parse_closed(self):
         the sending of a EOF character (with semantic value).
         """
 
-        if not self.chunked and self.content_l == -1 and self.state == MESSAGE_STATE:
+        if (
+            not self.chunked
+            and self.content_l == -1
+            and self.state == MESSAGE_STATE
+            and self.version
+            and self.version <= HTTP_11
+        ):
             self.state = FINISH_STATE
             self.trigger("on_data")
 

diff --git a/src/netius/test/common/http.py b/src/netius/test/common/http.py
@@ -94,6 +94,12 @@
 \r\n\
 Hello World"
 
+NO_LENGTH_RESPONSE = b"HTTP/1.1 200 OK\r\n\
+Date: Wed, 1 Jan 2014 00:00:00 GMT\r\n\
+Server: Test Service/1.0.0\r\n\
+\r\n\
+Hello World"
+
 
 class HTTPParserTest(unittest.TestCase):
 
@@ -103,6 +109,7 @@ def test_simple(self):
             parser.parse(SIMPLE_REQUEST)
             message = parser.get_message()
             headers = parser.get_headers()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
             self.assertEqual(parser.method, "get")
             self.assertEqual(parser.version, netius.common.HTTP_11)
             self.assertEqual(parser.path_s, "http://localhost")
@@ -120,6 +127,7 @@ def test_chunked(self):
             parser.parse(CHUNKED_REQUEST)
             message = parser.get_message()
             headers = parser.get_headers()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
             self.assertEqual(parser.method, "get")
             self.assertEqual(parser.version, netius.common.HTTP_11)
             self.assertEqual(parser.path_s, "http://localhost")
@@ -137,6 +145,7 @@ def test_malformed(self):
             parser.parse(EXTRA_SPACES_REQUEST)
             message = parser.get_message()
             headers = parser.get_headers()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
             self.assertEqual(parser.method, "get")
             self.assertEqual(parser.version, netius.common.HTTP_11)
             self.assertEqual(parser.path_s, "/")
@@ -153,6 +162,7 @@ def test_malformed(self):
             parser.parse(INVALID_HEADERS_REQUEST)
             message = parser.get_message()
             headers = parser.get_headers()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
             self.assertEqual(parser.method, "get")
             self.assertEqual(parser.version, netius.common.HTTP_11)
             self.assertEqual(parser.path_s, "/")
@@ -251,6 +261,7 @@ def test_file(self):
             parser.parse(CHUNKED_REQUEST)
             message = parser.get_message()
             message_b = parser.get_message_b()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
             self.assertEqual(message, b"Hello World")
             self.assertNotEqual(parser.message_f, None)
             self.assertNotEqual(parser.message_f.read, None)
@@ -305,3 +316,23 @@ def test_clear(self):
         self.assertEqual(parser.chunk_l, 0)
         self.assertEqual(parser.chunk_s, 0)
         self.assertEqual(parser.chunk_e, 0)
+
+    def test_no_length_response(self):
+        parser = netius.common.HTTPParser(self, type=netius.common.RESPONSE, store=True)
+        try:
+            parser.parse(NO_LENGTH_RESPONSE)
+            message = parser.get_message()
+            headers = parser.get_headers()
+            self.assertEqual(parser.state, netius.common.http.MESSAGE_STATE)
+            self.assertEqual(parser.code, 200)
+            self.assertEqual(parser.status, "OK")
+            self.assertEqual(parser.version, netius.common.HTTP_11)
+            self.assertEqual(parser.content_l, -1)
+            self.assertEqual(message, b"Hello World")
+            self.assertEqual(headers["Date"], "Wed, 1 Jan 2014 00:00:00 GMT")
+            self.assertEqual(headers["Server"], "Test Service/1.0.0")
+
+            parser.parse_closed()
+            self.assertEqual(parser.state, netius.common.http.FINISH_STATE)
+        finally:
+            parser.clear()