From 15a5dade2cadd779c61419474c3b59ac767664e2 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Sat, 30 Jul 2022 00:13:31 +0000 Subject: [PATCH] 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 Signed-off-by: Jonathan Leitschuh Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/16 Co-authored-by: Moderne --- src/main/java/com/gluonhq/substrate/util/FileOps.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/gluonhq/substrate/util/FileOps.java b/src/main/java/com/gluonhq/substrate/util/FileOps.java index 9c9d38159..5ec3eaead 100644 --- a/src/main/java/com/gluonhq/substrate/util/FileOps.java +++ b/src/main/java/com/gluonhq/substrate/util/FileOps.java @@ -596,6 +596,9 @@ public static Map unzipFile(Path sourceZip, Path targetDir) thro ZipEntry zipEntry; while ((zipEntry = zis.getNextEntry()) != null) { Path destPath = targetDir.resolve(zipEntry.getName()); + if (!destPath.normalize().startsWith(targetDir.normalize())) { + throw new RuntimeException("Bad zip entry"); + } if (zipEntry.isDirectory()) { if (!Files.exists(destPath)) { Files.createDirectories(destPath);