Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/requests/CVE-2024-47081.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 57acb7c26d809cf864ec439b8bcd6364702022d5 Mon Sep 17 00:00:00 2001
From: Nate Prewitt <nate.prewitt@gmail.com>
Date: Wed, 25 Sep 2024 08:03:20 -0700
Subject: [PATCH] Only use hostname to do netrc lookup instead of netloc

---
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)
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/requests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ buildPythonPackage rec {
# https://github.com/psf/requests/issues/6730
# https://github.com/psf/requests/pull/6731
./ca-load-regression.patch

# https://seclists.org/fulldisclosure/2025/Jun/2
./CVE-2024-47081.patch
];

dependencies = [
Expand Down