CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3-zipp: fix CVE-2024-5569

Browse Source 
According to [1] which provided the fix link [2], but upstream author
reworked it later [3][4][5]

Backport and rebase all the patches for tracing

[1] https://nvd.nist.gov/vuln/detail/CVE-2024-5569
[2] fd604bd34f
[3] 3cb5609002
[4] f89b93f037
[5] cc61e6140f

(From OE-Core rev: 13bd99e17f0aca108839e81e9aa0b14351116fdf)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Hongxu Jia 2024-11-28 15:46:44 +08:00 committed by Steve Sakoman
parent e8c505f7a4
commit af06cbf82b
6 changed files with 300 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
meta/recipes-devtools/python/python3-zipp/0001-Add-SanitizedNames-mixin.patch Normal file
View File

@ -0,0 +1,89 @@
From ef2227e35d1ae833b7bfa1674a45f58c732ae1a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2024 23:27:57 -0800
Subject: [PATCH 1/5] Add SanitizedNames mixin.
Upstream-Status: Backport [https://github.com/jaraco/zipp/commit/564fcc10cdbfdaecdb33688e149827465931c9e0]
CVE: CVE-2024-5569
Rebase to v3.7.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
zipp.py | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/zipp.py b/zipp.py
index 26b723c..8f0950f 100644
--- a/zipp.py
+++ b/zipp.py
@@ -68,6 +68,68 @@ def _difference(minuend, subtrahend):
return itertools.filterfalse(set(subtrahend).__contains__, minuend)
+class SanitizedNames:
+ """
+ ZipFile mix-in to ensure names are sanitized.
+ """
+
+ def namelist(self):
+ return list(map(self._sanitize, super().namelist()))
+
+ @staticmethod
+ def _sanitize(name):
+ r"""
+ Ensure a relative path with posix separators and no dot names.
+
+ Modeled after
+ https://github.com/python/cpython/blob/bcc1be39cb1d04ad9fc0bd1b9193d3972835a57c/Lib/zipfile/__init__.py#L1799-L1813
+ but provides consistent cross-platform behavior.
+
+ >>> san = SanitizedNames._sanitize
+ >>> san('/foo/bar')
+ 'foo/bar'
+ >>> san('//foo.txt')
+ 'foo.txt'
+ >>> san('foo/.././bar.txt')
+ 'foo/bar.txt'
+ >>> san('foo../.bar.txt')
+ 'foo../.bar.txt'
+ >>> san('\\foo\\bar.txt')
+ 'foo/bar.txt'
+ >>> san('D:\\foo.txt')
+ 'D/foo.txt'
+ >>> san('\\\\server\\share\\file.txt')
+ 'server/share/file.txt'
+ >>> san('\\\\?\\GLOBALROOT\\Volume3')
+ '?/GLOBALROOT/Volume3'
+ >>> san('\\\\.\\PhysicalDrive1\\root')
+ 'PhysicalDrive1/root'
+
+ Retain any trailing slash.
+ >>> san('abc/')
+ 'abc/'
+
+ Raises a ValueError if the result is empty.
+ >>> san('../..')
+ Traceback (most recent call last):
+ ...
+ ValueError: Empty filename
+ """
+
+ def allowed(part):
+ return part and part not in {'..', '.'}
+
+ # Remove the drive letter.
+ # Don't use ntpath.splitdrive, because that also strips UNC paths
+ bare = re.sub('^([A-Z]):', r'\1', name, flags=re.IGNORECASE)
+ clean = bare.replace('\\', '/')
+ parts = clean.split('/')
+ joined = '/'.join(filter(allowed, parts))
+ if not joined:
+ raise ValueError("Empty filename")
+ return joined + '/' * name.endswith('/')
+
+
class CompleteDirs(zipfile.ZipFile):
"""
A ZipFile subclass that ensures that implied directories
--
2.25.1

30
meta/recipes-devtools/python/python3-zipp/0002-Employ-SanitizedNames-in-CompleteDirs.-Fixes-broken-.patch Normal file
View File

@ -0,0 +1,30 @@
From 8b09dbf95b3ba78a63f220941e31ac92f4ad192c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2024 23:31:57 -0800
Subject: [PATCH 2/5] Employ SanitizedNames in CompleteDirs. Fixes broken test.
Upstream-Status: Backport [https://github.com/jaraco/zipp/commit/58115d2be968644ce71ce6bcc9b79826c82a1806]
Remove test code
Rebase to v3.7.0
CVE: CVE-2024-5569
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
zipp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zipp.py b/zipp.py
index 8f0950f..29d2572 100644
--- a/zipp.py
+++ b/zipp.py
@@ -130,7 +130,7 @@ class SanitizedNames:
return joined + '/' * name.endswith('/')
-class CompleteDirs(zipfile.ZipFile):
+class CompleteDirs(SanitizedNames, zipfile.ZipFile):
"""
A ZipFile subclass that ensures that implied directories
are always included in the namelist.
--
2.25.1

95
meta/recipes-devtools/python/python3-zipp/0003-Removed-SanitizedNames.patch Normal file
View File

@ -0,0 +1,95 @@
From b52b8af403e64607ae8d5e4cd18d4099d63e7264 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2024 23:33:11 -0800
Subject: [PATCH 3/5] Removed SanitizedNames.
Restores expectations around special characters in zipfiles, but also restores the infinite loop.
Upstream-Status: Backport [https://github.com/jaraco/zipp/commit/3cb5609002263eb19f7b5efda82d96f1f57fe876]
Remove test codes
Rebase to v3.7.0
CVE: CVE-2024-5569
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
zipp.py | 64 +--------------------------------------------------------
1 file changed, 1 insertion(+), 63 deletions(-)
diff --git a/zipp.py b/zipp.py
index 29d2572..26b723c 100644
--- a/zipp.py
+++ b/zipp.py
@@ -68,69 +68,7 @@ def _difference(minuend, subtrahend):
return itertools.filterfalse(set(subtrahend).__contains__, minuend)
-class SanitizedNames:
- """
- ZipFile mix-in to ensure names are sanitized.
- """
-
- def namelist(self):
- return list(map(self._sanitize, super().namelist()))
-
- @staticmethod
- def _sanitize(name):
- r"""
- Ensure a relative path with posix separators and no dot names.
-
- Modeled after
- https://github.com/python/cpython/blob/bcc1be39cb1d04ad9fc0bd1b9193d3972835a57c/Lib/zipfile/__init__.py#L1799-L1813
- but provides consistent cross-platform behavior.
-
- >>> san = SanitizedNames._sanitize
- >>> san('/foo/bar')
- 'foo/bar'
- >>> san('//foo.txt')
- 'foo.txt'
- >>> san('foo/.././bar.txt')
- 'foo/bar.txt'
- >>> san('foo../.bar.txt')
- 'foo../.bar.txt'
- >>> san('\\foo\\bar.txt')
- 'foo/bar.txt'
- >>> san('D:\\foo.txt')
- 'D/foo.txt'
- >>> san('\\\\server\\share\\file.txt')
- 'server/share/file.txt'
- >>> san('\\\\?\\GLOBALROOT\\Volume3')
- '?/GLOBALROOT/Volume3'
- >>> san('\\\\.\\PhysicalDrive1\\root')
- 'PhysicalDrive1/root'
-
- Retain any trailing slash.
- >>> san('abc/')
- 'abc/'
-
- Raises a ValueError if the result is empty.
- >>> san('../..')
- Traceback (most recent call last):
- ...
- ValueError: Empty filename
- """
-
- def allowed(part):
- return part and part not in {'..', '.'}
-
- # Remove the drive letter.
- # Don't use ntpath.splitdrive, because that also strips UNC paths
- bare = re.sub('^([A-Z]):', r'\1', name, flags=re.IGNORECASE)
- clean = bare.replace('\\', '/')
- parts = clean.split('/')
- joined = '/'.join(filter(allowed, parts))
- if not joined:
- raise ValueError("Empty filename")
- return joined + '/' * name.endswith('/')
-
-
-class CompleteDirs(SanitizedNames, zipfile.ZipFile):
+class CompleteDirs(zipfile.ZipFile):
"""
A ZipFile subclass that ensures that implied directories
are always included in the namelist.
--
2.25.1

48
meta/recipes-devtools/python/python3-zipp/0004-Address-infinite-loop-when-zipfile-begins-with-more-.patch Normal file
View File

@ -0,0 +1,48 @@
From ef4ee19919bd49a9c1207ff8d87f83dd48aed436 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2024 23:35:28 -0800
Subject: [PATCH 4/5] Address infinite loop when zipfile begins with more than
one leading slash.
Alternate and more surgical fix for jaraco/zipp#119. Ref python/cpython#123270
Upstream-Status: Backport [https://github.com/jaraco/zipp/commit/f89b93f0370dd85d23d243e25dfc1f99f4d8de48]
Remove test codes
Rebase to v3.7.0
CVE: CVE-2024-5569
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
zipp.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/zipp.py b/zipp.py
index 26b723c..236af49 100644
--- a/zipp.py
+++ b/zipp.py
@@ -37,7 +37,7 @@ def _parents(path):
def _ancestry(path):
"""
Given a path with elements separated by
- posixpath.sep, generate all elements of that path
+ posixpath.sep, generate all elements of that path.
>>> list(_ancestry('b/d'))
['b/d', 'b']
@@ -49,9 +49,13 @@ def _ancestry(path):
['b']
>>> list(_ancestry(''))
[]
+ Multiple separators are treated like a single.
+
+ >>> list(_ancestry('//b//d///f//'))
+ ['//b//d///f', '//b//d', '//b']
"""
path = path.rstrip(posixpath.sep)
- while path and path != posixpath.sep:
+ while path and not path.endswith(posixpath.sep):
yield path
path, tail = posixpath.split(path)
--
2.25.1

30
meta/recipes-devtools/python/python3-zipp/0005-Prefer-simpler-path.rstrip-to-consolidate-checks-for.patch Normal file
View File

@ -0,0 +1,30 @@
From 9084bc59784cb240628996c1cb95f4f786ebedcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2024 23:38:28 -0800
Subject: [PATCH 5/5] Prefer simpler path.rstrip to consolidate checks for
empty or only paths.
Upstream-Status: Backport [https://github.com/jaraco/zipp/commit/cc61e6140f0dfde2ff372db932442cf6df890f09]
Rebase to v3.7.0
CVE: CVE-2024-5569
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
zipp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zipp.py b/zipp.py
index 236af49..87c4219 100644
--- a/zipp.py
+++ b/zipp.py
@@ -55,7 +55,7 @@ def _ancestry(path):
['//b//d///f', '//b//d', '//b']
"""
path = path.rstrip(posixpath.sep)
- while path and not path.endswith(posixpath.sep):
+ while path.rstrip(posixpath.sep):
yield path
path, tail = posixpath.split(path)
--
2.25.1

8
meta/recipes-devtools/python/python3-zipp_3.7.0.bb
View File

@ -9,6 +9,14 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
inherit pypi python_setuptools_build_meta
SRC_URI += " \
file://0001-Add-SanitizedNames-mixin.patch \
file://0002-Employ-SanitizedNames-in-CompleteDirs.-Fixes-broken-.patch \
file://0003-Removed-SanitizedNames.patch \
file://0004-Address-infinite-loop-when-zipfile-begins-with-more-.patch \
file://0005-Prefer-simpler-path.rstrip-to-consolidate-checks-for.patch \
"
DEPENDS += "${PYTHON_PN}-toml-native"
RDEPENDS:${PN} += "${PYTHON_PN}-compression \