Skip to content

Commit 249e679

Browse files
JLLeitschuhTeamModerne
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Leitschuh <[email protected]> Bug-tracker: JLLeitschuh/security-research#16 Co-authored-by: Moderne <[email protected]>
1 parent aff693c commit 249e679

File tree

1 file changed

+5
-1
lines changed
  • wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util

1 file changed

+5
-1
lines changed

wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ public static File getResource( final String path )
9191
for ( Enumeration<JarEntry> en = jf.entries(); en.hasMoreElements(); )
9292
{
9393
JarEntry je = en.nextElement();
94-
File target = new File( base, je.getName() ).getAbsoluteFile();
94+
final File zipEntryFile = new File( base, je.getName() );
95+
if (!zipEntryFile.toPath().normalize().startsWith(base.toPath().normalize())) {
96+
throw new IOException("Bad zip entry");
97+
}
98+
File target = zipEntryFile.getAbsoluteFile();
9599
if ( je.isDirectory() )
96100
{
97101
target.mkdirs();

0 commit comments

Comments
 (0)