Skip to content

Commit 639c2ed

Browse files
vuln-fix: Zip Slip Vulnerability
This fixes a Zip-Slip vulnerability. This change does one of two things. This change either 1. Inserts a guard to protect against Zip Slip. OR 2. Replaces `dir.getCanonicalPath().startsWith(parent.getCanonicalPath())`, which is vulnerable to partial path traversal attacks, with the more secure `dir.getCanonicalFile().toPath().startsWith(parent.getCanonicalFile().toPath())`. For number 2, consider `"/usr/outnot".startsWith("/usr/out")`. The check is bypassed although `/outnot` is not under the `/out` directory. It's important to understand that the terminating slash may be removed when using various `String` representations of the `File` object. For example, on Linux, `println(new File("/var"))` will print `/var`, but `println(new File("/var", "/")` will print `/var/`; however, `println(new File("/var", "/").getCanonicalPath())` will print `/var`. Weakness: CWE-22: Improper Limitation of a Pathname to a Restricted Directory ('Path Traversal') Severity: High CVSSS: 7.4 Detection: CodeQL (https://codeql.github.com/codeql-query-help/java/java-zipslip/) & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.ZipSlip) Reported-by: Jonathan Leitschuh <[email protected]> Signed-off-by: Jonathan Leitschuh <[email protected]> Bug-tracker: JLLeitschuh/security-research#16 Co-authored-by: Moderne <[email protected]>
1 parent 96a459e commit 639c2ed

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

test/org/jetbrains/java/decompiler/BulkDecompilationTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ private static void unpack(File archive, File targetDir) {
7676
ZipEntry entry = entries.nextElement();
7777
if (!entry.isDirectory()) {
7878
File file = new File(targetDir, entry.getName());
79+
if (!file.toPath().normalize().startsWith(targetDir.toPath().normalize())) {
80+
throw new RuntimeException("Bad zip entry");
81+
}
7982
assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
8083
try (InputStream in = zip.getInputStream(entry); OutputStream out = new FileOutputStream(file)) {
8184
InterpreterUtil.copyStream(in, out);
@@ -87,4 +90,4 @@ private static void unpack(File archive, File targetDir) {
8790
throw new RuntimeException(e);
8891
}
8992
}
90-
}
93+
}

0 commit comments

Comments
 (0)