Skip to content

Commit

Permalink
vuln-fix: Zip Slip Vulnerability
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
JLLeitschuh and TeamModerne committed Aug 8, 2022
1 parent 2e5a20b commit 52957b0
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion jbake-core/src/main/java/org/jbake/app/ZipUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ public static void extract(InputStream is, File outputFolder) throws IOException
byte[] buffer = new byte[1024];

while ((entry = zis.getNextEntry()) != null) {
File outputFile = new File(outputFolder.getCanonicalPath() + File.separatorChar + entry.getName());
File outputFile = new File(outputFolder.getCanonicalPath(), entry.getName());
if (!outputFile.toPath().normalize().startsWith(outputFolder.getCanonicalPath())) {
throw new RuntimeException("Bad zip entry");
}
File outputParent = new File(outputFile.getParent());
outputParent.mkdirs();

Expand Down

0 comments on commit 52957b0

Please sign in to comment.