Fix Windows file name validation in Zip.swift

vapor-community · Oct 2, 2024 · ac17fc7 · ac17fc7
1 parent 1e23b68
commit ac17fc7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Sources/Zip/Zip.swift b/Sources/Zip/Zip.swift
@@ -96,8 +96,9 @@ public class Zip {
             var pathString = String(cString: fileName)
 
             #if os(Windows)
-            // Colons are not allowed in Windows file names.
-            pathString = pathString.replacingOccurrences(of: ":", with: "_")
+            guard pathString.rangeOfCharacter(from: ["<", ">", ":", "\"", "/", "\\", "|", "?", "*",]) == nil else {
+                throw ZipError.unzipFail
+            }
             #endif
 
             guard !pathString.isEmpty else {

diff --git a/Tests/ZipTests/ZipTests.swift b/Tests/ZipTests/ZipTests.swift
@@ -362,6 +362,10 @@ final class ZipTests: XCTestCase {
 
     // Tests if https://github.com/vapor-community/Zip/issues/4 does not occur anymore.
     func testRoundTripping() throws {
+        #if os(Windows)
+        XCTExpectFailure("This Zip file contains reserved characters that are not allowed on Windows.")
+        #endif
+
         // "prod-apple-swift-metrics-main-e6a00d36.zip" is the original zip file from the issue.
         let zipFilePath = url(forResource: "prod-apple-swift-metrics-main-e6a00d36", withExtension: "zip")!
         let failDestinationPath = try autoRemovingSandbox()