Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce _scan_data_descriptor_no_sig_by_decompression

Browse source
This commit is contained in:
Danny Lin 2025-05-30 20:29:27 +08:00
parent 31c4c936c6
commit f8fade17a0
2 changed files with 102 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Lib/test/test_zipfile/test_core.py
View file

@ -2008,6 +2008,9 @@ def test_repack_data_descriptor_no_sig(self):
def test_repack_data_descriptor_no_sig_strict(self):
"""Should skip data descriptor without signature when `strict_descriptor` is set."""
if self.compression not in (zipfile.ZIP_STORED, zipfile.ZIP_LZMA):
self.skipTest('require unsupported decompression method')
for ii in ([0], [0, 1]):
with self.subTest(remove=ii):
# calculate the expected results
@ -2046,6 +2049,47 @@ def test_repack_data_descriptor_no_sig_strict(self):
with zipfile.ZipFile(TESTFN) as zh:
self.assertIsNone(zh.testzip())
def test_repack_data_descriptor_no_sig_strict_by_decompressoin(self):
"""Should correctly handle file entries using data descriptor without signature
through decompression."""
if self.compression in (zipfile.ZIP_STORED, zipfile.ZIP_LZMA):
self.skipTest('require supported decompression method')
for ii in ([0], [0, 1]):
with self.subTest(remove=ii):
# calculate the expected results
test_files = [data for j, data in enumerate(self.test_files) if j not in ii]
with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
expected_zinfos = self._prepare_zip_from_test_files(Unseekable(fh), test_files)
expected_size = os.path.getsize(TESTFN)
# do the removal and check the result
with open(TESTFN, 'wb') as fh:
with mock.patch('zipfile.struct.pack', side_effect=struct_pack_no_dd_sig):
zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files)
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
# make sure data descriptor bit is really set (by making zipfile unseekable)
for zi in zh.infolist():
self.assertTrue(zi.flag_bits & 8, f'data descriptor flag not set: {zi.filename}')
for i in ii:
zh.remove(self.test_files[i][0])
zh.repack(strict_descriptor=True)
# check infolist
self.assertEqual(
[ComparableZipInfo(zi) for zi in zh.infolist()],
expected_zinfos,
)
# check file size
self.assertEqual(os.path.getsize(TESTFN), expected_size)
# make sure the zip file is still valid
with zipfile.ZipFile(TESTFN) as zh:
self.assertIsNone(zh.testzip())
def test_repack_data_descriptor_no_sig_and_zip64(self):
"""Should correctly handle file entries using data descriptor without signature and zip64."""
for ii in ([0], [0, 1], [1], [2]):