|
|
|
|
@ -1,608 +0,0 @@
|
|
|
|
|
From 2aeba0764c385241032068b32a5e89a1ec289af7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
|
|
|
|
|
Date: Tue, 22 Aug 2023 19:53:19 +0200
|
|
|
|
|
Subject: [PATCH 1/3] gh-108310: Fix CVE-2023-40217: Check for & avoid the ssl
|
|
|
|
|
pre-close flaw (#108317)
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
gh-108310: Fix CVE-2023-40217: Check for & avoid the ssl pre-close flaw
|
|
|
|
|
|
|
|
|
|
Instances of `ssl.SSLSocket` were vulnerable to a bypass of the TLS handshake
|
|
|
|
|
and included protections (like certificate verification) and treating sent
|
|
|
|
|
unencrypted data as if it were post-handshake TLS encrypted data.
|
|
|
|
|
|
|
|
|
|
The vulnerability is caused when a socket is connected, data is sent by the
|
|
|
|
|
malicious peer and stored in a buffer, and then the malicious peer closes the
|
|
|
|
|
socket within a small timing window before the other peers’ TLS handshake can
|
|
|
|
|
begin. After this sequence of events the closed socket will not immediately
|
|
|
|
|
attempt a TLS handshake due to not being connected but will also allow the
|
|
|
|
|
buffered data to be read as if a successful TLS handshake had occurred.
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
|
|
|
|
|
---
|
|
|
|
|
Lib/ssl.py | 31 ++-
|
|
|
|
|
Lib/test/test_ssl.py | 211 ++++++++++++++++++
|
|
|
|
|
...-08-22-17-39-12.gh-issue-108310.fVM3sg.rst | 7 +
|
|
|
|
|
3 files changed, 248 insertions(+), 1 deletion(-)
|
|
|
|
|
create mode 100644 Misc/NEWS.d/next/Security/2023-08-22-17-39-12.gh-issue-108310.fVM3sg.rst
|
|
|
|
|
|
|
|
|
|
diff --git a/Lib/ssl.py b/Lib/ssl.py
|
|
|
|
|
index ebac1d6..ced87d4 100644
|
|
|
|
|
--- a/Lib/ssl.py
|
|
|
|
|
+++ b/Lib/ssl.py
|
|
|
|
|
@@ -1037,7 +1037,7 @@ class SSLSocket(socket):
|
|
|
|
|
)
|
|
|
|
|
self = cls.__new__(cls, **kwargs)
|
|
|
|
|
super(SSLSocket, self).__init__(**kwargs)
|
|
|
|
|
- self.settimeout(sock.gettimeout())
|
|
|
|
|
+ sock_timeout = sock.gettimeout()
|
|
|
|
|
sock.detach()
|
|
|
|
|
|
|
|
|
|
self._context = context
|
|
|
|
|
@@ -1056,9 +1056,38 @@ class SSLSocket(socket):
|
|
|
|
|
if e.errno != errno.ENOTCONN:
|
|
|
|
|
raise
|
|
|
|
|
connected = False
|
|
|
|
|
+ blocking = self.getblocking()
|
|
|
|
|
+ self.setblocking(False)
|
|
|
|
|
+ try:
|
|
|
|
|
+ # We are not connected so this is not supposed to block, but
|
|
|
|
|
+ # testing revealed otherwise on macOS and Windows so we do
|
|
|
|
|
+ # the non-blocking dance regardless. Our raise when any data
|
|
|
|
|
+ # is found means consuming the data is harmless.
|
|
|
|
|
+ notconn_pre_handshake_data = self.recv(1)
|
|
|
|
|
+ except OSError as e:
|
|
|
|
|
+ # EINVAL occurs for recv(1) on non-connected on unix sockets.
|
|
|
|
|
+ if e.errno not in (errno.ENOTCONN, errno.EINVAL):
|
|
|
|
|
+ raise
|
|
|
|
|
+ notconn_pre_handshake_data = b''
|
|
|
|
|
+ self.setblocking(blocking)
|
|
|
|
|
+ if notconn_pre_handshake_data:
|
|
|
|
|
+ # This prevents pending data sent to the socket before it was
|
|
|
|
|
+ # closed from escaping to the caller who could otherwise
|
|
|
|
|
+ # presume it came through a successful TLS connection.
|
|
|
|
|
+ reason = "Closed before TLS handshake with data in recv buffer."
|
|
|
|
|
+ notconn_pre_handshake_data_error = SSLError(e.errno, reason)
|
|
|
|
|
+ # Add the SSLError attributes that _ssl.c always adds.
|
|
|
|
|
+ notconn_pre_handshake_data_error.reason = reason
|
|
|
|
|
+ notconn_pre_handshake_data_error.library = None
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.close()
|
|
|
|
|
+ except OSError:
|
|
|
|
|
+ pass
|
|
|
|
|
+ raise notconn_pre_handshake_data_error
|
|
|
|
|
else:
|
|
|
|
|
connected = True
|
|
|
|
|
|
|
|
|
|
+ self.settimeout(sock_timeout) # Must come after setblocking() calls.
|
|
|
|
|
self._connected = connected
|
|
|
|
|
if connected:
|
|
|
|
|
# create the SSL object
|
|
|
|
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
|
|
|
|
index 3b3b869..bc8a098 100644
|
|
|
|
|
--- a/Lib/test/test_ssl.py
|
|
|
|
|
+++ b/Lib/test/test_ssl.py
|
|
|
|
|
@@ -9,11 +9,14 @@ from test.support import os_helper
|
|
|
|
|
from test.support import socket_helper
|
|
|
|
|
from test.support import threading_helper
|
|
|
|
|
from test.support import warnings_helper
|
|
|
|
|
+import re
|
|
|
|
|
import socket
|
|
|
|
|
import select
|
|
|
|
|
+import struct
|
|
|
|
|
import time
|
|
|
|
|
import enum
|
|
|
|
|
import gc
|
|
|
|
|
+import http.client
|
|
|
|
|
import os
|
|
|
|
|
import errno
|
|
|
|
|
import pprint
|
|
|
|
|
@@ -4884,6 +4887,214 @@ class TestSSLDebug(unittest.TestCase):
|
|
|
|
|
s.connect((HOST, server.port))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+def set_socket_so_linger_on_with_zero_timeout(sock):
|
|
|
|
|
+ sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack('ii', 1, 0))
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
+ """Verify behavior of close sockets with received data before to the handshake.
|
|
|
|
|
+ """
|
|
|
|
|
+
|
|
|
|
|
+ class SingleConnectionTestServerThread(threading.Thread):
|
|
|
|
|
+
|
|
|
|
|
+ def __init__(self, *, name, call_after_accept):
|
|
|
|
|
+ self.call_after_accept = call_after_accept
|
|
|
|
|
+ self.received_data = b'' # set by .run()
|
|
|
|
|
+ self.wrap_error = None # set by .run()
|
|
|
|
|
+ self.listener = None # set by .start()
|
|
|
|
|
+ self.port = None # set by .start()
|
|
|
|
|
+ super().__init__(name=name)
|
|
|
|
|
+
|
|
|
|
|
+ def __enter__(self):
|
|
|
|
|
+ self.start()
|
|
|
|
|
+ return self
|
|
|
|
|
+
|
|
|
|
|
+ def __exit__(self, *args):
|
|
|
|
|
+ try:
|
|
|
|
|
+ if self.listener:
|
|
|
|
|
+ self.listener.close()
|
|
|
|
|
+ except OSError:
|
|
|
|
|
+ pass
|
|
|
|
|
+ self.join()
|
|
|
|
|
+ self.wrap_error = None # avoid dangling references
|
|
|
|
|
+
|
|
|
|
|
+ def start(self):
|
|
|
|
|
+ self.ssl_ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
|
|
|
|
|
+ self.ssl_ctx.verify_mode = ssl.CERT_REQUIRED
|
|
|
|
|
+ self.ssl_ctx.load_verify_locations(cafile=ONLYCERT)
|
|
|
|
|
+ self.ssl_ctx.load_cert_chain(certfile=ONLYCERT, keyfile=ONLYKEY)
|
|
|
|
|
+ self.listener = socket.socket()
|
|
|
|
|
+ self.port = socket_helper.bind_port(self.listener)
|
|
|
|
|
+ self.listener.settimeout(2.0)
|
|
|
|
|
+ self.listener.listen(1)
|
|
|
|
|
+ super().start()
|
|
|
|
|
+
|
|
|
|
|
+ def run(self):
|
|
|
|
|
+ conn, address = self.listener.accept()
|
|
|
|
|
+ self.listener.close()
|
|
|
|
|
+ with conn:
|
|
|
|
|
+ if self.call_after_accept(conn):
|
|
|
|
|
+ return
|
|
|
|
|
+ try:
|
|
|
|
|
+ tls_socket = self.ssl_ctx.wrap_socket(conn, server_side=True)
|
|
|
|
|
+ except OSError as err: # ssl.SSLError inherits from OSError
|
|
|
|
|
+ self.wrap_error = err
|
|
|
|
|
+ else:
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.received_data = tls_socket.recv(400)
|
|
|
|
|
+ except OSError:
|
|
|
|
|
+ pass # closed, protocol error, etc.
|
|
|
|
|
+
|
|
|
|
|
+ def non_linux_skip_if_other_okay_error(self, err):
|
|
|
|
|
+ if sys.platform == "linux":
|
|
|
|
|
+ return # Expect the full test setup to always work on Linux.
|
|
|
|
|
+ if (isinstance(err, ConnectionResetError) or
|
|
|
|
|
+ (isinstance(err, OSError) and err.errno == errno.EINVAL) or
|
|
|
|
|
+ re.search('wrong.version.number', getattr(err, "reason", ""), re.I)):
|
|
|
|
|
+ # On Windows the TCP RST leads to a ConnectionResetError
|
|
|
|
|
+ # (ECONNRESET) which Linux doesn't appear to surface to userspace.
|
|
|
|
|
+ # If wrap_socket() winds up on the "if connected:" path and doing
|
|
|
|
|
+ # the actual wrapping... we get an SSLError from OpenSSL. Typically
|
|
|
|
|
+ # WRONG_VERSION_NUMBER. While appropriate, neither is the scenario
|
|
|
|
|
+ # we're specifically trying to test. The way this test is written
|
|
|
|
|
+ # is known to work on Linux. We'll skip it anywhere else that it
|
|
|
|
|
+ # does not present as doing so.
|
|
|
|
|
+ self.skipTest(f"Could not recreate conditions on {sys.platform}:"
|
|
|
|
|
+ f" {err=}")
|
|
|
|
|
+ # If maintaining this conditional winds up being a problem.
|
|
|
|
|
+ # just turn this into an unconditional skip anything but Linux.
|
|
|
|
|
+ # The important thing is that our CI has the logic covered.
|
|
|
|
|
+
|
|
|
|
|
+ def test_preauth_data_to_tls_server(self):
|
|
|
|
|
+ server_accept_called = threading.Event()
|
|
|
|
|
+ ready_for_server_wrap_socket = threading.Event()
|
|
|
|
|
+
|
|
|
|
|
+ def call_after_accept(unused):
|
|
|
|
|
+ server_accept_called.set()
|
|
|
|
|
+ if not ready_for_server_wrap_socket.wait(2.0):
|
|
|
|
|
+ raise RuntimeError("wrap_socket event never set, test may fail.")
|
|
|
|
|
+ return False # Tell the server thread to continue.
|
|
|
|
|
+
|
|
|
|
|
+ server = self.SingleConnectionTestServerThread(
|
|
|
|
|
+ call_after_accept=call_after_accept,
|
|
|
|
|
+ name="preauth_data_to_tls_server")
|
|
|
|
|
+ self.enterContext(server) # starts it & unittest.TestCase stops it.
|
|
|
|
|
+
|
|
|
|
|
+ with socket.socket() as client:
|
|
|
|
|
+ client.connect(server.listener.getsockname())
|
|
|
|
|
+ # This forces an immediate connection close via RST on .close().
|
|
|
|
|
+ set_socket_so_linger_on_with_zero_timeout(client)
|
|
|
|
|
+ client.setblocking(False)
|
|
|
|
|
+
|
|
|
|
|
+ server_accept_called.wait()
|
|
|
|
|
+ client.send(b"DELETE /data HTTP/1.0\r\n\r\n")
|
|
|
|
|
+ client.close() # RST
|
|
|
|
|
+
|
|
|
|
|
+ ready_for_server_wrap_socket.set()
|
|
|
|
|
+ server.join()
|
|
|
|
|
+ wrap_error = server.wrap_error
|
|
|
|
|
+ self.assertEqual(b"", server.received_data)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
+ self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
+ self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
+ self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+
|
|
|
|
|
+ def test_preauth_data_to_tls_client(self):
|
|
|
|
|
+ client_can_continue_with_wrap_socket = threading.Event()
|
|
|
|
|
+
|
|
|
|
|
+ def call_after_accept(conn_to_client):
|
|
|
|
|
+ # This forces an immediate connection close via RST on .close().
|
|
|
|
|
+ set_socket_so_linger_on_with_zero_timeout(conn_to_client)
|
|
|
|
|
+ conn_to_client.send(
|
|
|
|
|
+ b"HTTP/1.0 307 Temporary Redirect\r\n"
|
|
|
|
|
+ b"Location: https://example.com/someone-elses-server\r\n"
|
|
|
|
|
+ b"\r\n")
|
|
|
|
|
+ conn_to_client.close() # RST
|
|
|
|
|
+ client_can_continue_with_wrap_socket.set()
|
|
|
|
|
+ return True # Tell the server to stop.
|
|
|
|
|
+
|
|
|
|
|
+ server = self.SingleConnectionTestServerThread(
|
|
|
|
|
+ call_after_accept=call_after_accept,
|
|
|
|
|
+ name="preauth_data_to_tls_client")
|
|
|
|
|
+ self.enterContext(server) # starts it & unittest.TestCase stops it.
|
|
|
|
|
+ # Redundant; call_after_accept sets SO_LINGER on the accepted conn.
|
|
|
|
|
+ set_socket_so_linger_on_with_zero_timeout(server.listener)
|
|
|
|
|
+
|
|
|
|
|
+ with socket.socket() as client:
|
|
|
|
|
+ client.connect(server.listener.getsockname())
|
|
|
|
|
+ if not client_can_continue_with_wrap_socket.wait(2.0):
|
|
|
|
|
+ self.fail("test server took too long.")
|
|
|
|
|
+ ssl_ctx = ssl.create_default_context()
|
|
|
|
|
+ try:
|
|
|
|
|
+ tls_client = ssl_ctx.wrap_socket(
|
|
|
|
|
+ client, server_hostname="localhost")
|
|
|
|
|
+ except OSError as err: # SSLError inherits from OSError
|
|
|
|
|
+ wrap_error = err
|
|
|
|
|
+ received_data = b""
|
|
|
|
|
+ else:
|
|
|
|
|
+ wrap_error = None
|
|
|
|
|
+ received_data = tls_client.recv(400)
|
|
|
|
|
+ tls_client.close()
|
|
|
|
|
+
|
|
|
|
|
+ server.join()
|
|
|
|
|
+ self.assertEqual(b"", received_data)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
+ self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
+ self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
+ self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+
|
|
|
|
|
+ def test_https_client_non_tls_response_ignored(self):
|
|
|
|
|
+
|
|
|
|
|
+ server_responding = threading.Event()
|
|
|
|
|
+
|
|
|
|
|
+ class SynchronizedHTTPSConnection(http.client.HTTPSConnection):
|
|
|
|
|
+ def connect(self):
|
|
|
|
|
+ http.client.HTTPConnection.connect(self)
|
|
|
|
|
+ # Wait for our fault injection server to have done its thing.
|
|
|
|
|
+ if not server_responding.wait(1.0) and support.verbose:
|
|
|
|
|
+ sys.stdout.write("server_responding event never set.")
|
|
|
|
|
+ self.sock = self._context.wrap_socket(
|
|
|
|
|
+ self.sock, server_hostname=self.host)
|
|
|
|
|
+
|
|
|
|
|
+ def call_after_accept(conn_to_client):
|
|
|
|
|
+ # This forces an immediate connection close via RST on .close().
|
|
|
|
|
+ set_socket_so_linger_on_with_zero_timeout(conn_to_client)
|
|
|
|
|
+ conn_to_client.send(
|
|
|
|
|
+ b"HTTP/1.0 402 Payment Required\r\n"
|
|
|
|
|
+ b"\r\n")
|
|
|
|
|
+ conn_to_client.close() # RST
|
|
|
|
|
+ server_responding.set()
|
|
|
|
|
+ return True # Tell the server to stop.
|
|
|
|
|
+
|
|
|
|
|
+ server = self.SingleConnectionTestServerThread(
|
|
|
|
|
+ call_after_accept=call_after_accept,
|
|
|
|
|
+ name="non_tls_http_RST_responder")
|
|
|
|
|
+ self.enterContext(server) # starts it & unittest.TestCase stops it.
|
|
|
|
|
+ # Redundant; call_after_accept sets SO_LINGER on the accepted conn.
|
|
|
|
|
+ set_socket_so_linger_on_with_zero_timeout(server.listener)
|
|
|
|
|
+
|
|
|
|
|
+ connection = SynchronizedHTTPSConnection(
|
|
|
|
|
+ f"localhost",
|
|
|
|
|
+ port=server.port,
|
|
|
|
|
+ context=ssl.create_default_context(),
|
|
|
|
|
+ timeout=2.0,
|
|
|
|
|
+ )
|
|
|
|
|
+ # There are lots of reasons this raises as desired, long before this
|
|
|
|
|
+ # test was added. Sending the request requires a successful TLS wrapped
|
|
|
|
|
+ # socket; that fails if the connection is broken. It may seem pointless
|
|
|
|
|
+ # to test this. It serves as an illustration of something that we never
|
|
|
|
|
+ # want to happen... properly not happening.
|
|
|
|
|
+ with self.assertRaises(OSError) as err_ctx:
|
|
|
|
|
+ connection.request("HEAD", "/test", headers={"Host": "localhost"})
|
|
|
|
|
+ response = connection.getresponse()
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
class TestEnumerations(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
def test_tlsversion(self):
|
|
|
|
|
diff --git a/Misc/NEWS.d/next/Security/2023-08-22-17-39-12.gh-issue-108310.fVM3sg.rst b/Misc/NEWS.d/next/Security/2023-08-22-17-39-12.gh-issue-108310.fVM3sg.rst
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..403c77a
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/Misc/NEWS.d/next/Security/2023-08-22-17-39-12.gh-issue-108310.fVM3sg.rst
|
|
|
|
|
@@ -0,0 +1,7 @@
|
|
|
|
|
+Fixed an issue where instances of :class:`ssl.SSLSocket` were vulnerable to
|
|
|
|
|
+a bypass of the TLS handshake and included protections (like certificate
|
|
|
|
|
+verification) and treating sent unencrypted data as if it were
|
|
|
|
|
+post-handshake TLS encrypted data. Security issue reported as
|
|
|
|
|
+`CVE-2023-40217
|
|
|
|
|
+<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-40217>`_ by
|
|
|
|
|
+Aapo Oksman. Patch by Gregory P. Smith.
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 020da41ffe4f98efe85131e943dcf7b75a5a5f3a Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: "Miss Islington (bot)"
|
|
|
|
|
<31488909+miss-islington@users.noreply.github.com>
|
|
|
|
|
Date: Wed, 23 Aug 2023 03:10:04 -0700
|
|
|
|
|
Subject: [PATCH 2/3] gh-108342: Break ref cycle in SSLSocket._create() exc
|
|
|
|
|
(GH-108344) (#108349)
|
|
|
|
|
|
|
|
|
|
Explicitly break a reference cycle when SSLSocket._create() raises an
|
|
|
|
|
exception. Clear the variable storing the exception, since the
|
|
|
|
|
exception traceback contains the variables and so creates a reference
|
|
|
|
|
cycle.
|
|
|
|
|
|
|
|
|
|
This test leak was introduced by the test added for the fix of GH-108310.
|
|
|
|
|
(cherry picked from commit 64f99350351bc46e016b2286f36ba7cd669b79e3)
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Victor Stinner <vstinner@python.org>
|
|
|
|
|
---
|
|
|
|
|
Lib/ssl.py | 6 +++++-
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Lib/ssl.py b/Lib/ssl.py
|
|
|
|
|
index ced87d4..48d229f 100644
|
|
|
|
|
--- a/Lib/ssl.py
|
|
|
|
|
+++ b/Lib/ssl.py
|
|
|
|
|
@@ -1083,7 +1083,11 @@ class SSLSocket(socket):
|
|
|
|
|
self.close()
|
|
|
|
|
except OSError:
|
|
|
|
|
pass
|
|
|
|
|
- raise notconn_pre_handshake_data_error
|
|
|
|
|
+ try:
|
|
|
|
|
+ raise notconn_pre_handshake_data_error
|
|
|
|
|
+ finally:
|
|
|
|
|
+ # Explicitly break the reference cycle.
|
|
|
|
|
+ notconn_pre_handshake_data_error = None
|
|
|
|
|
else:
|
|
|
|
|
connected = True
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From e20339d85a893c7915b747f7bd80cc5c6fcc51c1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
|
|
|
|
|
Date: Thu, 24 Aug 2023 12:08:52 +0200
|
|
|
|
|
Subject: [PATCH 3/3] gh-108342: Make ssl TestPreHandshakeClose more reliable
|
|
|
|
|
(GH-108370) (#108405)
|
|
|
|
|
|
|
|
|
|
* In preauth tests of test_ssl, explicitly break reference cycles
|
|
|
|
|
invoving SingleConnectionTestServerThread to make sure that the
|
|
|
|
|
thread is deleted. Otherwise, the test marks the environment as
|
|
|
|
|
altered because the threading module sees a "dangling thread"
|
|
|
|
|
(SingleConnectionTestServerThread). This test leak was introduced
|
|
|
|
|
by the test added for the fix of issue gh-108310.
|
|
|
|
|
* Use support.SHORT_TIMEOUT instead of hardcoded 1.0 or 2.0 seconds
|
|
|
|
|
timeout.
|
|
|
|
|
* SingleConnectionTestServerThread.run() catchs TimeoutError
|
|
|
|
|
* Fix a race condition (missing synchronization) in
|
|
|
|
|
test_preauth_data_to_tls_client(): the server now waits until the
|
|
|
|
|
client connect() completed in call_after_accept().
|
|
|
|
|
* test_https_client_non_tls_response_ignored() calls server.join()
|
|
|
|
|
explicitly.
|
|
|
|
|
* Replace "localhost" with server.listener.getsockname()[0].
|
|
|
|
|
(cherry picked from commit 592bacb6fc0833336c0453e818e9b95016e9fd47)
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Victor Stinner <vstinner@python.org>
|
|
|
|
|
---
|
|
|
|
|
Lib/test/test_ssl.py | 102 ++++++++++++++++++++++++++++++-------------
|
|
|
|
|
1 file changed, 71 insertions(+), 31 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
|
|
|
|
index bc8a098..f1633ee 100644
|
|
|
|
|
--- a/Lib/test/test_ssl.py
|
|
|
|
|
+++ b/Lib/test/test_ssl.py
|
|
|
|
|
@@ -4897,12 +4897,16 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
class SingleConnectionTestServerThread(threading.Thread):
|
|
|
|
|
|
|
|
|
|
- def __init__(self, *, name, call_after_accept):
|
|
|
|
|
+ def __init__(self, *, name, call_after_accept, timeout=None):
|
|
|
|
|
self.call_after_accept = call_after_accept
|
|
|
|
|
self.received_data = b'' # set by .run()
|
|
|
|
|
self.wrap_error = None # set by .run()
|
|
|
|
|
self.listener = None # set by .start()
|
|
|
|
|
self.port = None # set by .start()
|
|
|
|
|
+ if timeout is None:
|
|
|
|
|
+ self.timeout = support.SHORT_TIMEOUT
|
|
|
|
|
+ else:
|
|
|
|
|
+ self.timeout = timeout
|
|
|
|
|
super().__init__(name=name)
|
|
|
|
|
|
|
|
|
|
def __enter__(self):
|
|
|
|
|
@@ -4925,13 +4929,19 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
self.ssl_ctx.load_cert_chain(certfile=ONLYCERT, keyfile=ONLYKEY)
|
|
|
|
|
self.listener = socket.socket()
|
|
|
|
|
self.port = socket_helper.bind_port(self.listener)
|
|
|
|
|
- self.listener.settimeout(2.0)
|
|
|
|
|
+ self.listener.settimeout(self.timeout)
|
|
|
|
|
self.listener.listen(1)
|
|
|
|
|
super().start()
|
|
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
|
- conn, address = self.listener.accept()
|
|
|
|
|
- self.listener.close()
|
|
|
|
|
+ try:
|
|
|
|
|
+ conn, address = self.listener.accept()
|
|
|
|
|
+ except TimeoutError:
|
|
|
|
|
+ # on timeout, just close the listener
|
|
|
|
|
+ return
|
|
|
|
|
+ finally:
|
|
|
|
|
+ self.listener.close()
|
|
|
|
|
+
|
|
|
|
|
with conn:
|
|
|
|
|
if self.call_after_accept(conn):
|
|
|
|
|
return
|
|
|
|
|
@@ -4959,8 +4969,13 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
# we're specifically trying to test. The way this test is written
|
|
|
|
|
# is known to work on Linux. We'll skip it anywhere else that it
|
|
|
|
|
# does not present as doing so.
|
|
|
|
|
- self.skipTest(f"Could not recreate conditions on {sys.platform}:"
|
|
|
|
|
- f" {err=}")
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.skipTest(f"Could not recreate conditions on {sys.platform}:"
|
|
|
|
|
+ f" {err=}")
|
|
|
|
|
+ finally:
|
|
|
|
|
+ # gh-108342: Explicitly break the reference cycle
|
|
|
|
|
+ err = None
|
|
|
|
|
+
|
|
|
|
|
# If maintaining this conditional winds up being a problem.
|
|
|
|
|
# just turn this into an unconditional skip anything but Linux.
|
|
|
|
|
# The important thing is that our CI has the logic covered.
|
|
|
|
|
@@ -4971,7 +4986,7 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
def call_after_accept(unused):
|
|
|
|
|
server_accept_called.set()
|
|
|
|
|
- if not ready_for_server_wrap_socket.wait(2.0):
|
|
|
|
|
+ if not ready_for_server_wrap_socket.wait(support.SHORT_TIMEOUT):
|
|
|
|
|
raise RuntimeError("wrap_socket event never set, test may fail.")
|
|
|
|
|
return False # Tell the server thread to continue.
|
|
|
|
|
|
|
|
|
|
@@ -4992,20 +5007,31 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
ready_for_server_wrap_socket.set()
|
|
|
|
|
server.join()
|
|
|
|
|
+
|
|
|
|
|
wrap_error = server.wrap_error
|
|
|
|
|
- self.assertEqual(b"", server.received_data)
|
|
|
|
|
- self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
- self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
- self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
- self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
- self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
- self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
- self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+ server.wrap_error = None
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.assertEqual(b"", server.received_data)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
+ self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
+ self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
+ self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+ finally:
|
|
|
|
|
+ # gh-108342: Explicitly break the reference cycle
|
|
|
|
|
+ wrap_error = None
|
|
|
|
|
+ server = None
|
|
|
|
|
|
|
|
|
|
def test_preauth_data_to_tls_client(self):
|
|
|
|
|
+ server_can_continue_with_wrap_socket = threading.Event()
|
|
|
|
|
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):
|
|
|
|
|
+ print("ERROR: test client took too long")
|
|
|
|
|
+
|
|
|
|
|
# This forces an immediate connection close via RST on .close().
|
|
|
|
|
set_socket_so_linger_on_with_zero_timeout(conn_to_client)
|
|
|
|
|
conn_to_client.send(
|
|
|
|
|
@@ -5025,8 +5051,10 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
with socket.socket() as client:
|
|
|
|
|
client.connect(server.listener.getsockname())
|
|
|
|
|
- if not client_can_continue_with_wrap_socket.wait(2.0):
|
|
|
|
|
- self.fail("test server took too long.")
|
|
|
|
|
+ server_can_continue_with_wrap_socket.set()
|
|
|
|
|
+
|
|
|
|
|
+ if not client_can_continue_with_wrap_socket.wait(support.SHORT_TIMEOUT):
|
|
|
|
|
+ self.fail("test server took too long")
|
|
|
|
|
ssl_ctx = ssl.create_default_context()
|
|
|
|
|
try:
|
|
|
|
|
tls_client = ssl_ctx.wrap_socket(
|
|
|
|
|
@@ -5040,24 +5068,31 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
tls_client.close()
|
|
|
|
|
|
|
|
|
|
server.join()
|
|
|
|
|
- self.assertEqual(b"", received_data)
|
|
|
|
|
- self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
- self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
- self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
- self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
- self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
- self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
- self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+ try:
|
|
|
|
|
+ self.assertEqual(b"", received_data)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, OSError) # All platforms.
|
|
|
|
|
+ self.non_linux_skip_if_other_okay_error(wrap_error)
|
|
|
|
|
+ self.assertIsInstance(wrap_error, ssl.SSLError)
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.args[1])
|
|
|
|
|
+ self.assertIn("before TLS handshake with data", wrap_error.reason)
|
|
|
|
|
+ self.assertNotEqual(0, wrap_error.args[0])
|
|
|
|
|
+ self.assertIsNone(wrap_error.library, msg="attr must exist")
|
|
|
|
|
+ finally:
|
|
|
|
|
+ # gh-108342: Explicitly break the reference cycle
|
|
|
|
|
+ wrap_error = None
|
|
|
|
|
+ server = None
|
|
|
|
|
|
|
|
|
|
def test_https_client_non_tls_response_ignored(self):
|
|
|
|
|
-
|
|
|
|
|
server_responding = threading.Event()
|
|
|
|
|
|
|
|
|
|
class SynchronizedHTTPSConnection(http.client.HTTPSConnection):
|
|
|
|
|
def connect(self):
|
|
|
|
|
+ # Call clear text HTTP connect(), not the encrypted HTTPS (TLS)
|
|
|
|
|
+ # connect(): wrap_socket() is called manually below.
|
|
|
|
|
http.client.HTTPConnection.connect(self)
|
|
|
|
|
+
|
|
|
|
|
# Wait for our fault injection server to have done its thing.
|
|
|
|
|
- if not server_responding.wait(1.0) and support.verbose:
|
|
|
|
|
+ if not server_responding.wait(support.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)
|
|
|
|
|
@@ -5072,28 +5107,33 @@ class TestPreHandshakeClose(unittest.TestCase):
|
|
|
|
|
server_responding.set()
|
|
|
|
|
return True # Tell the server to stop.
|
|
|
|
|
|
|
|
|
|
+ timeout = 2.0
|
|
|
|
|
server = self.SingleConnectionTestServerThread(
|
|
|
|
|
call_after_accept=call_after_accept,
|
|
|
|
|
- name="non_tls_http_RST_responder")
|
|
|
|
|
+ name="non_tls_http_RST_responder",
|
|
|
|
|
+ timeout=timeout)
|
|
|
|
|
self.enterContext(server) # starts it & unittest.TestCase stops it.
|
|
|
|
|
# Redundant; call_after_accept sets SO_LINGER on the accepted conn.
|
|
|
|
|
set_socket_so_linger_on_with_zero_timeout(server.listener)
|
|
|
|
|
|
|
|
|
|
connection = SynchronizedHTTPSConnection(
|
|
|
|
|
- f"localhost",
|
|
|
|
|
+ server.listener.getsockname()[0],
|
|
|
|
|
port=server.port,
|
|
|
|
|
context=ssl.create_default_context(),
|
|
|
|
|
- timeout=2.0,
|
|
|
|
|
+ timeout=timeout,
|
|
|
|
|
)
|
|
|
|
|
+
|
|
|
|
|
# There are lots of reasons this raises as desired, long before this
|
|
|
|
|
# test was added. Sending the request requires a successful TLS wrapped
|
|
|
|
|
# socket; that fails if the connection is broken. It may seem pointless
|
|
|
|
|
# to test this. It serves as an illustration of something that we never
|
|
|
|
|
# want to happen... properly not happening.
|
|
|
|
|
- with self.assertRaises(OSError) as err_ctx:
|
|
|
|
|
+ with self.assertRaises(OSError):
|
|
|
|
|
connection.request("HEAD", "/test", headers={"Host": "localhost"})
|
|
|
|
|
response = connection.getresponse()
|
|
|
|
|
|
|
|
|
|
+ server.join()
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
class TestEnumerations(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
|
MSVSphere Packaging Team
11 months ago