From 700eb9f7ed2433cfc09c17320812d505b773a4cb Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Wed, 7 Sep 2022 05:41:26 -0400 Subject: [PATCH] vuln-fix: Zip Slip Vulnerability (#892) 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 Co-authored-by: Moderne --- .../main/java/org/ngrinder/common/util/CompressionUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ngrinder-core/src/main/java/org/ngrinder/common/util/CompressionUtils.java b/ngrinder-core/src/main/java/org/ngrinder/common/util/CompressionUtils.java index 4bad6814a1..9d13526fe9 100644 --- a/ngrinder-core/src/main/java/org/ngrinder/common/util/CompressionUtils.java +++ b/ngrinder-core/src/main/java/org/ngrinder/common/util/CompressionUtils.java @@ -119,6 +119,10 @@ public static void unzip(InputStream is, File destDir, String charsetName) { String fileName = ze.getName(); File newFile = new File(destDir.getAbsolutePath(), fileName); + + if (!newFile.toPath().normalize().startsWith(destDir.getAbsolutePath())) { + throw new RuntimeException("Bad zip entry"); + } if (newFile.getPath().contains("..")) { throw new IllegalArgumentException("zip entry should not contain .. in the path."); }