Skip to content

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

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

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
4 changes: 1 addition & 3 deletions ...ava/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,7 @@ public final static <C> ImageOptimizationService<C> createInstance(final String
logger.debug("Current local directory is: {}", new File(".").getCanonicalPath());
}

final File tmpDir = File.createTempFile(ImageOptimizationService.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
final File tmpDir = Files.createTempDirectory(ImageOptimizationService.class.getName()).toFile();
return new ImageOptimizationService<>(tmpDir, new File(pathToBinaryProgramsForImageOptimizationDirectory).getCanonicalFile(), timeoutInSeconds);
}

Expand Down
23 changes: 7 additions & 16 deletions ...com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -91,9 +92,7 @@ public class ImageOptimizationServiceTest {
*/
@BeforeEach
public void setUp() throws IOException {
final File tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
final File tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();

imageOptimizationService = new ImageOptimizationService<>(tmpDir, new File(DEFAULT_BINARY_APP_LOCATION));
Expand All @@ -120,9 +119,7 @@ public void testImageOptimizationService() throws IOException {
actualException = assertThrows(IllegalArgumentException.class, () -> new ImageOptimizationService<>(file, new File(DEFAULT_BINARY_APP_LOCATION)));
assertThat(actualException.getMessage(), matchesRegex("The passed in tmpWorkingDirectory, \".+\", needs to be a directory."));

final File tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
final File tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();
assertThat(new ImageOptimizationService<>(tmpDir, new File(DEFAULT_BINARY_APP_LOCATION)), notNullValue());
}
Expand Down Expand Up @@ -150,9 +147,7 @@ public void testImageOptimizationService2() throws IOException {
actualException = assertThrows(IllegalArgumentException.class, () -> new ImageOptimizationService<>(file, new File(DEFAULT_BINARY_APP_LOCATION), 1));
assertThat(actualException.getMessage(), matchesRegex("The passed in tmpWorkingDirectory, \".+\", needs to be a directory."));

File tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
File tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();
assertThat(new ImageOptimizationService<>(tmpDir, new File(DEFAULT_BINARY_APP_LOCATION), 1), notNullValue());

Expand All @@ -166,9 +161,7 @@ public void testImageOptimizationService2() throws IOException {
file2.deleteOnExit();
actualException = assertThrows(IllegalArgumentException.class, () -> new ImageOptimizationService<>(file2, new File(DEFAULT_BINARY_APP_LOCATION), 0));

tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();
assertThat(new ImageOptimizationService<>(tmpDir, new File(DEFAULT_BINARY_APP_LOCATION), 0), notNullValue());
}
Expand Down Expand Up @@ -222,9 +215,7 @@ private static final void validateFileOptimization(final OptimizationResult<Obje
}

private static final File getTempDir() throws IOException {
final File tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
final File tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();
return tmpDir;
}
Expand Down Expand Up @@ -1188,4 +1179,4 @@ public boolean equals(final Object obj) {
&& masterFileChecksum == other.masterFileChecksum;
}
}
}
}
7 changes: 3 additions & 4 deletions src/test/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLConnection;
import java.nio.file.Files;

import org.apache.commons.io.FileUtils;
import org.hamcrest.io.FileMatchers;
Expand Down Expand Up @@ -163,9 +164,7 @@ public void testConvertImageNative() throws IOException, ThirdPartyBinaryNotFoun
}
assertThat(ImageUtils.visuallyCompare(new File("./src/test/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif"), convertedFile), equalTo(TRUE));

final File tmpDir = File.createTempFile(ImageOptimizationServiceTest.class.getName(), "");
tmpDir.delete();
tmpDir.mkdir();
final File tmpDir = Files.createTempDirectory(ImageOptimizationServiceTest.class.getName()).toFile();
tmpDir.deleteOnExit();

convertedFile = new File(tmpDir.getCanonicalPath() + "/forceapp_bg." + IImageOptimizationService.PNG_EXTENSION);
Expand Down Expand Up @@ -195,4 +194,4 @@ public void testIsAminatedGif() {
assertThat(ImageUtils.isAminatedGif(new File("./src/test/java/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif")), equalTo(FALSE));
assertThat(ImageUtils.isAminatedGif(new File("./src/test/java/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif")), equalTo(FALSE));
}
}
}