gh-153625: rewrite with original filename

Author: danny0838

Lib/test/test_zipfile/test_core.py

@@ -4827,6 +4827,28 @@ def test_overlap_with_archive_comment(self):
             with self.assertRaisesRegex(zipfile.BadZipFile, 'Overlapped entries'):
                 zipf.read('a')
 
+    def test_append_keep_filename(self):
+        """Files loaded from an archive should keep original filename when
+        rewritten to central directory in append mode."""
+        with zipfile.ZipFile(TESTFN, mode="w") as zipfp:
+            zinfo = zipfile.ZipInfo('MyFolder/My\\File.txt')
+            zinfo._orig_filename = 'MyFolder/My\\File.txt'
+            zipfp.writestr(zinfo, 'foo')
+
+        with zipfile.ZipFile(TESTFN, "a") as zipfp:
+            self.assertIsNone(zipfp.testzip())
+            zi = zipfp.infolist()[0]
+            self.assertEqual(zi.orig_filename, 'MyFolder/My\\File.txt')
+            self.assertEqual(zi.filename, 'MyFolder/My/File.txt')
+            # trigger archive rewriting
+            zipfp.comment = b''
+
+        with zipfile.ZipFile(TESTFN, "r") as zipfp:
+            self.assertIsNone(zipfp.testzip())
+            zi = zipfp.infolist()[0]
+            self.assertEqual(zi.orig_filename, 'MyFolder/My\\File.txt')
+            self.assertEqual(zi.filename, 'MyFolder/My/File.txt')
+
     def tearDown(self):
         unlink(TESTFN)
         unlink(TESTFN2)

Lib/zipfile/__init__.py

@@ -432,7 +432,7 @@ class ZipInfo:
     """Class with attributes describing each file in the ZIP archive."""
 
     __slots__ = (
-        'orig_filename',
+        '_orig_filename',
         'filename',
         'date_time',
         'compress_type',
@@ -456,7 +456,7 @@ class ZipInfo:
     )
 
     def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
-        self.orig_filename = filename   # Original file name in archive
+        self.orig_filename = None       # Original file name in archive
 
         # Terminate the file name at the first null byte and
         # ensure paths always use forward slashes as the directory separator.
@@ -492,6 +492,16 @@ def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
         # header_offset         Byte offset to the file header
         # CRC                   CRC-32 of the uncompressed file
 
+    @property
+    def orig_filename(self):
+        return (self._orig_filename if self._orig_filename is not None
+                else self.filename)
+
+    # Maintain backward compatibility in case someone sets it.
+    @orig_filename.setter
+    def orig_filename(self, value):
+        self._orig_filename = value
+
     # Maintain backward compatibility with the old protected attribute name.
     @property
     def _compresslevel(self):
@@ -579,9 +589,9 @@ def _encodeFilenameFlags(self):
         else:
             encoding = 'cp437'
         try:
-            return self.filename.encode(encoding), self.flag_bits & ~_MASK_UTF_FILENAME
+            return self.orig_filename.encode(encoding), self.flag_bits & ~_MASK_UTF_FILENAME
         except UnicodeEncodeError:
-            return self.filename.encode('utf-8'), self.flag_bits | _MASK_UTF_FILENAME
+            return self.orig_filename.encode('utf-8'), self.flag_bits | _MASK_UTF_FILENAME
 
     def _decodeExtra(self, filename_crc):
         # Try to decode the extra field.
@@ -2056,6 +2066,7 @@ def _RealGetContents(self):
                 filename = filename.decode(self.metadata_encoding or 'cp437')
             # Create ZipInfo instance to store file information
             x = ZipInfo(filename)
+            x._orig_filename = filename
             x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
             x.comment = fp.read(centdir[_CD_COMMENT_LENGTH])
             x.header_offset = centdir[_CD_LOCAL_HEADER_OFFSET]