Skip to content
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

[SECURITY] Fix Temporary Directory Hijacking or Information Disclosure Vulnerability #147

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

[SECURITY] Fix Temporary Directory Hijacking or Information Disclosure Vulnerability #147

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
13 changes: 4 additions & 9 deletions src/test/java/org/zeroturnaround/zip/FilePermissionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

import org.junit.Assume;
import org.zeroturnaround.zip.commons.FileUtils;
Expand All @@ -31,9 +32,7 @@ public class FilePermissionsTest {
public void testPreserveExecuteFlag() throws Exception {
String dirName = "FilePermissionsTest-e";

File tmpDir = File.createTempFile(dirName, null);
tmpDir.delete();
tmpDir.mkdir();
File tmpDir = Files.createTempDirectory(dirName).toFile();
File fileA = new File(tmpDir, "fileA.txt");
File fileB = new File(tmpDir, "fileB.txt");
FileUtils.copyFile(testFile, fileA);
Expand Down Expand Up @@ -62,9 +61,7 @@ public void testPreserveExecuteFlag() throws Exception {
public void testPreserveReadFlag() throws Exception {
String dirName = "FilePermissionsTest-r";

File tmpDir = File.createTempFile(dirName, null);
tmpDir.delete();
tmpDir.mkdir();
File tmpDir = Files.createTempDirectory(dirName).toFile();
File fileA = new File(tmpDir, "fileA.txt");
File fileB = new File(tmpDir, "fileB.txt");
FileUtils.copyFile(testFile, fileA);
Expand Down Expand Up @@ -95,9 +92,7 @@ public void testPreserveReadFlag() throws Exception {
public void testPreserveWriteFlag() throws Exception {
String dirName = "FilePermissionsTest-w";

File tmpDir = File.createTempFile(dirName, null);
tmpDir.delete();
tmpDir.mkdir();
File tmpDir = Files.createTempDirectory(dirName).toFile();
File fileA = new File(tmpDir, "fileA.txt");
File fileB = new File(tmpDir, "fileB.txt");
FileUtils.copyFile(testFile, fileA, true);
Expand Down
9 changes: 3 additions & 6 deletions src/test/java/org/zeroturnaround/zip/MainExamplesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.zip.ZipEntry;

import junit.framework.TestCase;
Expand Down Expand Up @@ -52,19 +53,15 @@ public static void testUnpackEntry() throws IOException {
}

public static void testUnpack() throws IOException {
File tmpDir = File.createTempFile("prefix", "suffix");
tmpDir.delete();
tmpDir.mkdir();
File tmpDir = Files.createTempDirectory("prefix" + "suffix").toFile();
ZipUtil.unpack(new File(DEMO_ZIP), tmpDir);
File fooFile = new File(tmpDir, FOO_TXT);
assertTrue(fooFile.exists());
}

public static void testUnpackInPlace() throws Exception{
File demoFile = new File(DEMO_ZIP);
File outDir = File.createTempFile("prefix", "suffix");
outDir.delete();
outDir.mkdir();
File outDir = Files.createTempDirectory("prefix" + "suffix").toFile();

File outFile = new File(outDir, "demo");
FileOutputStream fio = new FileOutputStream(outFile);
Expand Down
35 changes: 8 additions & 27 deletions src/test/java/org/zeroturnaround/zip/ZipUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
Expand Down Expand Up @@ -687,10 +688,8 @@ public void process(InputStream in, ZipEntry zipEntry) throws IOException {

public void testUnwrapFile() throws Exception {
File dest = File.createTempFile("temp", null);
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
try {
destDir.delete();
destDir.mkdir();
String child = "TestFile.txt";
File parent = file(child).getParentFile();
ZipUtil.pack(parent, dest, true);
Expand All @@ -704,11 +703,9 @@ public void testUnwrapFile() throws Exception {

public void testUnwrapStream() throws Exception {
File dest = File.createTempFile("temp", null);
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
InputStream is = null;
try {
destDir.delete();
destDir.mkdir();
String child = "TestFile.txt";
File parent = file(child).getParentFile();
ZipUtil.pack(parent, dest, true);
Expand All @@ -724,10 +721,8 @@ public void testUnwrapStream() throws Exception {

public void testUnwrapEntriesInRoot() throws Exception {
File src = file("demo.zip");
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
try {
destDir.delete();
destDir.mkdir();
ZipUtil.unwrap(src, destDir);
fail("expected a ZipException, unwrapping with multiple roots is not supported");
}
Expand All @@ -741,10 +736,8 @@ public void testUnwrapEntriesInRoot() throws Exception {

public void testUnwrapMultipleRoots() throws Exception {
File src = file("demo-dirs-only.zip");
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
try {
destDir.delete();
destDir.mkdir();
ZipUtil.unwrap(src, destDir);
fail("expected a ZipException, unwrapping with multiple roots is not supported");
}
Expand All @@ -758,10 +751,8 @@ public void testUnwrapMultipleRoots() throws Exception {

public void testUnwrapSingleRootWithStructure() throws Exception {
File src = file("demo-single-root-dir.zip");
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
try {
destDir.delete();
destDir.mkdir();
ZipUtil.unwrap(src, destDir);
assertTrue((new File(destDir, "b.txt")).exists());
assertTrue((new File(destDir, "bad.txt")).exists());
Expand All @@ -775,10 +766,8 @@ public void testUnwrapSingleRootWithStructure() throws Exception {

public void testUnwrapEmptyRootDir() throws Exception {
File src = file("demo-single-empty-root-dir.zip");
File destDir = File.createTempFile("tempDir", null);
File destDir = Files.createTempDirectory("tempDir").toFile();
try {
destDir.delete();
destDir.mkdir();
ZipUtil.unwrap(src, destDir);
assertTrue("Dest dir should be empty, root dir was shaved", destDir.list().length == 0);
}
Expand Down Expand Up @@ -885,15 +874,7 @@ public void testUnpackBackslashes() throws IOException {
File initialSrc = file("backSlashTest.zip");

// lets create a temporary file and then use it as a dir
File dest = File.createTempFile("unpackEntryDir", null);

if(!(dest.delete())) {
throw new IOException("Could not delete temp file: " + dest.getAbsolutePath());
}

if(!(dest.mkdir())){
throw new IOException("Could not create temp directory: " + dest.getAbsolutePath());
}
File dest = Files.createTempDirectory("unpackEntryDir").toFile();

// unpack the archive that has the backslashes
// and double check that the file structure is preserved
Expand Down