Skip to content

[3.8] gh-108310: Fix TestPreHandshakeClose tests in test_ssl #110718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambv merged 2 commits into from
Jan 17, 2024
Merged

[3.8] gh-108310: Fix TestPreHandshakeClose tests in test_ssl #110718

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fa62f5
gh-108310: Fix TestPreHandshakeClose tests in test_ssl
frenzymadness Oct 11, 2023
e82325a
Add Blurb
ambv Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-108310: Fix TestPreHandshakeClose tests in test_ssl 
The new class is part of the fix for CVE-2023-40217:
b4bcc06
but it's not in the lists of tests so they're not
executed. The new tests also need `SHORT_TIMEOUT`
constant not available in test.support in 3.8.
  • Loading branch information
@frenzymadness
frenzymadness committed Oct 11, 2023
commit 7fa62f5471b71008cb98ca5abffa5be432dae39b
15 changes: 9 additions & 6 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ def data_file(*name):
OP_ENABLE_MIDDLEBOX_COMPAT = getattr(ssl, "OP_ENABLE_MIDDLEBOX_COMPAT", 0)
OP_IGNORE_UNEXPECTED_EOF = getattr(ssl, "OP_IGNORE_UNEXPECTED_EOF", 0)

# *_TIMEOUT constants are available in test.support in 3.9+
SHORT_TIMEOUT = 30.0

# Ubuntu has patched OpenSSL and changed behavior of security level 2
# see https://bugs.python.org/issue41561#msg389003
def is_ubuntu():
Expand Down Expand Up @@ -4835,7 +4838,7 @@ def __init__(self, *, name, call_after_accept, timeout=None):
self.listener = None # set by .start()
self.port = None # set by .start()
if timeout is None:
self.timeout = support.SHORT_TIMEOUT
self.timeout = SHORT_TIMEOUT
else:
self.timeout = timeout
super().__init__(name=name)
Expand Down Expand Up @@ -4917,7 +4920,7 @@ def test_preauth_data_to_tls_server(self):

def call_after_accept(unused):
server_accept_called.set()
if not ready_for_server_wrap_socket.wait(support.SHORT_TIMEOUT):
if not ready_for_server_wrap_socket.wait(SHORT_TIMEOUT):
raise RuntimeError("wrap_socket event never set, test may fail.")
return False # Tell the server thread to continue.

Expand Down Expand Up @@ -4961,7 +4964,7 @@ def test_preauth_data_to_tls_client(self):
client_can_continue_with_wrap_socket = threading.Event()

def call_after_accept(conn_to_client):
if not server_can_continue_with_wrap_socket.wait(support.SHORT_TIMEOUT):
if not server_can_continue_with_wrap_socket.wait(SHORT_TIMEOUT):
print("ERROR: test client took too long")

# This forces an immediate connection close via RST on .close().
Expand All @@ -4987,7 +4990,7 @@ def call_after_accept(conn_to_client):
client.connect(server.listener.getsockname())
server_can_continue_with_wrap_socket.set()

if not client_can_continue_with_wrap_socket.wait(support.SHORT_TIMEOUT):
if not client_can_continue_with_wrap_socket.wait(SHORT_TIMEOUT):
self.fail("test server took too long")
ssl_ctx = ssl.create_default_context()
try:
Expand Down Expand Up @@ -5026,7 +5029,7 @@ def connect(self):
http.client.HTTPConnection.connect(self)

# Wait for our fault injection server to have done its thing.
if not server_responding.wait(support.SHORT_TIMEOUT) and support.verbose:
if not server_responding.wait(SHORT_TIMEOUT) and support.verbose:
sys.stdout.write("server_responding event never set.")
self.sock = self._context.wrap_socket(
self.sock, server_hostname=self.host)
Expand Down Expand Up @@ -5104,7 +5107,7 @@ def test_main(verbose=False):
tests = [
ContextTests, BasicSocketTests, SSLErrorTests, MemoryBIOTests,
SSLObjectTests, SimpleBackgroundTests, ThreadedTests,
TestPostHandshakeAuth, TestSSLDebug
TestPostHandshakeAuth, TestSSLDebug, TestPreHandshakeClose
]

if support.is_resource_enabled('network'):
Expand Down