File size: 2,001 Bytes
62cfde8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | diff --git a/frontend/archive/src/main/java/org/pytorch/serve/archive/utils/ZipUtils.java b/frontend/archive/src/main/java/org/pytorch/serve/archive/utils/ZipUtils.java
index c27eae6..62e625f 100644
--- a/frontend/archive/src/main/java/org/pytorch/serve/archive/utils/ZipUtils.java
+++ b/frontend/archive/src/main/java/org/pytorch/serve/archive/utils/ZipUtils.java
@@ -28,8 +28,15 @@ public final class ZipUtils {
try (ZipInputStream zis = new ZipInputStream(is)) {
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
- String name = entry.getName();
- File file = new File(dest, name);
+ File file = new File(dest, entry.getName());
+ File canonicalDestDir = dest.getCanonicalFile();
+ File canonicalFile = file.getCanonicalFile();
+
+ // Check for Zip Slip vulnerability
+ if (!canonicalFile.getPath().startsWith(canonicalDestDir.getPath())) {
+ throw new IOException("Detected Zip Slip vulnerability: " + entry.getName());
+ }
+
if (entry.isDirectory()) {
FileUtils.forceMkdir(file);
} else {
@@ -108,6 +115,14 @@ public final class ZipUtils {
while ((entry = tis.getNextEntry()) != null) {
String name = entry.getName().substring(entry.getName().indexOf('/') + 1);
File file = new File(dest, name);
+ File canonicalDestDir = dest.getCanonicalFile();
+ File canonicalFile = file.getCanonicalFile();
+
+ // Check for Zip Slip vulnerability
+ if (!canonicalFile.getPath().startsWith(canonicalDestDir.getPath())) {
+ throw new IOException("Detected Zip Slip vulnerability: " + entry.getName());
+ }
+
if (entry.isDirectory()) {
FileUtils.forceMkdir(file);
} else {
|