From ec64d8ab638d84e1149d79cc7be8685b375ee34a Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 29 Jul 2022 22:17:06 +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 --- src/test/java/io/scif/util/DefaultSampleFilesService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/io/scif/util/DefaultSampleFilesService.java b/src/test/java/io/scif/util/DefaultSampleFilesService.java index b9e9f437e..548a47018 100644 --- a/src/test/java/io/scif/util/DefaultSampleFilesService.java +++ b/src/test/java/io/scif/util/DefaultSampleFilesService.java @@ -159,6 +159,9 @@ private void downloadAndUnpackResource(final Location source, if (entry == null) break; // All done! final String name = entry.getName(); final File outFile = new File(targetFolder, name); + if (!outFile.toPath().normalize().startsWith(targetFolder.toPath().normalize())) { + throw new RuntimeException("Bad zip entry"); + } if (entry.isDirectory()) { outFile.mkdirs(); }