From ae73ca77b909ba7192fc019bfaec986ecaed2e69 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Mon, 3 Oct 2022 21:21:08 +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 --- .../dependency/impl/services/utils/UnzipUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/utils/UnzipUtil.java b/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/utils/UnzipUtil.java index be15ad6025..9b61e2326f 100644 --- a/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/utils/UnzipUtil.java +++ b/dependency-management/dependency-management-impl/src/main/java/io/cloudslang/dependency/impl/services/utils/UnzipUtil.java @@ -37,7 +37,11 @@ public static void unzipToFolder(String folderPath, InputStream source) { if(ze.isDirectory()) { new File(mavenHome, ze.getName()).mkdirs(); } else { - try (FileOutputStream fos = new FileOutputStream(new File(mavenHome, ze.getName()))) { + final File zipEntryFile = new File(mavenHome, ze.getName()); + if (!zipEntryFile.toPath().normalize().startsWith(mavenHome.toPath().normalize())) { + throw new IOException("Bad zip entry"); + } + try (FileOutputStream fos = new FileOutputStream(zipEntryFile)) { int len; while ((len = zio.read(buffer)) > 0) {