Skip to content
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

Jump to bottom

gh-88233: zipfile: handle extras after a zip64 extra #96161

Merged
merged 8 commits into from
Feb 20, 2023
Merged

gh-88233: zipfile: handle extras after a zip64 extra #96161

merged 8 commits into from
Feb 20, 2023

Conversation

thatch
Copy link
Contributor

@thatch thatch commented Aug 21, 2022 •
edited by miss-islington
Loading

Previously, any data after the zip64 extra would be removed.

With many new tests.

Fixes #88233

Automerge-Triggered-By: GH:jaraco

@gpshead gpshead added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Aug 25, 2022
@gpshead
Copy link
Member

gpshead commented Aug 25, 2022

Can you add a NEWS entry (https://pypi.org/project/blurb/ can help) describing the bugfix?

@thatch
zipfile: handle extras after a zip64 extra
a263718 
Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233
@thatch
Add NEWS entry for bugfix
f995644
@thatch
Copy link
Contributor Author

thatch commented Sep 5, 2022

Rebased and NEWS entry added.

@thatch
Copy link
Contributor Author

thatch commented Sep 25, 2022

@gpshead would you like me to do anything else on this one? NEWS entry is added.

@thatch
Copy link
Contributor Author

thatch commented Nov 5, 2022

@gpshead any other changes you'd like to see on this one?

@smontanaro
Copy link
Contributor

(I'm working my way through some PRs which have been approved and are labeled "awaiting merge", hence my seemingly bolt from the blue comment. Why? Read here.)

Looks like this is complete. Can someone merge it so it doesn't get too stale?

@bedevere-bot bedevere-bot mentioned this pull request Feb 5, 2023
Closed
@arhadthedev
Copy link
Member

@gpshead (as the zipfile expert), would you mind to review and possibly merge this PR?

@gpshead gpshead requested a review from jaraco February 5, 2023 19:50
@gpshead
Copy link
Member

gpshead commented Feb 5, 2023

This one is likely good, @jaraco is our real zipfile expert though. looping him in before merging.

jaraco
jaraco approved these changes Feb 20, 2023
View reviewed changes
Copy link
Member

@jaraco jaraco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I had some minor nitpicks with the test, so took the liberty to correct those. I also replaced the literal 1 with ZIP64_EXTRA in the hopes of more clearly communicating that aspect.

@jaraco jaraco mentioned this pull request Feb 20, 2023
Merged
@miss-islington
Copy link
Contributor

Status check is done, and it's a success ✅.

@miss-islington miss-islington merged commit 59e86ca into python:main Feb 20, 2023
@miss-islington
Copy link
Contributor

Thanks @thatch for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 20, 2023
@thatch @miss-islington
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
8efac30 
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes pythonGH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <tim@timhatch.com>
Automerge-Triggered-By: GH:jaraco
@bedevere-bot
Copy link

GH-102086 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 20, 2023
@bedevere-bot
Copy link

GH-102087 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Feb 20, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 20, 2023
@thatch @miss-islington
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
0959162 
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes pythonGH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <tim@timhatch.com>
Automerge-Triggered-By: GH:jaraco
miss-islington added a commit that referenced this pull request Feb 20, 2023
@miss-islington @thatch
gh-88233: zipfile: handle extras after a zip64 extra (GH-96161)
62c0327 
Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes GH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <tim@timhatch.com>
Automerge-Triggered-By: GH:jaraco
carljm added a commit to carljm/cpython that referenced this pull request Feb 20, 2023
@carljm
Merge branch 'main' into inlinecomp2
9f0fc5b 
* main: (60 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Feb 22, 2023
@carljm
Merge branch 'main' into inlinecomp
544b30c 
* main: (225 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
ambv pushed a commit that referenced this pull request Mar 28, 2023
@miss-islington @thatch
[3.10] gh-88233: zipfile: handle extras after a zip64 extra (GH-96161) (
d445147 
#102087)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes GH-88233
(cherry picked from commit 59e86ca)

Co-authored-by: Tim Hatch <tim@timhatch.com>
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@thatch @python-sidebar
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
12d27d8 
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233

Automerge-Triggered-By: GH:jaraco
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@thatch @python-sidebar
pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-…
676b772 
…96161)

Previously, any data _after_ the zip64 extra would be removed.

With many new tests.

Fixes python#88233

Automerge-Triggered-By: GH:jaraco
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead gpshead approved these changes

@jaraco jaraco jaraco approved these changes

Assignees

@gpshead gpshead

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Zipfile lib overwrites the extra field during closing when the archive size is more then ZIP64_LIMIT
7 participants
@thatch @gpshead @smontanaro @arhadthedev @miss-islington @bedevere-bot @jaraco