Skip to content
This repository was archived by the owner on Aug 19, 2022. It is now read-only.

Commit 52d85f1

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 f75bbfd commit 52d85f1

File tree

1 file changed

+3
-0
lines changed
  • src/main/java/ch/digitalfondue/stampo/command

1 file changed

+3
-0
lines changed

src/main/java/ch/digitalfondue/stampo/command/New.java

+3
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ public void run() {
128128

129129
private void extractFile(Path outputPath, ZipEntry ze, InputStream zip) {
130130
Path destinationPath = outputPath.resolve(ze.getName());
131+
if (!destinationPath.normalize().startsWith(outputPath.normalize())) {
132+
throw new RuntimeException("Bad zip entry");
133+
}
131134
try {
132135
Files.createDirectories(destinationPath.getParent());
133136
Files.copy(zip, destinationPath);

0 commit comments

Comments
 (0)