Skip to content

Commit 3283da0

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 <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 afa1d23 commit 3283da0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

AndResGuard-core/src/main/java/com/tencent/mm/util/FileOperation.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,11 @@ public static HashMap<String, Integer> unZipAPk(String fileName, String filePath
160160
}
161161
BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
162162

163-
File file = new File(filePath + File.separator + entry.getName());
163+
File file = new File(filePath, entry.getName());
164+
165+
if (!file.toPath().normalize().startsWith(filePath)) {
166+
throw new RuntimeException("Bad zip entry");
167+
}
164168

165169
File parent = file.getParentFile();
166170
if (parent != null && (!parent.exists())) {

0 commit comments

Comments
 (0)