Skip to content

Commit 15c2c15

Browse files
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 b070be3 commit 15c2c15

File tree

1 file changed

+3
-0
lines changed
  • tools/cli/src/main/java/org/apache/batchee/cli/zip

1 file changed

+3
-0
lines changed

tools/cli/src/main/java/org/apache/batchee/cli/zip/Zips.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ public static void unzip(final File zipFile, final File destination) throws IOEx
4444
while ((entry = in.getNextEntry()) != null) {
4545
final String path = entry.getName();
4646
final File file = new File(destination, path);
47+
if (!file.toPath().normalize().startsWith(destination.toPath().normalize())) {
48+
throw new IOException("Bad zip entry");
49+
}
4750

4851
if (entry.isDirectory()) {
4952
continue;

0 commit comments

Comments
 (0)