mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
6653eb6e90
A Denial of Service (DoS) vulnerability exists in the jaraco/zipp library, affecting all versions prior to 3.19.1. The vulnerability is triggered when processing a specially crafted zip file that leads to an infinite loop. This issue also impacts the zipfile module of CPython, as features from the third-party zipp library are later merged into CPython, and the affected code is identical in both projects. The infinite loop can be initiated through the use of functions affecting the `Path` module in both zipp and zipfile, such as `joinpath`, the overloaded division operator, and `iterdir`. Although the infinite loop is not resource exhaustive, it prevents the application from responding. The vulnerability was addressed in version 3.19.1 of jaraco/zipp. References: https://nvd.nist.gov/vuln/detail/CVE-2024-5569 Upstream patches:79a309fe54564fcc10cd58115d2be9c18417ed29(From OE-Core rev: ec77cfe12f0790c7e3cf2d9bf00e47b4c653997c) Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
139 lines
4.5 KiB
Diff
139 lines
4.5 KiB
Diff
From b1804347ec2db16452a7bff2b469d2c66776b904 Mon Sep 17 00:00:00 2001
|
|
From: "Jason R. Coombs" <jaraco@jaraco.com>
|
|
Date: Fri, 31 May 2024 11:20:57 -0400
|
|
Subject: [PATCH] fix CVE-2024-5569
|
|
|
|
The patch includes the following changes:
|
|
c18417e Add news fragment.
|
|
58115d2 Employ SanitizedNames in CompleteDirs. Fixes broken test.
|
|
564fcc1 Add SanitizedNames mixin.
|
|
79a309f Add some assertions about malformed paths.
|
|
|
|
Upstream-Status: Backport
|
|
[https://github.com/jaraco/zipp/pull/120/commits/79a309fe54dc6b7934fb72e9f31bcb58f2e9f547]
|
|
[https://github.com/jaraco/zipp/pull/120/commits/564fcc10cdbfdaecdb33688e149827465931c9e0]
|
|
[https://github.com/jaraco/zipp/pull/120/commits/58115d2be968644ce71ce6bcc9b79826c82a1806]
|
|
[https://github.com/jaraco/zipp/pull/120/commits/c18417ed2953e181728a7dac07bff88a2190abf7]
|
|
|
|
CVE: CVE-2024-5569
|
|
|
|
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
|
|
---
|
|
newsfragments/119.bugfix.rst | 1 +
|
|
tests/test_path.py | 17 ++++++++++
|
|
zipp/__init__.py | 64 +++++++++++++++++++++++++++++++++++-
|
|
3 files changed, 81 insertions(+), 1 deletion(-)
|
|
create mode 100644 newsfragments/119.bugfix.rst
|
|
|
|
diff --git a/newsfragments/119.bugfix.rst b/newsfragments/119.bugfix.rst
|
|
new file mode 100644
|
|
index 0000000..6c72e2d
|
|
--- /dev/null
|
|
+++ b/newsfragments/119.bugfix.rst
|
|
@@ -0,0 +1 @@
|
|
+Improved handling of malformed zip files.
|
|
\ No newline at end of file
|
|
diff --git a/tests/test_path.py b/tests/test_path.py
|
|
index a77a5de..3752243 100644
|
|
--- a/tests/test_path.py
|
|
+++ b/tests/test_path.py
|
|
@@ -575,3 +575,20 @@ class TestPath(unittest.TestCase):
|
|
zipp.Path(alpharep)
|
|
with self.assertRaises(KeyError):
|
|
alpharep.getinfo('does-not-exist')
|
|
+
|
|
+ def test_malformed_paths(self):
|
|
+ """
|
|
+ Path should handle malformed paths.
|
|
+ """
|
|
+ data = io.BytesIO()
|
|
+ zf = zipfile.ZipFile(data, "w")
|
|
+ zf.writestr("/one-slash.txt", b"content")
|
|
+ zf.writestr("//two-slash.txt", b"content")
|
|
+ zf.writestr("../parent.txt", b"content")
|
|
+ zf.filename = ''
|
|
+ root = zipfile.Path(zf)
|
|
+ assert list(map(str, root.iterdir())) == [
|
|
+ 'one-slash.txt',
|
|
+ 'two-slash.txt',
|
|
+ 'parent.txt',
|
|
+ ]
|
|
diff --git a/zipp/__init__.py b/zipp/__init__.py
|
|
index becd010..e980e9b 100644
|
|
--- a/zipp/__init__.py
|
|
+++ b/zipp/__init__.py
|
|
@@ -84,7 +84,69 @@ class InitializedState:
|
|
super().__init__(*args, **kwargs)
|
|
|
|
|
|
-class CompleteDirs(InitializedState, zipfile.ZipFile):
|
|
+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(InitializedState, SanitizedNames, zipfile.ZipFile):
|
|
"""
|
|
A ZipFile subclass that ensures that implied directories
|
|
are always included in the namelist.
|
|
--
|
|
2.25.1
|
|
|