.gitignore

@@ -1 +1 @@
-SOURCES/urllib3-1.25.10.tar.gz
+SOURCES/urllib3-1.24.2.tar.gz

.python-urllib3.metadata

@@ -0,0 +1 @@
+02f5f10287e42a0e9d8666bbec9c51c4aec5bfc7 SOURCES/urllib3-1.24.2.tar.gz

SOURCES/CVE-2019-11236.patch

@@ -0,0 +1,162 @@
+From 9f6aa6b5f06ecfcfea2084d88f377c6e9dba5ce2 Mon Sep 17 00:00:00 2001
+From: Ryan Petrello <rpetrell@redhat.com>
+Date: Tue, 30 Apr 2019 12:36:48 -0400
+Subject: [PATCH 1/3] prevent CVE-2019-9740 in 1.24.x
+
+adapted from https://github.com/python/cpython/pull/12755
+---
+ test/test_util.py   | 5 +++++
+ src/urllib3/util/url.py | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/test/test_util.py b/test/test_util.py
+index 73d9452..dc6ffd0 100644
+--- a/test/test_util.py
++++ b/test/test_util.py
+@@ -200,6 +200,11 @@ class TestUtil(object):
+         with pytest.raises(ValueError):
+             parse_url('[::1')
+ 
++    def test_parse_url_contains_control_characters(self):
++        # see CVE-2019-9740
++        with pytest.raises(LocationParseError):
++            parse_url('http://localhost:8000/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:')
++
+     def test_Url_str(self):
+         U = Url('http', host='google.com')
+         assert str(U) == U.url
+diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
+index 6b6f996..e8e1bd7 100644
+--- a/src/urllib3/util/url.py
++++ b/src/urllib3/util/url.py
+@@ -1,5 +1,6 @@
+ from __future__ import absolute_import
+ from collections import namedtuple
++import re
+ 
+ from ..exceptions import LocationParseError
+ 
+@@ -10,6 +11,8 @@ url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
+ # urllib3 infers URLs without a scheme (None) to be http.
+ NORMALIZABLE_SCHEMES = ('http', 'https', None)
+ 
++_contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f]')
++
+ 
+ class Url(namedtuple('Url', url_attrs)):
+     """
+@@ -155,6 +158,11 @@ def parse_url(url):
+         # Empty
+         return Url()
+ 
++    # Prevent CVE-2019-9740.
++    # adapted from https://github.com/python/cpython/pull/12755
++    if _contains_disallowed_url_pchar_re.search(url):
++        raise LocationParseError("URL can't contain control characters. {!r}".format(url))
++
+     scheme = None
+     auth = None
+     host = None
+-- 
+2.20.1
+
+
+From ecc15bd412354ad916712113b0e426f8bc6cf52d Mon Sep 17 00:00:00 2001
+From: Ryan Petrello <lists@ryanpetrello.com>
+Date: Wed, 1 May 2019 16:46:44 -0400
+Subject: [PATCH 2/3] avoid CVE-2019-9740 by percent-encoding invalid path
+ characters
+
+this is to avoid breaking changes in downstream libraries like requests
+---
+ test/test_util.py   | 4 ++--
+ src/urllib3/util/url.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_util.py b/test/test_util.py
+index dc6ffd0..d139329 100644
+--- a/test/test_util.py
++++ b/test/test_util.py
+@@ -202,8 +202,8 @@ class TestUtil(object):
+ 
+     def test_parse_url_contains_control_characters(self):
+         # see CVE-2019-9740
+-        with pytest.raises(LocationParseError):
+-            parse_url('http://localhost:8000/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:')
++        url = parse_url('http://localhost:8000/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:')
++        assert url.path == '/%20HTTP/1.1%0D%0AHEADER:%20INJECTED%0D%0AIgnore:'
+ 
+     def test_Url_str(self):
+         U = Url('http', host='google.com')
+diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
+index e8e1bd7..12b8d55 100644
+--- a/src/urllib3/util/url.py
++++ b/src/urllib3/util/url.py
+@@ -3,6 +3,7 @@ from collections import namedtuple
+ import re
+ 
+ from ..exceptions import LocationParseError
++from ..packages.six.moves.urllib.parse import quote
+ 
+ 
+ url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
+@@ -160,8 +161,7 @@ def parse_url(url):
+ 
+     # Prevent CVE-2019-9740.
+     # adapted from https://github.com/python/cpython/pull/12755
+-    if _contains_disallowed_url_pchar_re.search(url):
+-        raise LocationParseError("URL can't contain control characters. {!r}".format(url))
++    url = _contains_disallowed_url_pchar_re.sub(lambda match: quote(match.group()), url)
+ 
+     scheme = None
+     auth = None
+-- 
+2.20.1
+
+
+From 6cda449df587fd37135ee76a9253dc8e12e53c05 Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <sethmichaellarson@gmail.com>
+Date: Thu, 2 May 2019 09:02:24 -0500
+Subject: [PATCH 3/3] Also test unicode and query
+
+---
+ test/test_util.py | 22 +++++++++++++++++++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_util.py b/test/test_util.py
+index d139329..fa53aaf 100644
+--- a/test/test_util.py
++++ b/test/test_util.py
+@@ -200,10 +200,26 @@ class TestUtil(object):
+         with pytest.raises(ValueError):
+             parse_url('[::1')
+ 
+-    def test_parse_url_contains_control_characters(self):
++    @pytest.mark.parametrize('url, expected_url', [
++        (
++            'http://localhost/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:',
++            Url('http', host='localhost', port=None,
++                path='/%20HTTP/1.1%0D%0AHEADER:%20INJECTED%0D%0AIgnore:')
++        ),
++        (
++            u'http://localhost/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:',
++            Url('http', host='localhost', port=None,
++                path='/%20HTTP/1.1%0D%0AHEADER:%20INJECTED%0D%0AIgnore:')
++        ),
++        (
++            'http://localhost/ ?q=\r\n',
++            Url('http', host='localhost', path='/%20', query='q=%0D%0A')
++        ),
++    ])
++    def test_parse_url_contains_control_characters(self, url, expected_url):
+         # see CVE-2019-9740
+-        url = parse_url('http://localhost:8000/ HTTP/1.1\r\nHEADER: INJECTED\r\nIgnore:')
+-        assert url.path == '/%20HTTP/1.1%0D%0AHEADER:%20INJECTED%0D%0AIgnore:'
++        url = parse_url(url)
++        assert url == expected_url
+ 
+     def test_Url_str(self):
+         U = Url('http', host='google.com')
+-- 
+2.20.1
+

SOURCES/CVE-2020-26137.patch

@@ -0,0 +1,37 @@
+diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
+index 02b3665..1ab1890 100644
+--- a/src/urllib3/connection.py
++++ b/src/urllib3/connection.py
+@@ -1,4 +1,5 @@
+ from __future__ import absolute_import
++import re
+ import datetime
+ import logging
+ import os
+@@ -61,6 +62,8 @@ port_by_scheme = {
+ # after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)
+ RECENT_DATE = datetime.date(2017, 6, 30)
+ 
++_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
++
+ 
+ class DummyConnection(object):
+     """Used to detect a failed ConnectionCls import."""
+@@ -181,6 +184,17 @@ class HTTPConnection(_HTTPConnection, object):
+         conn = self._new_conn()
+         self._prepare_conn(conn)
+ 
++    def putrequest(self, method, url, *args, **kwargs):
++        """Send a request to the server"""
++        match = _CONTAINS_CONTROL_CHAR_RE.search(method)
++        if match:
++            raise ValueError(
++                "Method cannot contain non-token characters %r (found at least %r)"
++                % (method, match.group())
++            )
++
++        return _HTTPConnection.putrequest(self, method, url, *args, **kwargs)
++
+     def request_chunked(self, method, url, body=None, headers=None):
+         """
+         Alternative to the common request method, which sends the

SOURCES/CVE-2021-33503.patch

@@ -1,61 +0,0 @@
-From 2d4a3fee6de2fa45eb82169361918f759269b4ec Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Wed, 26 May 2021 10:43:12 -0500
-Subject: [PATCH] Improve performance of sub-authority splitting in URL
-
----
- src/urllib3/util/url.py |  8 +++++---
- test/test_util.py       | 10 ++++++++++
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/src/urllib3/util/url.py b/src/urllib3/util/url.py
-index 6ff238fe3c..81a03da9e3 100644
---- a/src/urllib3/util/url.py
-+++ b/src/urllib3/util/url.py
-@@ -63,12 +63,12 @@
- BRACELESS_IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT[2:-2] + "$")
- ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$")
- 
--SUBAUTHORITY_PAT = (u"^(?:(.*)@)?(%s|%s|%s)(?::([0-9]{0,5}))?$") % (
-+_HOST_PORT_PAT = ("^(%s|%s|%s)(?::([0-9]{0,5}))?$") % (
-     REG_NAME_PAT,
-     IPV4_PAT,
-     IPV6_ADDRZ_PAT,
- )
--SUBAUTHORITY_RE = re.compile(SUBAUTHORITY_PAT, re.UNICODE | re.DOTALL)
-+_HOST_PORT_RE = re.compile(_HOST_PORT_PAT, re.UNICODE | re.DOTALL)
- 
- UNRESERVED_CHARS = set(
-     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-~"
-@@ -365,7 +365,9 @@ def parse_url(url):
-             scheme = scheme.lower()
- 
-         if authority:
--            auth, host, port = SUBAUTHORITY_RE.match(authority).groups()
-+            auth, _, host_port = authority.rpartition("@")
-+            auth = auth or None
-+            host, port = _HOST_PORT_RE.match(host_port).groups()
-             if auth and normalize_uri:
-                 auth = _encode_invalid_chars(auth, USERINFO_CHARS)
-             if port == "":
-diff --git a/test/test_util.py b/test/test_util.py
-index a5b68a084b..88409e2d6c 100644
---- a/test/test_util.py
-+++ b/test/test_util.py
-@@ -438,6 +438,16 @@ def test_netloc(self, url, expected_netloc):
-                 fragment="hash",
-             ),
-         ),
-+        # Tons of '@' causing backtracking
-+        ("https://" + ("@" * 10000) + "[", False),
-+        (
-+            "https://user:" + ("@" * 10000) + "example.com",
-+            Url(
-+                scheme="https",
-+                auth="user:" + ("%40" * 9999),
-+                host="example.com",
-+            ),
-+        ),
-     ]
- 
-     @pytest.mark.parametrize("url, expected_url", url_vulnerabilities)

SOURCES/CVE-2023-43804.patch

@@ -1,6 +1,6 @@
-From 4405b8f6ef86daadfe2f4070f9e239d41fbe25df Mon Sep 17 00:00:00 2001
+From 24603488c43a7cbaffcff7e69a72ad9bb4604acf Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
-Date: Fri, 13 Oct 2023 11:11:24 +0200
+Date: Thu, 12 Oct 2023 14:08:31 +0200
 Subject: [PATCH] CVE-2023-43804
 
 ---
@@ -9,31 +9,31 @@ Subject: [PATCH] CVE-2023-43804
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py
-index ee30c91..20b7f69 100644
+index 02429ee..c4a687c 100644
 --- a/src/urllib3/util/retry.py
 +++ b/src/urllib3/util/retry.py
-@@ -154,7 +154,7 @@ class Retry(object):
+@@ -151,7 +151,7 @@ class Retry(object):
  
      RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
  
--    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(["Authorization"])
+-    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Authorization'])
-+    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(["Cookie", "Authorization"])
++    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Cookie', 'Authorization'])
  
      #: Maximum backoff time.
      BACKOFF_MAX = 120
 diff --git a/test/test_retry.py b/test/test_retry.py
-index c36476f..110688d 100644
+index 7546c43..b6d52bf 100644
 --- a/test/test_retry.py
 +++ b/test/test_retry.py
-@@ -270,7 +270,7 @@ class TestRetry(object):
+@@ -253,7 +253,7 @@ class TestRetry(object):
      def test_retry_default_remove_headers_on_redirect(self):
          retry = Retry()
  
--        assert list(retry.remove_headers_on_redirect) == ["authorization"]
+-        assert list(retry.remove_headers_on_redirect) == ['authorization']
-+        assert retry.remove_headers_on_redirect == {"authorization", "cookie"}
++        assert retry.remove_headers_on_redirect == {'authorization', 'cookie'}
  
      def test_retry_set_remove_headers_on_redirect(self):
-         retry = Retry(remove_headers_on_redirect=["X-API-Secret"])
+         retry = Retry(remove_headers_on_redirect=['x-api-secret'])
 -- 
 2.41.0
 

SOURCES/CVE-2023-45803.patch

@@ -0,0 +1,94 @@
+From 6f6011442b255b6c135c294500cf4d404f594d8a Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Tue, 12 Dec 2023 10:21:34 +0100
+Subject: [PATCH] Security fix for CVE-2023-45803
+
+---
+ src/urllib3/_collections.py   | 18 ++++++++++++++++++
+ src/urllib3/connectionpool.py |  5 +++++
+ src/urllib3/poolmanager.py    |  7 +++++--
+ 3 files changed, 28 insertions(+), 2 deletions(-)
+
+diff --git a/src/urllib3/_collections.py b/src/urllib3/_collections.py
+index 34f2381..86fc900 100644
+--- a/src/urllib3/_collections.py
++++ b/src/urllib3/_collections.py
+@@ -260,6 +260,24 @@ class HTTPHeaderDict(MutableMapping):
+         else:
+             return vals[1:]
+ 
++    def _prepare_for_method_change(self):
++        """
++        Remove content-specific header fields before changing the request
++        method to GET or HEAD according to RFC 9110, Section 15.4.
++        """
++        content_specific_headers = [
++            "Content-Encoding",
++            "Content-Language",
++            "Content-Location",
++            "Content-Type",
++            "Content-Length",
++            "Digest",
++            "Last-Modified",
++        ]
++        for header in content_specific_headers:
++            self.discard(header)
++        return self
++
+     # Backwards compatibility for httplib
+     getheaders = getlist
+     getallmatchingheaders = getlist
+diff --git a/src/urllib3/connectionpool.py b/src/urllib3/connectionpool.py
+index f7a8f19..ad6303c 100644
+--- a/src/urllib3/connectionpool.py
++++ b/src/urllib3/connectionpool.py
+@@ -32,6 +32,7 @@ from .connection import (
+     HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
+     HTTPException, BaseSSLError,
+ )
++from ._collections import HTTPHeaderDict
+ from .request import RequestMethods
+ from .response import HTTPResponse
+ 
+@@ -679,7 +680,11 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
+         redirect_location = redirect and response.get_redirect_location()
+         if redirect_location:
+             if response.status == 303:
++                # Change the method according to RFC 9110, Section 15.4.4.
+                 method = 'GET'
++                # And lose the body not to transfer anything sensitive.
++                body = None
++                headers = HTTPHeaderDict(headers)._prepare_for_method_change()
+ 
+             try:
+                 retries = retries.increment(method, url, response=response, _pool=self)
+diff --git a/src/urllib3/poolmanager.py b/src/urllib3/poolmanager.py
+index 32bd973..37557f9 100644
+--- a/src/urllib3/poolmanager.py
++++ b/src/urllib3/poolmanager.py
+@@ -3,7 +3,7 @@ import collections
+ import functools
+ import logging
+ 
+-from ._collections import RecentlyUsedContainer
++from ._collections import HTTPHeaderDict, RecentlyUsedContainer
+ from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
+ from .connectionpool import port_by_scheme
+ from .exceptions import LocationValueError, MaxRetryError, ProxySchemeUnknown
+@@ -330,9 +330,12 @@ class PoolManager(RequestMethods):
+         # Support relative URLs for redirecting.
+         redirect_location = urljoin(url, redirect_location)
+ 
+-        # RFC 7231, Section 6.4.4
+         if response.status == 303:
++            # Change the method according to RFC 9110, Section 15.4.4.
+             method = 'GET'
++            # And lose the body not to transfer anything sensitive.
++            kw["body"] = None
++            kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
+ 
+         retries = kw.get('retries')
+         if not isinstance(retries, Retry):
+-- 
+2.43.0
+

SOURCES/CVE-2024-37891.patch

@@ -0,0 +1,39 @@
+From 584378407efb03cef247320b541388f460cb72a2 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Mon, 1 Jul 2024 12:40:39 +0200
+Subject: [PATCH] CVE-2024-37891
+
+---
+ src/urllib3/util/retry.py | 2 +-
+ test/test_retry.py        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py
+index c4a687c..8b86956 100644
+--- a/src/urllib3/util/retry.py
++++ b/src/urllib3/util/retry.py
+@@ -151,7 +151,7 @@ class Retry(object):
+ 
+     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
+ 
+-    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Cookie', 'Authorization'])
++    DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Cookie', 'Authorization', 'Proxy-Authorization'])
+ 
+     #: Maximum backoff time.
+     BACKOFF_MAX = 120
+diff --git a/test/test_retry.py b/test/test_retry.py
+index c6bba74..a525028 100644
+--- a/test/test_retry.py
++++ b/test/test_retry.py
+@@ -253,7 +253,7 @@ class TestRetry(object):
+     def test_retry_default_remove_headers_on_redirect(self):
+         retry = Retry()
+ 
+-        assert retry.remove_headers_on_redirect == {'authorization', 'cookie'}
++        assert retry.remove_headers_on_redirect == {'authorization', 'proxy-authorization', 'cookie'}
+ 
+     def test_retry_set_remove_headers_on_redirect(self):
+         retry = Retry(remove_headers_on_redirect=['x-api-secret'])
+-- 
+2.45.2
+

SOURCES/Enable_TLS_1.3_post-handshake_authentication.patch

@@ -0,0 +1,56 @@
+From c9ed53c284a6747f17366eab71ba8922e33910e2 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Wed, 28 Aug 2019 14:55:26 +0200
+Subject: [PATCH] Backported patch from:
+ https://github.com/urllib3/urllib3/commit/6a626be4ff623c25270e20db9002705bf4504e4e
+
+Enable TLS 1.3 post-handshake authentication
+---
+ src/urllib3/util/ssl_.py |  7 +++++++
+ test/test_ssl.py         | 15 +++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/src/urllib3/util/ssl_.py b/src/urllib3/util/ssl_.py
+index 5ae4358..7dc4a5a 100644
+--- a/src/urllib3/util/ssl_.py
++++ b/src/urllib3/util/ssl_.py
+@@ -280,6 +280,13 @@ def create_urllib3_context(ssl_version=None, cert_reqs=None,
+ 
+     context.options |= options
+ 
++    # Enable post-handshake authentication for TLS 1.3, see GH #1634. PHA is
++    # necessary for conditional client cert authentication with TLS 1.3.
++    # The attribute is None for OpenSSL <= 1.1.0 or does not exist in older
++    # versions of Python.
++    if getattr(context, "post_handshake_auth", None) is not None:
++        context.post_handshake_auth = True
++
+     context.verify_mode = cert_reqs
+     if getattr(context, 'check_hostname', None) is not None:  # Platform-specific: Python 3.2
+         # We do our own verification, including fingerprints and alternative
+diff --git a/test/test_ssl.py b/test/test_ssl.py
+index 6a46b4f..3a99522 100644
+--- a/test/test_ssl.py
++++ b/test/test_ssl.py
+@@ -125,3 +125,18 @@ def test_wrap_socket_default_loads_default_certs(monkeypatch):
+     ssl_.ssl_wrap_socket(sock)
+ 
+     context.load_default_certs.assert_called_with()
++
++
++@pytest.mark.parametrize(
++    ["pha", "expected_pha"], [(None, None), (False, True), (True, True)]
++)
++def test_create_urllib3_context_pha(monkeypatch, pha, expected_pha):
++    context = mock.create_autospec(ssl_.SSLContext)
++    context.set_ciphers = mock.Mock()
++    context.options = 0
++    context.post_handshake_auth = pha
++    monkeypatch.setattr(ssl_, "SSLContext", lambda *_, **__: context)
++
++    assert ssl_.create_urllib3_context() is context
++
++    assert context.post_handshake_auth == expected_pha
+-- 
+2.21.0
+

SPECS/python-urllib3.spec

@@ -1,23 +1,36 @@
 %global srcname urllib3
 
-# When bootstrapping Python, we cannot test this yet
-# RHEL8: Tests disabled during build due to missing dependencies
-%bcond_with tests
-
 Name:           python-%{srcname}
-Version:        1.25.10
+Version:        1.24.2
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT
-URL:            https://github.com/urllib3/urllib3
+URL:            https://github.com/shazow/urllib3
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-# Unbundle ssl_match_hostname since we depend on it
+# Used with Python 3.5+
 Source1:        ssl_match_hostname_py3.py
-# CVE-2021-33503 Catastrophic backtracking in URL authority parser
+BuildArch:      noarch
-# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=1968074
+
-# Upstream fix: https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec
+# CVE-2019-11236 python-urllib3:
-Patch0:         CVE-2021-33503.patch
+#   - CRLF injection due to not encoding the '\r\n' sequence leading to
+#     possible attack on internal service.
+#   - Also known as CVE-2019-9740 (duplicate entry)
+# Backported from:
+#  * https://github.com/urllib3/urllib3/pull/1591
+#    - Superfluous commits were omitted (flake8 checks, travis settings, macos patch)
+#  * https://github.com/urllib3/urllib3/pull/1593
+Patch1:         CVE-2019-11236.patch
+
+# Enable post-handshake authentication for TLS 1.3
+# - https://github.com/urllib3/urllib3/issues/1634
+# - https://bugzilla.redhat.com/show_bug.cgi?id=1726743
+Patch2:         Enable_TLS_1.3_post-handshake_authentication.patch
+
+# CVE-2020-26137
+# CRLF injection via HTTP request method
+# Resolved upstream: https://github.com/urllib3/urllib3/pull/1800
+Patch3: CVE-2020-26137.patch
 
 # CVE-2023-43804
 # Added the `Cookie` header to the list of headers to strip from
@@ -27,45 +40,54 @@ Patch0:         CVE-2021-33503.patch
 # testing with dummyserver.
 # Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=2242493
 # Upstream fix: https://github.com/urllib3/urllib3/commit/01220354d389cd05474713f8c982d05c9b17aafb
-Patch1: CVE-2023-43804.patch
+Patch4: CVE-2023-43804.patch
 
-BuildArch:      noarch
+# CVE-2023-45803
-# Exclude i686 arch. Due to a modularity issue it's being added to the
+# Remove HTTP request body when request method is changed.
-# x86_64 compose of CRB, but we don't want to ship it at all.
+# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2023-45803
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
+# Upstream fix: https://github.com/urllib3/urllib3/commit/4e98d57809dacab1cbe625fddeec1a290c478ea9
-ExcludeArch:    i686
+Patch5: CVE-2023-45803.patch
+
+# CVE-2024-37891
+# Added the `Proxy-Authorization` header to the list of headers to strip from requests
+# when redirecting to a different host.
+# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2024-37891
+# Upstream fix: https://github.com/urllib3/urllib3/commit/40b6d1605814dd1db0a46e202d6e56f2e4c9a468
+Patch6: CVE-2024-37891.patch
 
 %description
 Python HTTP module with connection pooling and file POST abilities.
 
-%package -n python%{python3_pkgversion}-%{srcname}
+
+%package -n python3-%{srcname}
 Summary:        Python3 HTTP library with thread-safe connection pooling and file post
 
-BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python3-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
+# For unittests
-BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python3-nose
-%if %{with tests}
+BuildRequires:  python3-mock
-BuildRequires:  python%{python3_pkgversion}-nose
+BuildRequires:  python3-six
-BuildRequires:  python%{python3_pkgversion}-mock
+BuildRequires:  python3-pysocks
-BuildRequires:  python%{python3_pkgversion}-six
+BuildRequires:  python3-pytest
-BuildRequires:  python%{python3_pkgversion}-pysocks
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-tornado
-BuildRequires:  python%{python3_pkgversion}-trustme
-BuildRequires:  python%{python3_pkgversion}-idna
-%endif
 
 Requires:       ca-certificates
-Requires:       python%{python3_pkgversion}-idna
+Requires:       python3-six
-Requires:       python%{python3_pkgversion}-six
+Requires:       python3-pysocks
-Requires:       python%{python3_pkgversion}-pysocks
 
-%description -n python%{python3_pkgversion}-%{srcname}
+%description -n python3-%{srcname}
 Python3 HTTP module with connection pooling and file POST abilities.
 
 
 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{version}
+
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
 # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is.
 # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date
 # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either,
@@ -81,19 +103,23 @@ Python3 HTTP module with connection pooling and file POST abilities.
 # result in false positive), but before at least 6 month ago (so this test could tolerate user's system time being
 # set to some time in the past, but not to far away from the present).
 # Next few lines update RECENT_DATE dynamically.
+
 recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d")
 sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py
 
-# Drop the dummyserver tests in koji.  They fail there in real builds, but not
+
-# in scratch builds (weird).
+# Drop the dummyserver tests in koji.
+# These require tornado, a Web framework otherwise unused in the distro.
 rm -rf test/with_dummyserver/
+rm -rf test/test_connectionpool.py
+rm -rf dummyserver/
 # Don't run the Google App Engine tests
 rm -rf test/appengine/
 # Lots of these tests started failing, even for old versions, so it has something
 # to do with Fedora in particular. They don't fail in upstream build infrastructure
 rm -rf test/contrib/
 
-# Tests for Python built without SSL, but Fedora builds with SSL. These tests
+# Tests for Python built without SSL, but RHEL builds with SSL. These tests
 # fail when combined with the unbundling of backports-ssl_match_hostname
 rm -f test/test_no_ssl.py
 
@@ -110,114 +136,84 @@ rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six*
 rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/
 
 mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/
-cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py
+ln -s %{python3_sitelib}/six.py \
-ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
+      %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
 ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \
       %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
 ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
       %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
+# urllib3 requires Python 3.5 to use the standard library's match_hostname,
+# which we ship in RHEL8, so we can safely replace the bundled version with
+# this stub which imports the necessary objects.
+cp %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py
 
 
-%if %{with tests}
 %check
 pushd test
 PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pytest -v
 popd
-%endif
 
 
-%files -n python%{python3_pkgversion}-%{srcname}
+%files -n python3-%{srcname}
 %license LICENSE.txt
 %doc CHANGES.rst README.rst CONTRIBUTORS.txt
 %{python3_sitelib}/urllib3/
-%{python3_sitelib}/urllib3-*.egg-info/
+%{python3_sitelib}/urllib3-*.egg-info
 
 
 %changelog
-* Thu Oct 12 2023 Lumír Balhar <lbalhar@redhat.com> - 1.25.10-5
+* Mon Jul 01 2024 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-8
+- Security fix for CVE-2024-37891
+Resolves: RHEL-45334
+
+* Tue Dec 12 2023 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-7
+- Security fix for CVE-2023-45803
+Resolves: RHEL-16872
+
+* Thu Oct 12 2023 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-6
 - Security fix for CVE-2023-43804
-Resolves: RHEL-11997
+Resolves: RHEL-11992
 
-* Tue Jun 29 2021 Lumír Balhar <lbalhar@redhat.com> - 1.25.10-4
+* Mon Nov 09 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.24.2-5
-- Fix for CVE-2021-33503 Catastrophic backtracking in URL authority parser
+- Security fix for CVE-2020-26137
-Resolves: rhbz#1968074
+Resolves: rhbz#1883889
 
-* Wed Jan 13 2021 Tomas Orsava <torsava@redhat.com> - 1.25.10-3
+* Wed Oct 30 2019 Anna Khaitovich <akhaitov@redhat.com> - 1.24.2-4
-- Convert from Fedora to the python39 module in RHEL8
-- Resolves: rhbz#1877430
-
-* Tue Jan 05 2021 Anna Khaitovich <akhaitov@redhat.com> - 1.25.10-2
 - Update RECENT_DATE dynamically
+Resolves: rhbz#1761380
 
-* Sun Sep 27 2020 Kevin Fenzi <kevin@scrye.com> - 1.25.10-1
+* Wed Aug 28 2019 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-3
-- Update to 1.25.10. Fixed bug #1824900
+- Enable TLS 1.3 post-handshake authentication
+- Adjust RECENT_DATE variable according to rules
+Resolves: rhbz#1726743
 
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.8-4
+* Wed May 22 2019 Tomas Orsava <torsava@redhat.com> - 1.24.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Rebuilding after gating was enabled
+- Resolves: rhbz#1703361 rhbz#1706026
 
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.25.8-3
+* Fri May 03 2019 Tomas Orsava <torsava@redhat.com> - 1.24.2-1
-- Rebuilt for Python 3.9
+- Rebased to 1.24.2 to fix CVE-2019-11324
+- Added patches for CVE-2019-11236 (AKA CVE-2019-9740)
+- Resolves: rhbz#1703361 rhbz#1706026
 
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.25.8-2
+* Wed Jul 11 2018 Petr Viktorin <pviktori@redhat.com> - 1.23-5
-- Bootstrap for Python 3.9
+- Remove the Python 2 subpackage
+  https://bugzilla.redhat.com/show_bug.cgi?id=1590400
 
-* Sun Mar 22 2020 Carl George <carl@george.computer> - 1.25.8-1
+* Mon Jun 25 2018 Lumír Balhar <lbalhar@redhat.com> - 1.23-4
-- Latest upstream rhbz#1771186
+- Allow build with Python 2
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.7-3
+* Wed Jun 20 2018 Petr Viktorin <pviktori@redhat.com> - 1.23-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- Skip tests that require tornado
 
-* Mon Nov 18 2019 Miro Hrončok <mhroncok@redhat.com> - 1.25.7-2
+* Wed Jun 20 2018 Lumír Balhar <lbalhar@redhat.com> - 1.23-2
-- Subpackage python2-urllib3 has been removed
+- Remove unneeded python3-psutil dependency
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Tue Oct 15 2019 Jeremy Cline <jcline@redhat.com> - 1.25.6-1
-- Update to v1.25.6
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.25.3-7
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 1.25.3-6
-- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.25.3-5
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 08 2019 Miro Hrončok <mhroncok@redhat.com> - 1.25.3-3
-- Set RECENT_DATE not to be older than 2 years (#1727796)
-
-* Tue May 28 2019 Jeremy Cline <jcline@redhat.com> - 1.25.3-2
-- Drop the Python 2 tests since Tornado is going away
-
-* Tue May 28 2019 Jeremy Cline <jcline@redhat.com> - 1.25.3-1
-- Update to 1.25.3
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Nov 13 2018 Jeremy Cline <jeremy@jcline.org> - 1.24.1-2
-- Adjust unbundling of ssl_match_hostname
-
-* Mon Oct 29 2018 Jeremy Cline <jeremy@jcline.org> - 1.24.1-1
-- Update to v1.24.1
-
-* Wed Jun 20 2018 Lumír Balhar <lbalhar@redhat.com> - 1.23-4
-- Removed unneeded dependency python[23]-psutil
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1.23-3
-- Rebuilt for Python 3.7
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1.23-2
-- Bootstrap for Python 3.7
 
 * Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> - 1.23-1
 - Update to the latest upstream release (rhbz 1586072)
 
-* Wed May 30 2018 Jeremy Cline <jeremy@jcline.org> - 1.22-10
+* Tue May 22 2018 Petr Viktorin <pviktori@redhat.com> - 1.22-10
-- Backport patch to support Python 3.7 (rhbz 1584112)
+- Skip tests for python2 subpackage, due to missing dependencies (rhbz 1580882)
 
 * Thu May 03 2018 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.22-9
 - Do not lowercase hostnames with custom-protocol (rhbz 1567862)