From e424e042ea777a8f89b3e2a63afb08bc71ab3c61 Mon Sep 17 00:00:00 2001
From: zhangpan <zp1224248514@163.com>
Date: Wed, 31 May 2023 02:30:42 +0000
Subject: [PATCH] fix CVE-2023-32681

(cherry picked from commit 47401a9154ba6b0d496d6e56af2ddbcf2f2622ce)
---
 backport-CVE-2023-32681.patch | 62 +++++++++++++++++++++++++++++++++++
 python-requests.spec          |  6 +++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 backport-CVE-2023-32681.patch

diff --git a/backport-CVE-2023-32681.patch b/backport-CVE-2023-32681.patch
new file mode 100644
index 0000000..c8799c2
--- /dev/null
+++ b/backport-CVE-2023-32681.patch
@@ -0,0 +1,62 @@
+From 74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5 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
+
+Reference:https://github.com/psf/requests/commit/74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5
+Conflict:Adaptation Context
+
+---
+ requests/sessions.py   |  4 +++-
+ tests/test_requests.py | 20 ++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/requests/sessions.py b/requests/sessions.py
+index ae4bcc8..fe0370d 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 c4abe39..40292ac 100644
+--- a/tests/test_requests.py
++++ b/tests/test_requests.py
+@@ -590,6 +590,26 @@ class TestRequests:
+                 session = requests.Session()
+                 session.request(method='GET', url=httpbin())
+ 
++
++    @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.33.0
+
diff --git a/python-requests.spec b/python-requests.spec
index 1cca78d..104c8ac 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -2,7 +2,7 @@
 
 Name:           python-requests
 Version:        2.26.0
-Release:        7
+Release:        8
 Summary:        Python HTTP Library
 License:        ASL 2.0
 URL:            http://python-requests.org/
@@ -13,6 +13,7 @@ Patch2:         requests-2.20.0-no-py2-httpbin.patch
 Patch3:         patch-requests-certs.py-to-use-the-system-CA-bundle.patch
 Patch4:         Remove-tests-that-use-the-tarpit.patch
 Patch5:         Update-dependency-with-chardet.patch
+Patch6000:      backport-CVE-2023-32681.patch
 
 BuildArch:      noarch
 
@@ -96,6 +97,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 %doc HISTORY.md README.md
 
 %changelog
+* Wed May 31 2023 zhangpan <zhangpan103@h-partners.com> - 2.26.0-8
+- fix CVE-2023-32681
+
 * Sat Nov 05 2022 yaoxin <yaoxin30@h-partners.com> - 2.26.0-7
 - Fix the mailman build error caused by the python-chardet update.
 
-- 
Gitee