Skip to content

Commit 18810fc

Browse files
JLLeitschuhTeamModerne
authored andcommitted
Cherrypick - 47afa2c to 7.5 release
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: JLLeitschuh/security-research#16 Co-authored-by: Moderne <team@moderne.io>
1 parent f264982 commit 18810fc

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Diff for: testng-core/src/main/java/org/testng/JarFileUtils.java

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ private boolean testngXmlExistsInJar(File jarFile, List<String> classes) throws
7676
if (Parser.canParse(jeName.toLowerCase())) {
7777
InputStream inputStream = jf.getInputStream(je);
7878
File copyFile = new File(file, jeName);
79+
if (!copyFile.toPath().normalize().startsWith(file.toPath().normalize())) {
80+
throw new IOException("Bad zip entry");
81+
}
82+
copyFile.getParentFile().mkdirs();
7983
Files.copyFile(inputStream, copyFile);
8084
if (matchesXmlPathInJar(je)) {
8185
suitePath = copyFile.toString();

0 commit comments

Comments
 (0)