Handle a case with a not reached newline

python · illia-v · Feb 27, 2024 · Feb 27, 2024 · Mar 27, 2024 · Jun 6, 2024
commit 26b43e16a0580bbeb6902cb15e329138f53756b8
diff --git a/Lib/http/client.py b/Lib/http/client.py
@@ -699,6 +699,9 @@ def readline(self, limit=-1):
             self.length -= len(result)
             if not self.length:
                 self._close_conn()
+            elif len(result) != limit and not result.endswith(b"\n"):
+                self._close_conn()
+                raise IncompleteRead(result)
         return result
 
     def _read1_chunked(self, n):

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
@@ -1675,9 +1675,40 @@ def test_read_incomplete_read(self):
     def test_read1_incomplete_read(self):
         self._test_incomplete_read(self.resp.read1, expected_none=True)
 
-    def test_readline_incomplete_read(self):
+    def test_readline_incomplete_read_with_complete_line(self):
+        """
+        Test that IncompleteRead is raised when readline finishes
+        reading a response but the needed content length is not reached.
+        """
+        resp = self.resp
+        content = resp.fp.read()
+        # For this test case, we must ensure that the last byte read
+        # will be a newline. There is a different handling of readline
+        # not reaching a newline.
+        content = content[:-1] + b"\n"
+        resp.fp = io.BytesIO(content)
         self._test_incomplete_read(self.resp.readline, expected_none=True)
 
+    def test_readline_incomplete_read_with_incomplete_line(self):
+        """
+        Test that IncompleteRead is raised when readline is expected
+        to read a line fully but a newline is not reached.
+        """
+        resp = self.resp
+        content = resp.fp.read()
+        # Truncate the content to the last newline.
+        content = content[:content.rindex(b"\n") - 1]
+        resp.fp = io.BytesIO(content)
+        with self.assertRaises(client.IncompleteRead) as cm:
+            while True:
+                data = resp.readline()
+                if not data:
+                    break
+        exception = cm.exception
+        self.assertEqual(exception.partial, content.split(b"\n")[-1])
+        self.assertIsNone(exception.expected)
+        self.assertTrue(resp.isclosed())
+
 
 class ExtendedReadTestChunked(ExtendedReadTest):
     """

diff --git a/Misc/NEWS.d/next/Library/2024-02-27-20-56-44.gh-issue-115997.LqLP4V.rst b/Misc/NEWS.d/next/Library/2024-02-27-20-56-44.gh-issue-115997.LqLP4V.rst
@@ -1,4 +1,5 @@
 Make ``http.client.HTTPResponse.read1`` and
-``http.client.HTTPResponse.readline`` raise :exc:`IncompleteRead` instead of
-returning zero bytes if a connection is closed before an expected number of
-bytes has been read. Patch by Illia Volochii.
+``http.client.HTTPResponse.readline`` raise :exc:`http.client.IncompleteRead`
+instead of returning zero bytes if a connection is closed before an expected
+number of bytes has been read. Also, ``http.client.HTTPResponse.readline``
+raises when an expected newline has not been reached. Patch by Illia Volochii.