From 04db77ceddf26eb9e3255aec93cde320e7b96415 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Wed, 21 Sep 2022 15:27:23 +0000 Subject: [PATCH] vuln-fix: Partial Path Traversal Vulnerability 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 --- .../main/java/thredds/cataloggen/config/LocalDatasetSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/src/main/java/thredds/cataloggen/config/LocalDatasetSource.java b/legacy/src/main/java/thredds/cataloggen/config/LocalDatasetSource.java index fb2835750a..d6c7b77c04 100644 --- a/legacy/src/main/java/thredds/cataloggen/config/LocalDatasetSource.java +++ b/legacy/src/main/java/thredds/cataloggen/config/LocalDatasetSource.java @@ -108,7 +108,7 @@ private void checkAccessPoint() throws IOException { // Check that accessPoint file starts with accessPointHeader. if (!apFile.getPath().startsWith(aphFile.getPath()) - && !apFile.getCanonicalPath().startsWith(aphFile.getCanonicalPath())) { + && !apFile.getCanonicalFile().toPath().startsWith(aphFile.getCanonicalFile().toPath())) { String tmpMsg = "The accessPoint <" + apFile.getPath() + " or " + apFile.getCanonicalPath() + "> must start with the accessPointHeader <" + aphFile.getPath() + " or " + aphFile.getCanonicalPath() + ">.";