From 402d7f84a0a8c95b5b45f29bef98c6954314553b Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 4 Nov 2022 16:32:18 +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 --- .../src/com/archimatetool/editor/actions/MRUMenuManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/actions/MRUMenuManager.java b/com.archimatetool.editor/src/com/archimatetool/editor/actions/MRUMenuManager.java index fd21889cd..9fad911af 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/actions/MRUMenuManager.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/actions/MRUMenuManager.java @@ -187,7 +187,7 @@ boolean isTempFile(File file) { // File is in temp folder try { File tmpDir = new File(System.getProperty("java.io.tmpdir")); - return file.getCanonicalPath().startsWith(tmpDir.getCanonicalPath()); + return file.getCanonicalFile().toPath().startsWith(tmpDir.getCanonicalFile().toPath()); } catch(IOException ex) { ex.printStackTrace();