mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
af06cbf82b
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>
90 lines
2.7 KiB
Diff
90 lines
2.7 KiB
Diff
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
|
|
|