Security fix for CVE-2023-32681
https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q
This commit is contained in:
parent
8d03190e25
commit
d9c9c5dd57
56
CVE-2023-32681.patch
Normal file
56
CVE-2023-32681.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
---
|
||||||
|
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 6cb3b4dae3..dbcf2a7b0e 100644
|
||||||
|
--- a/requests/sessions.py
|
||||||
|
+++ b/requests/sessions.py
|
||||||
|
@@ -324,7 +324,9 @@ def rebuild_proxies(self, prepared_request, proxies):
|
||||||
|
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 b1c8dd4534..b420c44d73 100644
|
||||||
|
--- a/tests/test_requests.py
|
||||||
|
+++ b/tests/test_requests.py
|
||||||
|
@@ -647,6 +647,26 @@ def test_proxy_authorization_preserved_on_request(self, httpbin):
|
||||||
|
|
||||||
|
assert sent_headers.get("Proxy-Authorization") == proxy_auth_value
|
||||||
|
|
||||||
|
+
|
||||||
|
+ @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")
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
Name: python-requests
|
Name: python-requests
|
||||||
Version: 2.28.2
|
Version: 2.28.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: HTTP library, written in Python, for human beings
|
Summary: HTTP library, written in Python, for human beings
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -21,6 +21,9 @@ Source0: https://github.com/requests/requests/archive/v%{version}/request
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=904614
|
# https://bugzilla.redhat.com/show_bug.cgi?id=904614
|
||||||
Patch0: system-certs.patch
|
Patch0: system-certs.patch
|
||||||
|
|
||||||
|
# Security fix for CVE-2023-32681
|
||||||
|
Patch1: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -94,6 +97,10 @@ sed -i 's/ --doctest-modules//' pyproject.toml
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 23 2023 Miro Hrončok <mhroncok@redhat.com> - 2.28.2-2
|
||||||
|
- Security fix for CVE-2023-32681
|
||||||
|
- https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q
|
||||||
|
|
||||||
* Wed Feb 01 2023 Lumír Balhar <lbalhar@redhat.com> - 2.28.2-1
|
* Wed Feb 01 2023 Lumír Balhar <lbalhar@redhat.com> - 2.28.2-1
|
||||||
- Update to 2.28.2 (rhbz#2160527)
|
- Update to 2.28.2 (rhbz#2160527)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user