#81 Use System file separator in file names

srikanth-lingala · Oct 14, 2019 · d550afa · d550afa
1 parent 94727e9
commit d550afa
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.lingala.zip4j</groupId>
     <artifactId>zip4j</artifactId>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.2.3.4-SNAPSHOT</version>
 
     <name>Zip4j</name>
     <description>Zip4j - A Java library for zip files and streams</description>

diff --git a/src/main/java/net/lingala/zip4j/tasks/AbstractExtractFileTask.java b/src/main/java/net/lingala/zip4j/tasks/AbstractExtractFileTask.java
@@ -13,6 +13,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.regex.Matcher;
 
 import static net.lingala.zip4j.util.InternalZipConstants.BUFF_SIZE;
 import static net.lingala.zip4j.util.InternalZipConstants.FILE_SEPARATOR;
@@ -27,44 +28,38 @@ public AbstractExtractFileTask(ProgressMonitor progressMonitor, boolean runInThr
     this.zipModel = zipModel;
   }
 
-  protected void extractFile(ZipInputStream zipInputStream, FileHeader fileHeader, String outPath, String newFileName,
-                             ProgressMonitor progressMonitor) throws IOException {
+  protected void extractFile(ZipInputStream zipInputStream, FileHeader fileHeader, String outputPath,
+                             String newFileName, ProgressMonitor progressMonitor) throws IOException {
 
-    progressMonitor.setFileName(fileHeader.getFileName());
-
-    if (!outPath.endsWith(FILE_SEPARATOR)) {
-      outPath += FILE_SEPARATOR;
+    if (!outputPath.endsWith(FILE_SEPARATOR)) {
+      outputPath += FILE_SEPARATOR;
     }
 
+    File outputFile = determineOutputFile(fileHeader, outputPath, newFileName);
+    progressMonitor.setFileName(outputFile.getAbsolutePath());
+
     // make sure no file is extracted outside of the target directory (a.k.a zip slip)
-    String fileName = fileHeader.getFileName();
-    String completePath = outPath + fileName;
-    if (!new File(completePath).getCanonicalPath().startsWith(new File(outPath).getCanonicalPath())) {
+    if (!outputFile.getCanonicalPath().startsWith(new File(outputPath).getCanonicalPath())) {
       throw new ZipException("illegal file name that breaks out of the target directory: "
           + fileHeader.getFileName());
     }
 
     verifyNextEntry(zipInputStream, fileHeader);
 
     if (fileHeader.isDirectory()) {
-      File file = new File(completePath);
-      if (!file.exists()) {
-        if (!file.mkdirs()) {
-          throw new ZipException("Could not create directory: " + file);
+      if (!outputFile.exists()) {
+        if (!outputFile.mkdirs()) {
+          throw new ZipException("Could not create directory: " + outputFile);
         }
       }
     } else {
-      checkOutputDirectoryStructure(fileHeader, outPath, newFileName);
-      unzipFile(zipInputStream, fileHeader, outPath, newFileName, progressMonitor);
+      checkOutputDirectoryStructure(outputFile);
+      unzipFile(zipInputStream, fileHeader, outputFile, progressMonitor);
     }
   }
 
-  private void unzipFile(ZipInputStream inputStream, FileHeader fileHeader, String outputPath, String newFileName,
+  private void unzipFile(ZipInputStream inputStream, FileHeader fileHeader, File outputFile,
                          ProgressMonitor progressMonitor) throws IOException {
-
-    String outputFileName = Zip4jUtil.isStringNotNullAndNotEmpty(newFileName) ? newFileName : fileHeader.getFileName();
-    File outputFile = new File(outputPath + System.getProperty("file.separator") + outputFileName);
-
     int readLength;
     try (OutputStream outputStream = new FileOutputStream(outputFile)) {
       while ((readLength = inputStream.read(buff)) != -1) {
@@ -95,24 +90,25 @@ private void verifyNextEntry(ZipInputStream zipInputStream, FileHeader fileHeade
     }
   }
 
-  private void checkOutputDirectoryStructure(FileHeader fileHeader, String outPath, String newFileName)
-      throws ZipException {
+  private void checkOutputDirectoryStructure(File outputFile) throws ZipException {
+    if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs()) {
+      throw new ZipException("Unable to create parent directories: " + outputFile.getParentFile());
+    }
+  }
 
-    String fileName = fileHeader.getFileName();
+  private File determineOutputFile(FileHeader fileHeader, String outputPath, String newFileName) {
+    String outputFileName;
     if (Zip4jUtil.isStringNotNullAndNotEmpty(newFileName)) {
-      fileName = newFileName;
+      outputFileName = newFileName;
+    } else {
+      outputFileName = getFileNameWithSystemFileSeparators(fileHeader.getFileName()); // replace all slashes with file separator
     }
 
-    if (!Zip4jUtil.isStringNotNullAndNotEmpty(fileName)) {
-      // Do nothing
-      return;
-    }
+    return new File(outputPath + FILE_SEPARATOR + outputFileName);
+  }
 
-    String compOutPath = outPath + fileName;
-    File file = new File(compOutPath);
-    if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
-      throw new ZipException("Unable to create parent directories: " + file.getParentFile());
-    }
+  private String getFileNameWithSystemFileSeparators(String fileNameToReplace) {
+    return fileNameToReplace.replaceAll("[/\\\\]", Matcher.quoteReplacement(FILE_SEPARATOR));
   }
 
   @Override