changeset: 81950:03c536afeb7e branch: 3.2 parent: 81943:e6952acd5a55 user: Antoine Pitrou date: Sat Feb 02 22:49:34 2013 +0100 files: Lib/http/client.py Lib/test/test_httplib.py Misc/NEWS description: Issue #15633: httplib.HTTPResponse is now mark closed when the server sends less than the advertised Content-Length. diff -r e6952acd5a55 -r 03c536afeb7e Lib/http/client.py --- a/Lib/http/client.py Sat Feb 02 20:05:11 2013 +0100 +++ b/Lib/http/client.py Sat Feb 02 22:49:34 2013 +0100 @@ -493,7 +493,11 @@ if self.length is None: s = self.fp.read() else: - s = self._safe_read(self.length) + try: + s = self._safe_read(self.length) + except IncompleteRead: + self.close() + raise self.length = 0 self.close() # we read everything return s @@ -507,6 +511,10 @@ # connection, and the user is reading more bytes than will be provided # (for example, reading in 1k chunks) s = self.fp.read(amt) + if not s: + # Ideally, we would raise IncompleteRead if the content-length + # wasn't satisfied, but it might break compatibility. + self.close() if self.length is not None: self.length -= len(s) if not self.length: diff -r e6952acd5a55 -r 03c536afeb7e Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py Sat Feb 02 20:05:11 2013 +0100 +++ b/Lib/test/test_httplib.py Sat Feb 02 22:49:34 2013 +0100 @@ -199,6 +199,19 @@ self.assertEqual(resp.read(1), b'') self.assertTrue(resp.isclosed()) + def test_partial_reads_incomplete_body(self): + # if the server shuts down the connection before the whole + # content-length is delivered, the socket is gracefully closed + body = "HTTP/1.1 200 Ok\r\nContent-Length: 10\r\n\r\nText" + sock = FakeSocket(body) + resp = client.HTTPResponse(sock) + resp.begin() + self.assertEqual(resp.read(2), b'Te') + self.assertFalse(resp.isclosed()) + self.assertEqual(resp.read(2), b'xt') + self.assertEqual(resp.read(1), b'') + self.assertTrue(resp.isclosed()) + def test_host_port(self): # Check invalid host_port @@ -349,7 +362,7 @@ resp = client.HTTPResponse(sock, method="GET") resp.begin() self.assertEqual(resp.read(), b'Hello\r\n') - resp.close() + self.assertTrue(resp.isclosed()) def test_incomplete_read(self): sock = FakeSocket('HTTP/1.1 200 OK\r\nContent-Length: 10\r\n\r\nHello\r\n') @@ -363,10 +376,9 @@ "IncompleteRead(7 bytes read, 3 more expected)") self.assertEqual(str(i), "IncompleteRead(7 bytes read, 3 more expected)") + self.assertTrue(resp.isclosed()) else: self.fail('IncompleteRead expected') - finally: - resp.close() def test_epipe(self): sock = EPipeSocket( diff -r e6952acd5a55 -r 03c536afeb7e Misc/NEWS --- a/Misc/NEWS Sat Feb 02 20:05:11 2013 +0100 +++ b/Misc/NEWS Sat Feb 02 22:49:34 2013 +0100 @@ -212,6 +212,9 @@ Library ------- +- Issue #15633: httplib.HTTPResponse is now mark closed when the server + sends less than the advertised Content-Length. + - Issue #6972: The zipfile module no longer overwrites files outside of its destination path when extracting malicious zip files.