From 5013235937636ba00bf3439374842a7588c86452 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Thu, 8 Sep 2022 09:34:46 -0400 Subject: [PATCH] vuln-fix: Partial Path Traversal Vulnerability (#466) This fixes a partial path traversal vulnerability. 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())`. To demonstrate this vulnerability, 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: Medium CVSSS: 6.1 Detection: CodeQL & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.PartialPathTraversalVulnerability) Reported-by: Jonathan Leitschuh Signed-off-by: Jonathan Leitschuh Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/13 Co-authored-by: Moderne Co-authored-by: Moderne --- src/main/java/net/lingala/zip4j/util/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/lingala/zip4j/util/FileUtils.java b/src/main/java/net/lingala/zip4j/util/FileUtils.java index b6206c4a..646250d8 100644 --- a/src/main/java/net/lingala/zip4j/util/FileUtils.java +++ b/src/main/java/net/lingala/zip4j/util/FileUtils.java @@ -222,7 +222,7 @@ public static String getRelativeFileName(File fileToAdd, ZipParameters zipParame String rootPath = new File(fileToAdd.getParentFile().getCanonicalFile().getPath() + File.separator + fileToAdd.getCanonicalFile().getName()).getPath(); tmpFileName = rootPath.substring(rootFolderFileRef.length()); } else { - if (!fileCanonicalPath.startsWith(rootFolderFileRef)) { + if (!fileToAdd.getCanonicalFile().toPath().startsWith(rootFolderFileRef)) { tmpFileName = fileToAdd.getCanonicalFile().getParentFile().getName() + FILE_SEPARATOR + fileToAdd.getCanonicalFile().getName(); } else { tmpFileName = fileCanonicalPath.substring(rootFolderFileRef.length());