diff --git a/backport-CVE-2023-32681.patch b/backport-CVE-2023-32681.patch new file mode 100644 index 0000000000000000000000000000000000000000..2cd7cc75cf9f88055d5496a4521b22e022ac54aa --- /dev/null +++ b/backport-CVE-2023-32681.patch @@ -0,0 +1,62 @@ +From 74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5 Mon Sep 17 00:00:00 2001 +From: Nate Prewitt +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 deletion(-) + +diff --git a/requests/sessions.py b/requests/sessions.py +index e8e2d60..6e73925 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 33880b8..4bf5321 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.33.0 + diff --git a/python-requests.spec b/python-requests.spec index cb9a7ed91ec3a346dfaecb5a7a048edb613affbc..40ac6a7c4f55b8c498d5ec2d093ddb7b11ea039e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -2,7 +2,7 @@ Name: python-requests Version: 2.24.0 -Release: 1 +Release: 2 Summary: Python HTTP Library License: ASL 2.0 URL: http://python-requests.org/ @@ -12,6 +12,7 @@ Patch1: requests-2.12.4-tests_nonet.patch 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 +Patch6000: backport-CVE-2023-32681.patch BuildArch: noarch @@ -112,6 +113,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %doc HISTORY.md README.md %changelog +* Wed May 31 2023 zhangpan - 2.24.0-2 +- fix CVE-2023-32681 + * Tue Aug 18 2020 jinzhimin - 2.24.0-1 - update package to 2.24.0