Merge pull request #152 from BulkSecurityGeneratorProjectV2/fix/JLL/z…

…ip-slip-vulnerability [SECURITY] Fix Zip Slip Vulnerability
FederatedAI · Aug 2, 2022 · 06f3c5e · 06f3c5e
2 parents cc099bb + 1776cd6
commit 06f3c5e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/fate-serving-common/src/main/java/com/webank/ai/fate/serving/common/utils/ZipUtil.java b/fate-serving-common/src/main/java/com/webank/ai/fate/serving/common/utils/ZipUtil.java
@@ -54,7 +54,11 @@ public static String unzip(File zipFile, String outputDirectory) throws Exceptio
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
 
-                File outputFile = new File(outputDirectory + uuid + File.separator + entry.getName());
+                File outputFile = new File(outputDirectory + uuid, entry.getName());
+
+                if (!outputFile.toPath().normalize().startsWith(outputDirectory + uuid)) {
+                    throw new RuntimeException("Bad zip entry");
+                }
                 if (entry.isDirectory()) {
                     outputFile.mkdirs();
                     continue;