Skip to content

Commit c24c8db

Browse files
[SECURITY] Fix Zip Slip Vulnerability (#246)
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 9a5b918 commit c24c8db

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/main/java/winstone/HostConfiguration.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,12 @@ protected File getWebRoot(File requestedWebroot, File warfile) throws IOExceptio
280280

281281
// If archive date is newer than unzipped file, overwrite
282282
File outFile = new File(unzippedDir, elemName);
283+
284+
// Fix Zip Slip vulnerability
285+
if (!outFile.toPath().normalize().startsWith(unzippedDir.toPath().normalize())) {
286+
throw new IOException("Bad zip entry");
287+
}
288+
283289
if (outFile.exists() && (outFile.lastModified() > warfile.lastModified())) {
284290
continue;
285291
}

0 commit comments

Comments
 (0)