From cf0983f8a54c562b691ed9421ab3d8f7ec2b67c5 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 29 Jul 2022 19:15:30 +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 --- .../selenium/extension/DesiredCapabilitiesBean.java | 6 +++++- .../jspringbot/selenium/extension/FirefoxOptionsBean.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/main/java/com/jspringbot/selenium/extension/DesiredCapabilitiesBean.java mode change 100755 => 100644 src/main/java/com/jspringbot/selenium/extension/FirefoxOptionsBean.java diff --git a/src/main/java/com/jspringbot/selenium/extension/DesiredCapabilitiesBean.java b/src/main/java/com/jspringbot/selenium/extension/DesiredCapabilitiesBean.java old mode 100755 new mode 100644 index 0db5fd7..0d7ee93 --- a/src/main/java/com/jspringbot/selenium/extension/DesiredCapabilitiesBean.java +++ b/src/main/java/com/jspringbot/selenium/extension/DesiredCapabilitiesBean.java @@ -244,7 +244,11 @@ public static File unzip(InputStream in, File dir) throws IOException { ZipEntry entry; while((entry = zin.getNextEntry()) != null) { FileOutputStream out = null; - entryFile = new File(dir, entry.getName()); + final File zipEntryFile = new File(dir, entry.getName()); + if (!zipEntryFile.toPath().normalize().startsWith(dir.toPath())) { + throw new RuntimeException("Bad zip entry"); + } + entryFile =zipEntryFile; try { out = new FileOutputStream(entryFile); diff --git a/src/main/java/com/jspringbot/selenium/extension/FirefoxOptionsBean.java b/src/main/java/com/jspringbot/selenium/extension/FirefoxOptionsBean.java old mode 100755 new mode 100644 index 82b1e4e..88492bd --- a/src/main/java/com/jspringbot/selenium/extension/FirefoxOptionsBean.java +++ b/src/main/java/com/jspringbot/selenium/extension/FirefoxOptionsBean.java @@ -135,7 +135,11 @@ public static File unzip(InputStream in, File dir) throws IOException { ZipEntry entry; while((entry = zin.getNextEntry()) != null) { FileOutputStream out = null; - entryFile = new File(dir, entry.getName()); + final File zipEntryFile = new File(dir, entry.getName()); + if (!zipEntryFile.toPath().normalize().startsWith(dir.toPath())) { + throw new RuntimeException("Bad zip entry"); + } + entryFile =zipEntryFile; try { out = new FileOutputStream(entryFile);