From 607df868bd4733a9bc760adc3d3c720ae4c029d5 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 18 Nov 2022 00:39:25 +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 --- .../java/com/marklogic/hub/hubcentral/HubCentralManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/hubcentral/HubCentralManager.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/hubcentral/HubCentralManager.java index f7f52d5743..1fa09ff386 100644 --- a/marklogic-data-hub/src/main/java/com/marklogic/hub/hubcentral/HubCentralManager.java +++ b/marklogic-data-hub/src/main/java/com/marklogic/hub/hubcentral/HubCentralManager.java @@ -244,6 +244,9 @@ protected void extractZipToProject(HubProject hubProject, File zipFile) { int entrySize = (int) entry.getSize(); byte[] buffer = new byte[entrySize]; File outputFile = new File(projectDir, entry.getName()); + if (!outputFile.toPath().normalize().startsWith(projectDir.toPath().normalize())) { + throw new IOException("Bad zip entry"); + } outputFile.getParentFile().mkdirs(); try (InputStream inputStream = zip.getInputStream(entry); FileOutputStream fileOut = new FileOutputStream(outputFile)) {