Skip to content

Commit

Permalink
vuln-fix: Zip Slip Vulnerability (#536)
Browse files Browse the repository at this point in the history
* 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>

Signed-off-by: Eddie Hung <eddie.hung@amd.com>

Conflicts:
	test/RapidWrightDCP

* Update src/com/xilinx/rapidwright/util/Installer.java

Signed-off-by: Chris Lavin <chris.lavin@xilinx.com>

Signed-off-by: Chris Lavin <chris.lavin@xilinx.com>
Co-authored-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Co-authored-by: Chris Lavin <clavin@xilinx.com>
  • Loading branch information
3 people authored Sep 16, 2022
1 parent a9f09a5 commit acbe053
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/com/xilinx/rapidwright/util/Installer.java
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ public static void unzipFile(String zipFile, String destDir) {
ZipEntry ze = zis.getNextEntry();
while(ze != null){
String fileName = ze.getName();
File newFile = new File(destDir + File.separator + fileName);
File newFile = new File(destDir, fileName);
if(!newFile.toPath().normalize().startsWith(destDir)) {
throw new RuntimeException("Bad zip entry");
}
System.out.println("Unzipping to "+newFile.getAbsolutePath());

if(ze.isDirectory()){
Expand Down

0 comments on commit acbe053

Please sign in to comment.