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 File Information Disclosure Vulnerability #2177

Merged
merged 1 commit into from
Sep 15, 2023
Merged

[SECURITY] Fix Temporary File Information Disclosure Vulnerability #2177

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
7 changes: 4 additions & 3 deletions modules/grizzly/src/test/java/org/glassfish/grizzly/FileTransferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.IOException;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.util.Random;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -69,7 +70,7 @@ public NextAction handleRead(FilterChainContext ctx) throws IOException {
TCPNIOTransport client = TCPNIOTransportBuilder.newInstance().build();
FilterChainBuilder clientChain = FilterChainBuilder.stateless();
final SafeFutureImpl<File> future = SafeFutureImpl.create();
final File temp = File.createTempFile("grizzly-download-", ".tmp");
final File temp = Files.createTempFile("grizzly-download-", ".tmp").toFile();
temp.deleteOnExit();
final FileOutputStream out = new FileOutputStream(temp);
final AtomicInteger total = new AtomicInteger(0);
Expand Down Expand Up @@ -140,7 +141,7 @@ public void negativeFileTransferAPITest() throws Exception {
fail("Unexpected exception type: " + e);
}

f = File.createTempFile("grizzly-test-", ".tmp");
f = Files.createTempFile("grizzly-test-", ".tmp").toFile();
f.deleteOnExit();
new FileOutputStream(f).write(1);

Expand Down Expand Up @@ -195,7 +196,7 @@ private static BigInteger getMDSum(final File f) throws Exception {
}

private static File generateTempFile(final int size) throws IOException {
final File f = File.createTempFile("grizzly-temp-" + size, ".tmp");
final File f = Files.createTempFile("grizzly-temp-" + size, ".tmp").toFile();
Random r = new Random();
byte[] data = new byte[8192];
r.nextBytes(data);
Expand Down
3 changes: 2 additions & 1 deletion modules/http-server/src/main/java/org/glassfish/grizzly/http/server/filecache/FileCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand Down Expand Up @@ -599,7 +600,7 @@ public void setFileSendEnabled(boolean fileSendEnabled) {
*/
protected void compressFile(final FileCacheEntry entry) {
try {
final File tmpCompressedFile = File.createTempFile(String.valueOf(entry.plainFile.hashCode()), ".tmpzip", compressedFilesFolder);
final File tmpCompressedFile = Files.createTempFile(compressedFilesFolder.toPath(), String.valueOf(entry.plainFile.hashCode()), ".tmpzip").toFile();
tmpCompressedFile.deleteOnExit();

InputStream in = null;
Expand Down
3 changes: 2 additions & 1 deletion modules/http-server/src/test/java/org/glassfish/grizzly/http/server/FileCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
Expand Down Expand Up @@ -965,7 +966,7 @@ private static String convertToDate(final long date) {
}

private static File createTempFile() throws IOException {
final File f = File.createTempFile("grizzly-file-cache", ".txt");
final File f = Files.createTempFile("grizzly-file-cache", ".txt").toFile();
f.deleteOnExit();
FileOutputStream out = null;
try {
Expand Down
3 changes: 2 additions & 1 deletion modules/http-server/src/test/java/org/glassfish/grizzly/http/server/SendFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.IOException;
import java.math.BigInteger;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.util.Random;
import java.util.concurrent.Executors;
Expand Down Expand Up @@ -558,7 +559,7 @@ private static File generateTempFile(final int size) throws IOException {
}

private static File generateTempFile(final int size, final String ext) throws IOException {
final File f = File.createTempFile("grizzly-temp-" + size, "." + ext);
final File f = Files.createTempFile("grizzly-temp-" + size, "." + ext).toFile();
Random r = new Random();
byte[] data = new byte[8192];
r.nextBytes(data);
Expand Down
2 changes: 1 addition & 1 deletion ...es/http-server/src/test/java/org/glassfish/grizzly/http/server/StaticHttpHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ private static String getSystemTmpDir() {
}

private static File generateTempFile(final int size) throws IOException {
final File f = File.createTempFile("grizzly-temp-" + size, ".tmp2");
final File f = Files.createTempFile("grizzly-temp-" + size, ".tmp2").toFile();
Random r = new Random();
byte[] data = new byte[8192];
r.nextBytes(data);
Expand Down
3 changes: 2 additions & 1 deletion modules/http2/src/test/java/org/glassfish/grizzly/http2/FileCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
import java.nio.file.Files;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
Expand Down Expand Up @@ -400,7 +401,7 @@ private static String convertToDate(final long date) {
}

private static File createTempFile() throws IOException {
final File f = File.createTempFile("grizzly-file-cache", ".txt");
final File f = Files.createTempFile("grizzly-file-cache", ".txt").toFile();
f.deleteOnExit();
FileOutputStream out = null;
try {
Expand Down