From 95037ee7d0ca270e31fcd6481aef58c4be4aedc4 Mon Sep 17 00:00:00 2001 From: Sergey Shepelev Date: Sun, 18 Oct 2020 04:01:36 +0300 Subject: [PATCH] ssl: context wrapped listener failed to supply _context in accept() https://github.com/eventlet/eventlet/issues/651 --- eventlet/green/ssl.py | 3 ++- tests/ssl_test.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py index 10cff21d46..9c58fcd00f 100644 --- a/eventlet/green/ssl.py +++ b/eventlet/green/ssl.py @@ -411,7 +411,8 @@ def accept(self): 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) return (new_ssl, addr) def dup(self): diff --git a/tests/ssl_test.py b/tests/ssl_test.py index d3e378068b..94808b17b9 100644 --- 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()