- Add upstream patch openssl-3.2.patch, to fix tests with opennssl

3.2.0, gh#urllib3/urllib3#3271

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=176
This commit is contained in:
Daniel Garcia 2024-01-11 11:49:26 +00:00 committed by Git OBS Bridge
parent e748795144
commit 95eb7884e4
3 changed files with 41 additions and 1 deletions

32
openssl-3.2.patch Normal file
View File

@ -0,0 +1,32 @@
Index: urllib3-2.1.0/changelog/3268.bugfix.rst
===================================================================
--- /dev/null
+++ urllib3-2.1.0/changelog/3268.bugfix.rst
@@ -0,0 +1 @@
+Fixed handling of OpenSSL 3.2.0 new error message for misconfiguring an HTTP proxy as HTTPS.
Index: urllib3-2.1.0/src/urllib3/connection.py
===================================================================
--- urllib3-2.1.0.orig/src/urllib3/connection.py
+++ urllib3-2.1.0/src/urllib3/connection.py
@@ -864,6 +864,7 @@ def _wrap_proxy_error(err: Exception, pr
is_likely_http_proxy = (
"wrong version number" in error_normalized
or "unknown protocol" in error_normalized
+ or "record layer failure" in error_normalized
)
http_proxy_warning = (
". Your proxy appears to only use HTTP and not HTTPS, "
Index: urllib3-2.1.0/test/with_dummyserver/test_socketlevel.py
===================================================================
--- urllib3-2.1.0.orig/test/with_dummyserver/test_socketlevel.py
+++ urllib3-2.1.0/test/with_dummyserver/test_socketlevel.py
@@ -1297,7 +1297,8 @@ class TestSSL(SocketDummyServerTestCase)
self._start_server(socket_handler)
with HTTPSConnectionPool(self.host, self.port, ca_certs=DEFAULT_CA) as pool:
with pytest.raises(
- SSLError, match=r"(wrong version number|record overflow)"
+ SSLError,
+ match=r"(wrong version number|record overflow|record layer failure)",
):
pool.request("GET", "/", retries=False)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 11 11:46:04 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
- Add upstream patch openssl-3.2.patch, to fix tests with opennssl
3.2.0, gh#urllib3/urllib3#3271
-------------------------------------------------------------------
Mon Nov 27 20:29:27 UTC 2023 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,8 @@ Summary: HTTP library with thread-safe connection pooling, file post, and
License: MIT
URL: https://urllib3.readthedocs.org/
Source: https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz
# PATCH-FIX-OPENSUSE openssl-3.2.patch gh#urllib3/urllib3#3271
Patch1: openssl-3.2.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module hatchling}
BuildRequires: %{python_module pip}