MC-34749: Improve zip archive filename validation

StasKozar · StasKozar · commit 8e4a962c297e · 2020-06-02T15:59:18.000+03:00
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -69,6 +69,14 @@ public function unpack($source, $destination)
         return $destination;
     }
 
+    /**
+     * Retrieve filename for import from zip archive.
+     *
+     * @param \ZipArchive $zip
+     * @param string $baseName
+     *
+     * @return string
+     */
     private function getFilenameFromZip(\ZipArchive $zip, string $baseName): string
     {
         $index = 0;

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,14 @@ public function unpack($source, $destination)`
`69`	`69`	`return $destination;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ /**`
	`73`	`+ * Retrieve filename for import from zip archive.`
	`74`	`+ *`
	`75`	`+ * @param \ZipArchive $zip`
	`76`	`+ * @param string $baseName`
	`77`	`+ *`
	`78`	`+ * @return string`
	`79`	`+ */`
`72`	`80`	`private function getFilenameFromZip(\ZipArchive $zip, string $baseName): string`
`73`	`81`	`{`
`74`	`82`	`$index = 0;`