https://github.com/python/cpython/commit/f3fee231d359979133e1d58085f43277c41476d0
commit: f3fee231d359979133e1d58085f43277c41476d0
branch: 3.12
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-03-22T18:35:12Z
summary:
[3.12] gh-117084: Fix ZIP file extraction for directory entry names with
backslashes on Windows (GH-117129) (GH-117162)
(cherry picked from commit 567ab3bd15398c8c7b791f3e376ae3e3c0bbe079)
files:
A Lib/test/zipdir_backslash.zip
A Misc/NEWS.d/next/Library/2024-03-21-17-07-38.gh-issue-117084.w1mTpT.rst
M Lib/test/test_zipfile/test_core.py
M Lib/zipfile/__init__.py
diff --git a/Lib/test/test_zipfile/test_core.py
b/Lib/test/test_zipfile/test_core.py
index ae58145d3c72c8..5b32f80d80bb78 100644
--- a/Lib/test/test_zipfile/test_core.py
+++ b/Lib/test/test_zipfile/test_core.py
@@ -2937,6 +2937,22 @@ def test_bug_6050(self):
os.mkdir(os.path.join(TESTFN2, "a"))
self.test_extract_dir()
+ def test_extract_dir_backslash(self):
+ zfname = findfile("zipdir_backslash.zip")
+ with zipfile.ZipFile(zfname) as zipf:
+ zipf.extractall(TESTFN2)
+ if os.name == 'nt':
+ self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a")))
+ self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a", "b")))
+ self.assertTrue(os.path.isfile(os.path.join(TESTFN2, "a", "b",
"c")))
+ self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "d")))
+ self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "d", "e")))
+ else:
+ self.assertTrue(os.path.isfile(os.path.join(TESTFN2, "a\\b\\c")))
+ self.assertTrue(os.path.isfile(os.path.join(TESTFN2, "d\\e\\")))
+ self.assertFalse(os.path.exists(os.path.join(TESTFN2, "a")))
+ self.assertFalse(os.path.exists(os.path.join(TESTFN2, "d")))
+
def test_write_dir(self):
dirpath = os.path.join(TESTFN2, "x")
os.mkdir(dirpath)
diff --git a/Lib/test/zipdir_backslash.zip b/Lib/test/zipdir_backslash.zip
new file mode 100644
index 00000000000000..979126ef5e37eb
Binary files /dev/null and b/Lib/test/zipdir_backslash.zip differ
diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
index 8918484207a326..a05c97ab89460c 100644
--- a/Lib/zipfile/__init__.py
+++ b/Lib/zipfile/__init__.py
@@ -582,7 +582,15 @@ def from_file(cls, filename, arcname=None, *,
strict_timestamps=True):
def is_dir(self):
"""Return True if this archive member is a directory."""
- return self.filename.endswith('/')
+ if self.filename.endswith('/'):
+ return True
+ # The ZIP format specification requires to use forward slashes
+ # as the directory separator, but in practice some ZIP files
+ # created on Windows can use backward slashes. For compatibility
+ # with the extraction code which already handles this:
+ if os.path.altsep:
+ return self.filename.endswith((os.path.sep, os.path.altsep))
+ return False
# ZIP encryption uses the CRC32 one-byte primitive for scrambling some
diff --git
a/Misc/NEWS.d/next/Library/2024-03-21-17-07-38.gh-issue-117084.w1mTpT.rst
b/Misc/NEWS.d/next/Library/2024-03-21-17-07-38.gh-issue-117084.w1mTpT.rst
new file mode 100644
index 00000000000000..6e7790e926b9d2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-03-21-17-07-38.gh-issue-117084.w1mTpT.rst
@@ -0,0 +1,2 @@
+Fix :mod:`zipfile` extraction for directory entries with the name containing
+backslashes on Windows.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
