diff --git a/CVE-2024-5569.patch b/CVE-2024-5569.patch new file mode 100644 index 0000000..113df9b --- /dev/null +++ b/CVE-2024-5569.patch @@ -0,0 +1,108 @@ +Index: zipp-3.15.0/newsfragments/119.bugfix.rst +=================================================================== +--- /dev/null ++++ zipp-3.15.0/newsfragments/119.bugfix.rst +@@ -0,0 +1 @@ ++Improved handling of malformed zip files. +\ No newline at end of file +Index: zipp-3.15.0/zipp/__init__.py +=================================================================== +--- zipp-3.15.0.orig/zipp/__init__.py ++++ zipp-3.15.0/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. +Index: zipp-3.15.0/tests/test_zipp.py +=================================================================== +--- zipp-3.15.0.orig/tests/test_zipp.py ++++ zipp-3.15.0/tests/test_zipp.py +@@ -529,3 +529,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 = zipp.Path(zf) ++ assert list(map(str, root.iterdir())) == [ ++ 'one-slash.txt', ++ 'two-slash.txt', ++ 'parent.txt', ++ ] + diff --git a/saltbundlepy-zipp.changes b/saltbundlepy-zipp.changes index b5e85d9..d0d5cff 100644 --- a/saltbundlepy-zipp.changes +++ b/saltbundlepy-zipp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 2 15:17:13 UTC 2024 - Pablo Suárez Hernández + +- Add patch CVE-2024-5569.patch from upstream gh#jaraco/zipp@fd604bd34f03 + (bsc#1227547, CVE-2024-5569, bsc#1229996) + ------------------------------------------------------------------- Fri Dec 15 17:47:58 UTC 2023 - Victor Zhestkov diff --git a/saltbundlepy-zipp.spec b/saltbundlepy-zipp.spec index 3bf7f04..03d93a7 100644 --- a/saltbundlepy-zipp.spec +++ b/saltbundlepy-zipp.spec @@ -40,6 +40,8 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/jaraco/zipp Source: https://files.pythonhosted.org/packages/source/z/zipp/zipp-%{version}.tar.gz +# PATCH-FIX-UPSTREAM CVE-2024-5569.patch gh#jaraco/zipp@fd604bd34f03 +Patch1: CVE-2024-5569.patch BuildRequires: %{saltbundlepy_module base >= 3.10} BuildRequires: %{saltbundlepy_module pip} BuildRequires: %{saltbundlepy_module setuptools-scm >= 3.4.1} @@ -60,6 +62,7 @@ A pathlib-compatible Zipfile object wrapper. %prep %setup -q -n zipp-%{version} +%patch1 -p1 sed -i '/addopts/ s/--doctest-modules//' pytest.ini # People still want this for 15.X despite Python 3.6 is not supported upstream anymore sed -i 's/python_requires = >=3.7/python_requires = >=3.6/' setup.cfg