From 7152db75db232144f85d7f6e07f1d4fa71fbd8be Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Fri, 4 Nov 2022 15:06:24 +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 --- .../org/jivesoftware/openfire/container/PluginMonitor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java index 15905b6be7..0f86f1376a 100644 --- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java +++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java @@ -479,7 +479,10 @@ private boolean unzipPlugin( String pluginName, Path file, Path dir ) for ( Enumeration e = zipFile.entries(); e.hasMoreElements(); ) { JarEntry entry = (JarEntry) e.nextElement(); - Path entryFile = dir.resolve( entry.getName() ); // ignore possibility for zipslip as this is sanitized for if property is enabled lgtm [java/zipslip] + Path entryFile = dir.resolve( entry.getName() ); + if (!entryFile.normalize().startsWith(dir.normalize())) { + throw new IOException("Bad zip entry"); + } // ignore possibility for zipslip as this is sanitized for if property is enabled lgtm [java/zipslip] // Ignore any manifest.mf entries. if ( entry.getName().toLowerCase().endsWith( "manifest.mf" ) ) {