Skip to content

Commit 77aa6d7

Browse files
committed
Use a patch file instead of a patched file
1 parent b199a22 commit 77aa6d7

5 files changed

Lines changed: 645 additions & 948 deletions

File tree

pkg/patches/pip-urllib3/_version.py

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
--- a/pip/_vendor/urllib3/_version.py
2+
+++ b/pip/_vendor/urllib3/_version.py
3+
@@ -1,2 +1,26 @@
4+
-# This file is protected via CODEOWNERS
5+
6+
-__version__ = "1.26.20"
7+
8+
+# This file is a Salt-maintained security patch of pip's vendored urllib3.
9+
10+
+#
11+
12+
+# The underlying code is urllib3 1.26.20 (the version vendored by pip 25.2)
13+
14+
+# with the following CVE fixes backported from upstream urllib3 2.6.3:
15+
16+
+#
17+
18+
+# CVE-2025-66418 (GHSA-gm62-xv2j-4w53): Unbounded Content-Encoding
19+
20+
+# decompression chain — MultiDecoder now enforces a 5-link limit.
21+
22+
+# Upstream fix: urllib3 2.6.0 (commit 24d7b67).
23+
24+
+#
25+
26+
+# CVE-2026-21441 (GHSA-38jv-5279-wg99): drain_conn unnecessarily
27+
28+
+# decompressed the full body of HTTP redirect responses, creating a
29+
30+
+# decompression-bomb vector. Fixed by adding _has_decoded_content
31+
32+
+# tracking and only decoding in drain_conn when decoding was already
33+
34+
+# in progress.
35+
36+
+# Upstream fix: urllib3 2.6.3 (commit 8864ac4).
37+
38+
+#
39+
40+
+# CVE-2025-66471 (GHSA-2xpw-w6gg-jr37): Decompression bomb in the
41+
42+
+# streaming API via max_length parameter. NOT backported — requires a
43+
44+
+# full 2.x streaming infrastructure refactor. Ubuntu did not backport
45+
46+
+# this to 1.26.x either. pip's maintainers confirmed pip is not
47+
48+
+# affected because all pip network calls use decode_content=False.
49+
50+
+#
51+
52+
+# The version string "2.6.3" reflects the highest upstream release from
53+
54+
+# which fixes have been backported. The underlying API remains urllib3
55+
56+
+# 1.26.x — this is NOT a port to urllib3 2.x.
57+
58+
+__version__ = "2.6.3"

0 commit comments

Comments
 (0)