Skip to content

Commit

Permalink
ssl: context wrapped listener failed to supply _context in accept()
Browse files Browse the repository at this point in the history
  • Loading branch information
temoto committed Oct 19, 2020
1 parent f2ebbb8 commit b8717c4
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 6 deletions.
9 changes: 3 additions & 6 deletions eventlet/green/ssl.py
Expand Up @@ -404,14 +404,11 @@ def accept(self):

new_ssl = type(self)(
newsock,
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)
suppress_ragged_eofs=self.suppress_ragged_eofs,
_context=self._context,
)
return (new_ssl, addr)

def dup(self):
Expand Down
46 changes: 46 additions & 0 deletions tests/ssl_test.py
@@ -1,4 +1,5 @@
import contextlib
import random
import socket
import warnings

Expand Down Expand Up @@ -325,3 +326,48 @@ 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)
expected = "success:{}".format(random.random()).encode()

def client(addr):
client_tls = ssl.wrap_socket(
eventlet.connect(addr),
cert_reqs=ssl.CERT_REQUIRED,
ca_certs=tests.certificate_file,
)
client_tls.send(expected)

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(64) == expected
peer.close()

def test_explicit_keys_accept(self):
expected = "success:{}".format(random.random()).encode()

def client(addr):
client_tls = ssl.wrap_socket(
eventlet.connect(addr),
cert_reqs=ssl.CERT_REQUIRED,
ca_certs=tests.certificate_file,
)
client_tls.send(expected)

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 = ssl.wrap_socket(
server_sock, server_side=True,
keyfile=tests.private_key_file, certfile=tests.certificate_file,
)
peer, _ = server_tls.accept()
assert peer.recv(64) == expected
peer.close()

0 comments on commit b8717c4

Please sign in to comment.