From 3582c6ed2200b86df705c2ca51c83cd65ef3cac7 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 29 Jul 2022 19:16:53 +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 --- marytts-common/src/main/java/marytts/util/io/FileUtils.java | 4 ++++ .../java/marytts/tools/install/ComponentDescription.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/marytts-common/src/main/java/marytts/util/io/FileUtils.java b/marytts-common/src/main/java/marytts/util/io/FileUtils.java index a205a56267..9ec9d493a1 100644 --- a/marytts-common/src/main/java/marytts/util/io/FileUtils.java +++ b/marytts-common/src/main/java/marytts/util/io/FileUtils.java @@ -749,6 +749,10 @@ private static void unzipEntry(ZipFile zipfile, ZipEntry entry, File outputDir) } File outputFile = new File(outputDir, entry.getName()); + + if (!outputFile.toPath().normalize().startsWith(outputDir.toPath())) { + throw new RuntimeException("Bad zip entry"); + } if (!outputFile.getParentFile().exists()) { createDir(outputFile.getParentFile()); } diff --git a/marytts-runtime/src/main/java/marytts/tools/install/ComponentDescription.java b/marytts-runtime/src/main/java/marytts/tools/install/ComponentDescription.java index 038b83394f..bb418507c3 100644 --- a/marytts-runtime/src/main/java/marytts/tools/install/ComponentDescription.java +++ b/marytts-runtime/src/main/java/marytts/tools/install/ComponentDescription.java @@ -832,7 +832,10 @@ public void run() { while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); files.add(entry.getName()); // add to installed filelist; rely on uninstaller retaining shared files - File newFile = new File(maryBase + "/" + entry.getName()); + File newFile = new File(maryBase, entry.getName()); + if (!newFile.toPath().normalize().startsWith(maryBase)) { + throw new RuntimeException("Bad zip entry"); + } if (entry.isDirectory()) { System.err.println("Extracting directory: " + entry.getName()); newFile.mkdir();