From 83b077e2e86ddb954cdca7f7b574f7e27f520f1b Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Mon, 18 Dec 2023 22:51:39 +0300
Subject: [PATCH] import python-requests-2.25.0-3.module+el8.9.0+19644+d68f775d

---
 SOURCES/CVE-2023-32681.patch | 59 ++++++++++++++++++++++++++++++++++++
 SPECS/python-requests.spec   | 12 +++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/CVE-2023-32681.patch

diff --git a/SOURCES/CVE-2023-32681.patch b/SOURCES/CVE-2023-32681.patch
new file mode 100644
index 0000000..4d3d51f
--- /dev/null
+++ b/SOURCES/CVE-2023-32681.patch
@@ -0,0 +1,59 @@
+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
+
diff --git a/SPECS/python-requests.spec b/SPECS/python-requests.spec
index 55f1ba0..affe55d 100644
--- a/SPECS/python-requests.spec
+++ b/SPECS/python-requests.spec
@@ -3,7 +3,7 @@
 
 Name:           python-requests
 Version:        2.25.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTTP library, written in Python, for human beings
 
 License:        ASL 2.0
@@ -23,6 +23,12 @@ Patch2:         Remove-tests-that-use-the-tarpit.patch
 # a pretty odd one so this is a niche requirement.
 Patch3:         requests-2.12.4-tests_nonet.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
+Patch4:         CVE-2023-32681.patch
+
 BuildArch:      noarch
 # Exclude i686 arch. Due to a modularity issue it's being added to the
 # x86_64 compose of CRB, but we don't want to ship it at all.
@@ -103,6 +109,10 @@ sed -i 's/ --doctest-modules//' pytest.ini
 
 
 %changelog
+* Wed Jun 21 2023 Lumír Balhar <lbalhar@redhat.com> - 2.25.0-3
+- Security fix for CVE-2023-32681
+Resolves: rhbz#2209469
+
 * Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 2.25.0-2
 - Convert from Fedora to the python39 module in RHEL8
 - Resolves: rhbz#1877430