Skip to content

[SECURITY] Fix Zip Slip Vulnerability #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JLLeitschuh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SECURITY] Fix Zip Slip Vulnerability #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/java/com/threerings/getdown/tools/Patcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ protected void patchFile (ZipFile file, ZipEntry entry, File appdir, String path
{
File target = new File(appdir, path);
File patch = new File(appdir, entry.getName());
if (!patch.toPath().normalize().startsWith(appdir.toPath().normalize())) {
throw new RuntimeException("Bad zip entry");
}
File otarget = new File(appdir, path + ".old");
JarDiffPatcher patcher = null;

Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/com/threerings/getdown/util/FileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ public static void unpackJar (ZipFile jar, File target, boolean cleanExistingDir
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
File efile = new File(target, entry.getName());
if (!efile.toPath().normalize().startsWith(target.toPath().normalize())) {
throw new IOException("Bad zip entry");
}

// if we're unpacking a normal jar file, it will have special path
// entries that allow us to create our directories first
Expand Down