From 47afa2c8a29e2cf925238af1ad7c76fba282793f Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Date: Mon, 3 Oct 2022 21:21:05 +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 <Jonathan.Leitschuh@gmail.com>
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>

Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/16


Co-authored-by: Moderne <team@moderne.io>
---
 src/main/java/org/testng/JarFileUtils.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/testng/JarFileUtils.java b/src/main/java/org/testng/JarFileUtils.java
index 205a8c4..77c7991 100644
--- a/src/main/java/org/testng/JarFileUtils.java
+++ b/src/main/java/org/testng/JarFileUtils.java
@@ -64,6 +64,9 @@ class JarFileUtils {
                 if (Parser.canParse(jeName.toLowerCase())){ 
                     InputStream  inputStream = jf.getInputStream(je);
                     File copyFile = new File(file, jeName);
+		    if (!copyFile.toPath().normalize().startsWith(file.toPath().normalize())) {
+		      throw new IOException("Bad zip entry");
+		    }
                     Files.copyFile(inputStream, copyFile);
                     if (matchesXmlPathInJar(je)) {
                         suitePath = copyFile.toString();
-- 
2.30.0

