ssl: context wrapped listener failed to supply _context in accept()

#651
eventlet · Oct 18, 2020 · 4d51963 · 4d51963
1 parent f2ebbb8
commit 4d51963
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py
@@ -402,16 +402,25 @@ def accept(self):
                     trampoline(self, read=True, timeout=self.gettimeout(),
                                timeout_exc=timeout_exc('timed out'))
 
-        new_ssl = type(self)(
-            newsock,
-            keyfile=self.keyfile,
-            certfile=self.certfile,
+        kwargs = dict(
             server_side=True,
-            cert_reqs=self.cert_reqs,
-            ssl_version=self.ssl_version,
-            ca_certs=self.ca_certs,
             do_handshake_on_connect=False,
-            suppress_ragged_eofs=self.suppress_ragged_eofs)
+            suppress_ragged_eofs=self.suppress_ragged_eofs,
+            _context=self._context,
+        )
+        if not _is_under_py_3_7:
+            kwargs.update(**dict(
+                keyfile=self.keyfile,
+                certfile=self.certfile,
+                server_side=True,
+                cert_reqs=self.cert_reqs,
+                ssl_version=self.ssl_version,
+                ca_certs=self.ca_certs,
+                do_handshake_on_connect=False,
+                suppress_ragged_eofs=self.suppress_ragged_eofs,
+                _context=self._context,
+            ))
+        new_ssl = type(self)(newsock, **kwargs)
         return (new_ssl, addr)
 
     def dup(self):

diff --git a/tests/ssl_test.py b/tests/ssl_test.py
@@ -325,3 +325,20 @@ def accept(listener):
                 server_to_client.close()
 
                 listener.close()
+
+    def test_context_wrapped_accept(self):
+        context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+        context.load_cert_chain(tests.certificate_file, tests.private_key_file)
+
+        def client(addr):
+            client_sock = ssl.wrap_socket(eventlet.connect(addr))
+            client_sock.send(b"success")
+
+        server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        server_sock.bind(('localhost', 0))
+        server_sock.listen(1)
+        eventlet.spawn(client, server_sock.getsockname())
+        server_tls = context.wrap_socket(server_sock, server_side=True)
+        peer, _ = server_tls.accept()
+        assert peer.recv(32) == b"success"
+        peer.close()