Issue python#23804: Merge SSL recv() fix from 3.5

vadmium · vadmium · commit 7386268ffd5a · 2016-07-11T01:32:09.000Z
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -2788,20 +2788,13 @@ def _recvfrom_into():
                         # consume data
                         s.read()
 
-                data = b"data"
-
                 # read(-1, buffer) is supported, even though read(-1) is not
+                data = b"data"
                 s.send(data)
                 buffer = bytearray(len(data))
                 self.assertEqual(s.read(-1, buffer), len(data))
                 self.assertEqual(buffer, data)
 
-                # recv/read(0) should return no data
-                s.send(data)
-                self.assertEqual(s.recv(0), b"")
-                self.assertEqual(s.read(0), b"")
-                self.assertEqual(s.read(), data)
-
                 # Make sure sendmsg et al are disallowed to avoid
                 # inadvertent disclosure of data and/or corruption
                 # of the encrypted data stream
@@ -2817,6 +2810,26 @@ def _recvfrom_into():
 
                 s.close()
 
+        def test_recv_zero(self):
+            server = ThreadedEchoServer(CERTFILE)
+            server.__enter__()
+            self.addCleanup(server.__exit__, None, None)
+            s = socket.create_connection((HOST, server.port))
+            self.addCleanup(s.close)
+            s = ssl.wrap_socket(s, suppress_ragged_eofs=False)
+            self.addCleanup(s.close)
+
+            # recv/read(0) should return no data
+            s.send(b"data")
+            self.assertEqual(s.recv(0), b"")
+            self.assertEqual(s.read(0), b"")
+            self.assertEqual(s.read(), b"data")
+
+            # Should not block if the other end sends no data
+            s.setblocking(False)
+            self.assertEqual(s.recv(0), b"")
+            self.assertEqual(s.recv_into(bytearray()), 0)
+
         def test_nonblocking_send(self):
             server = ThreadedEchoServer(CERTFILE,
                                         certreqs=ssl.CERT_NONE,
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #23804: Fix SSL zero-length recv() calls to not block and not raise
+  an error about unclean EOF.
+
 - Issue #27466: Change time format returned by http.cookie.time2netscape,
   confirming the netscape cookie format and making it consistent with
   documentation.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -1913,6 +1913,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1,
         dest = PyBytes_FromStringAndSize(NULL, len);
         if (dest == NULL)
             goto error;
+        if (len == 0) {
+            Py_XDECREF(sock);
+            return dest;
+        }
         mem = PyBytes_AS_STRING(dest);
     }
     else {
@@ -1924,6 +1928,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1,
                                 "maximum length can't fit in a C 'int'");
                 goto error;
             }
+            if (len == 0) {
+                count = 0;
+                goto done;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1913,6 +1913,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1,`
`1913`	`1913`	`dest = PyBytes_FromStringAndSize(NULL, len);`
`1914`	`1914`	`if (dest == NULL)`
`1915`	`1915`	`goto error;`
	`1916`	`+ if (len == 0) {`
	`1917`	`+ Py_XDECREF(sock);`
	`1918`	`+ return dest;`
	`1919`	`+ }`
`1916`	`1920`	`mem = PyBytes_AS_STRING(dest);`
`1917`	`1921`	`}`
`1918`	`1922`	`else {`
`@@ -1924,6 +1928,10 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, int len, int group_right_1,`
`1924`	`1928`	`"maximum length can't fit in a C 'int'");`
`1925`	`1929`	`goto error;`
`1926`	`1930`	`}`
	`1931`	`+ if (len == 0) {`
	`1932`	`+ count = 0;`
	`1933`	`+ goto done;`
	`1934`	`+ }`
`1927`	`1935`	`}`
`1928`	`1936`	`}`
`1929`	`1937`