Skip to content

Commit 4c997a2

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 23ee1ee commit 4c997a2

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/main/java/com/qbb/util/FileUnZipUtil.java

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public static void uncompress(File jarFile, File tarDir) throws IOException {
3333
while (enumEntry.hasMoreElements()) {
3434
JarEntry jarEntry = (JarEntry)enumEntry.nextElement();
3535
File tarFile = new File(tarDir, jarEntry.getName());
36+
if (!tarFile.toPath().normalize().startsWith(tarDir.toPath().normalize())) {
37+
throw new IOException("Bad zip entry");
38+
}
3639
if(jarEntry.getName().contains("META-INF")){
3740
File miFile = new File(tarDir, "META-INF");
3841
if(!miFile.exists()){

0 commit comments

Comments
 (0)