gh-146581: Use ZipFile.extractall() in shutil for secure ZIP extraction#146588
Closed
Shrey-N wants to merge 8 commits intopython:mainfrom
Closed
gh-146581: Use ZipFile.extractall() in shutil for secure ZIP extraction#146588Shrey-N wants to merge 8 commits intopython:mainfrom
Shrey-N wants to merge 8 commits intopython:mainfrom
Conversation
Add a test case for ZIP file traversal on Windows.
Updated comments for clarity and removed redundant lines.
Removed unnecessary blank lines in _unpack_zipfile function.
Member
|
Closing in favour of #146591 |
Member
Contributor
Author
|
Thank you for the update @serhiy-storchaka. I am glad to see the fix landing via #146591 :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR refactors
shutil._unpack_zipfileto usezipfile.ZipFile.extractall()instead of a manual extraction loop. This resolves a directory traversal vulnerability on Windows where archives containing drive prefixed paths for exampleD:/file.txtcould write files outside the intended destination directory.Changes Made
ZipFile.extractall(), which leverages thezipfilemodule_unpack_zipfilesignature to accept**kwargs. This ensures compatibility with thefilterargument, preventingTypeErrorwhile allowing future filter support for ZIP files.shutilhandles TAR files, which already usesextractall().Regression Test
Added a new test case
test_unpack_zipfile_traversal_windows_drivetoLib/test/test_shutil.py. This test specifically verifies that a ZIP file containing a drive prefixed path is safely sanitized and extracted within the intendedextract_diron Windows.Linked Issue
#146581