SOURCES/CVE-2023-32681.patch

@@ -1,59 +0,0 @@
-From 88313c734876b90c266d183d07d26338a14bc54c Mon Sep 17 00:00:00 2001
-From: Nate Prewitt <nate.prewitt@gmail.com>
-Date: Mon, 22 May 2023 08:08:57 -0700
-Subject: [PATCH] Merge pull request from GHSA-j8r2-6x86-q33q
-
----
- requests/sessions.py   |  4 +++-
- tests/test_requests.py | 20 ++++++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/requests/sessions.py b/requests/sessions.py
-index 45ab8a5..db9c594 100644
---- a/requests/sessions.py
-+++ b/requests/sessions.py
-@@ -306,7 +306,9 @@ class SessionRedirectMixin(object):
-         except KeyError:
-             username, password = None, None
- 
--        if username and password:
-+        # urllib3 handles proxy authorization for us in the standard adapter.
-+        # Avoid appending this to TLS tunneled requests where it may be leaked.
-+        if not scheme.startswith('https') and username and password:
-             headers['Proxy-Authorization'] = _basic_auth_str(username, password)
- 
-         return new_proxies
-diff --git a/tests/test_requests.py b/tests/test_requests.py
-index 5e721cb..c70706f 100644
---- a/tests/test_requests.py
-+++ b/tests/test_requests.py
-@@ -551,6 +551,26 @@ class TestRequests:
-         with pytest.raises(InvalidProxyURL):
-             requests.get(httpbin(), proxies={'http': 'http:///example.com:8080'})
- 
-+
-+    @pytest.mark.parametrize(
-+        "url,has_proxy_auth",
-+        (
-+            ('http://example.com', True),
-+            ('https://example.com', False),
-+        ),
-+    )
-+    def test_proxy_authorization_not_appended_to_https_request(self, url, has_proxy_auth):
-+        session = requests.Session()
-+        proxies = {
-+            'http': 'http://test:pass@localhost:8080',
-+            'https': 'http://test:pass@localhost:8090',
-+        }
-+        req = requests.Request('GET', url)
-+        prep = req.prepare()
-+        session.rebuild_proxies(prep, proxies)
-+
-+        assert ('Proxy-Authorization' in prep.headers) is has_proxy_auth
-+
-     def test_basicauth_with_netrc(self, httpbin):
-         auth = ('user', 'pass')
-         wrong_auth = ('wronguser', 'wrongpass')
--- 
-2.40.1
-

SPECS/python-requests.spec

@@ -3,7 +3,7 @@
 
 Name:           python-requests
 Version:        2.20.0
-Release:        4%{?dist}
+Release:        3%{?dist}
 Summary:        HTTP library, written in Python, for human beings
 
 License:        ASL 2.0
@@ -37,12 +37,6 @@ Patch5:         Skip-all-tests-needing-httpbin.patch
 # Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1762422
 Patch6:         properly-handle-default-ports-in-auth-stripping.patch
 
-# Security fix for CVE-2023-32681
-# Unintended leak of Proxy-Authorization header
-# Resolved upstream: https://github.com/psf/requests/commit/74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5
-# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2209469
-Patch7:         CVE-2023-32681.patch
-
 BuildArch:      noarch
 
 %description
@@ -154,10 +148,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 
 
 %changelog
-* Wed Jun 21 2023 Lumír Balhar <lbalhar@redhat.com> - 2.20.0-4
-- Security fix for CVE-2023-32681
-Resolves: rhbz#2209469
-
 * Fri Nov 1 2019 Charalampos Stratakis <cstratak@redhat.com> - 2.20.0-3
 - Properly handle default ports when stripping the authorization header
 Resolves: rhbz#1762422