diff --git a/backport-CVE-2024-47081.patch b/backport-CVE-2024-47081.patch new file mode 100644 index 0000000000000000000000000000000000000000..62e8cd15346e09e36bda22df0fcb6dab1cbafe82 --- /dev/null +++ b/backport-CVE-2024-47081.patch @@ -0,0 +1,31 @@ +From 96ba401c1296ab1dda74a2365ef36d88f7d144ef Mon Sep 17 00:00:00 2001 +From: Nate Prewitt +Date: Wed, 25 Sep 2024 08:03:20 -0700 +Subject: [PATCH] Only use hostname to do netrc lookup instead of netloc + +Reference:https://github.com/psf/requests/commit/96ba401c1296ab1dda74a2365ef36d88f7d144ef +Conflict:NA + +--- + src/requests/utils.py | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/requests/utils.py b/src/requests/utils.py +index 699683e5d9..8a307ca8a0 100644 +--- a/src/requests/utils.py ++++ b/src/requests/utils.py +@@ -236,13 +236,7 @@ def get_netrc_auth(url, raise_errors=False): + return + + ri = urlparse(url) +- +- # Strip port numbers from netloc. This weird `if...encode`` dance is +- # used for Python 3.2, which doesn't support unicode literals. +- splitstr = b":" +- if isinstance(url, str): +- splitstr = splitstr.decode("ascii") +- host = ri.netloc.split(splitstr)[0] ++ host = ri.hostname + + try: + _netrc = netrc(netrc_path).authenticators(host) diff --git a/python-requests.spec b/python-requests.spec index 40bc9b70e8546173046e8eba2041d53216e23f80..2fea8c3352559ecb5d612c47da803e05fd28cf1b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -2,12 +2,13 @@ Name: python-requests Version: 2.32.3 -Release: 2 +Release: 3 Summary: Python HTTP Library License: ASL 2.0 URL: https://github.com/psf/requests Source: %{url}/archive/v%{version}/requests-%{version}.tar.gz Patch6001: backport-requests-2.32.3-system-certs.patch +Patch6002: backport-CVE-2024-47081.patch BuildArch: noarch %description @@ -92,6 +93,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %doc HISTORY.md README.md %changelog +* Mon Jun 23 2025 zhangpan - 2.32.3-3 +- fix CVE-2024-47081 + * Thu Jun 19 2025 yanglu - 2.32.3-2 - fix the problem of residual directory after uninstallation