Skip to content

gh-88233: zipfile: refactor _strip_extra #102083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jaraco wants to merge 15 commits into from
Closed

gh-88233: zipfile: refactor _strip_extra #102083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dae825b
zipfile: handle extras after a zip64 extra
thatch Aug 21, 2022
03494d9
Add NEWS entry for bugfix
thatch Sep 5, 2022
7e3627c
Fix typo
jaraco Feb 20, 2023
31b71a9
Tweak style to conform to best conventions. Remove unused variable.
jaraco Feb 20, 2023
6f42280
Reflow comment to 72 characters per PEP 8.
jaraco Feb 20, 2023
14d9e42
Replace literal and ambiguous comment with a self-documenting constant.
jaraco Feb 20, 2023
3c6360e
gh-85417: Clarify behaviour on branch cuts in cmath module (#102046)
mdickinson Feb 19, 2023
3055af6
Misc improvements to the float tutorial (GH-102052)
rhettinger Feb 19, 2023
a0004e1
gh-101578: Amend PyErr_{Set,Get}RaisedException docs (#101962)
erlend-aasland Feb 19, 2023
c6f8395
gh-97786: Fix compiler warnings in pytime.c (#101826)
mdickinson Feb 20, 2023
462aaa3
gh-101981: Build macOS as recommended by the devguide (GH-102070)
erlend-aasland Feb 20, 2023
13882e0
gh-101819: Adapt _io types to heap types, batch 1 (GH-101949)
erlend-aasland Feb 20, 2023
ca5d36e
gh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (GH-101912)
zooba Feb 20, 2023
b57a039
gh-101981: Apply HOMEBREW related environment variables (gh-102074)
corona10 Feb 20, 2023
8d9363b
Refactor zipfile._strip_extra to use higher level abstractions for ex…
jaraco Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
zipfile: handle extras after a zip64 extra 
Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes #88233
  • Loading branch information
@thatch @jaraco
thatch authored and jaraco committed Feb 20, 2023
commit dae825bad06f03250dbfe30af689e61675ee9a23
52 changes: 52 additions & 0 deletions Lib/test/test_zipfile/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3009,6 +3009,58 @@ def test_cli_with_metadata_encoding_extract(self):
for name in self.file_names:
self.assertIn(name, listing)

class StripExtraTests(unittest.TestCase):
# Note: all of the "z" characters are technically invalid, but up to 3 bytes
# at the end of the extra will be passed through as they are too short to
# encode a valid extra.
def test_no_data(self):
s = struct.Struct("<HH")
a = s.pack(1, 0) # 1=zip64 exta signature
b = s.pack(2, 0)
c = s.pack(3, 0)

self.assertEqual(b'', zipfile._strip_extra(a, (1,)))
self.assertEqual(b, zipfile._strip_extra(b, (1,)))
self.assertEqual(b+b"z", zipfile._strip_extra(b+b"z", (1,)))

self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (1,)))
self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (1,)))
self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (1,)))

def test_with_data(self):
s = struct.Struct("<HH")
a = s.pack(1, 1) + b"a" # 1=zip64 exta signature
b = s.pack(2, 2) + b"bb"
c = s.pack(3, 3) + b"ccc"

self.assertEqual(b"", zipfile._strip_extra(a, (1,)))
self.assertEqual(b, zipfile._strip_extra(b, (1,)))
self.assertEqual(b+b"z", zipfile._strip_extra(b+b"z", (1,)))

self.assertEqual(b+c, zipfile._strip_extra(a+b+c, (1,)))
self.assertEqual(b+c, zipfile._strip_extra(b+a+c, (1,)))
self.assertEqual(b+c, zipfile._strip_extra(b+c+a, (1,)))

def test_multiples(self):
s = struct.Struct("<HH")
a = s.pack(1, 1) + b"a" # 1=zip64 exta signature
b = s.pack(2, 2) + b"bb"
c = s.pack(3, 3) + b"ccc"

self.assertEqual(b"", zipfile._strip_extra(a+a, (1,)))
self.assertEqual(b"", zipfile._strip_extra(a+a+a, (1,)))
self.assertEqual(b"z", zipfile._strip_extra(a+a+b"z", (1,)))
self.assertEqual(b+b"z", zipfile._strip_extra(a+a+b+b"z", (1,)))

self.assertEqual(b, zipfile._strip_extra(a+a+b, (1,)))
self.assertEqual(b, zipfile._strip_extra(a+b+a, (1,)))
self.assertEqual(b, zipfile._strip_extra(b+a+a, (1,)))

def test_too_short(self):
self.assertEqual(b"", zipfile._strip_extra(b"", (1,)))
self.assertEqual(b"z", zipfile._strip_extra(b"z", (1,)))
self.assertEqual(b"zz", zipfile._strip_extra(b"zz", (1,)))
self.assertEqual(b"zzz", zipfile._strip_extra(b"zzz", (1,)))

if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ def _strip_extra(extra, xids):
i = j
if not modified:
return extra
if start != len(extra):
buffer.append(extra[start:])
return b''.join(buffer)

def _check_zipfile(fp):
Expand Down