From 7f201f3669df6718514af6c5aa77a0b680095d01 Mon Sep 17 00:00:00 2001 From: Jonathan Leitschuh Date: Sat, 19 Nov 2022 02:54:54 +0000 Subject: [PATCH] vuln-fix: Temporary File Information Disclosure This fixes temporary file information disclosure vulnerability due to the use of the vulnerable `File.createTempFile()` method. The vulnerability is fixed by using the `Files.createTempFile()` method which sets the correct posix permissions. Weakness: CWE-377: Insecure Temporary File Severity: Medium CVSSS: 5.5 Detection: CodeQL & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.SecureTempFileCreation) Reported-by: Jonathan Leitschuh Signed-off-by: Jonathan Leitschuh Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/18 Co-authored-by: Moderne --- .../utils/FileUtils_DeleteFolder.java | 23 ++++++++++--------- .../utils/FileUtils_FileExistTest.java | 5 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/smartsheet/utils/FileUtils_DeleteFolder.java b/src/test/java/com/smartsheet/utils/FileUtils_DeleteFolder.java index c47ab61..873aea2 100644 --- a/src/test/java/com/smartsheet/utils/FileUtils_DeleteFolder.java +++ b/src/test/java/com/smartsheet/utils/FileUtils_DeleteFolder.java @@ -2,6 +2,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import org.junit.After; import org.junit.Assert; @@ -49,7 +50,7 @@ public void testDeleteFolder_NullInput() throws IOException{ @Test public void testDeleteFolder_FolderWithOneFile() throws IOException{ - File testFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); + File testFile = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); FileUtils.deleteFolder(testFolder); Assert.assertTrue(!testFolder.exists()); @@ -58,12 +59,12 @@ public void testDeleteFolder_FolderWithOneFile() throws IOException{ @Test public void testDeleteFolder_FolderWithSixFiles() throws IOException{ - File testFile1 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); - File testFile2 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); - File testFile3 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); - File testFile4 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); - File testFile5 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); - File testFile6 = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); + File testFile1 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); + File testFile2 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); + File testFile3 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); + File testFile4 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); + File testFile5 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); + File testFile6 = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); FileUtils.deleteFolder(testFolder); @@ -78,7 +79,7 @@ public void testDeleteFolder_FolderWithSixFiles() throws IOException{ @Test public void testDeleteFolder_FolderWithOneFileAndEmptySubFolder() throws IOException{ - File testFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testFolder); + File testFile = Files.createTempFile(testFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); File testSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs"); FileUtils.deleteFolder(testFolder); @@ -92,7 +93,7 @@ public void testDeleteFolder_FolderWithOneFileAndEmptySubFolder() throws IOExcep public void testDeleteFolder_FolderWithContentInSubFolder() throws IOException{ File testSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs"); testSubFolder.mkdir(); - File testFileInSubFolder = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testSubFolder); + File testFileInSubFolder = Files.createTempFile(testSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); FileUtils.deleteFolder(testFolder); @@ -105,11 +106,11 @@ public void testDeleteFolder_FolderWithContentInSubFolder() throws IOException{ public void testDeleteFolder_FolderWithContentInTwoSubFolder() throws IOException{ File testDocsSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "docs"); testDocsSubFolder.mkdir(); - File testDoc = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testDocsSubFolder); + File testDoc = Files.createTempFile(testDocsSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); File testHTMLSubFolder = new File(testFolder.getAbsoluteFile() + File.separator + "html"); testHTMLSubFolder.mkdir(); - File testHTMLDoc = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX, testHTMLSubFolder); + File testHTMLDoc = Files.createTempFile(testHTMLSubFolder.toPath(), TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); FileUtils.deleteFolder(testFolder); diff --git a/src/test/java/com/smartsheet/utils/FileUtils_FileExistTest.java b/src/test/java/com/smartsheet/utils/FileUtils_FileExistTest.java index 2a97ec7..b3d2639 100644 --- a/src/test/java/com/smartsheet/utils/FileUtils_FileExistTest.java +++ b/src/test/java/com/smartsheet/utils/FileUtils_FileExistTest.java @@ -2,6 +2,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -94,12 +95,12 @@ public void testFileExistsInFolder_NoSuchFileInTempFolder() { } private void createUniqueFileInSystemTempFolder() throws IOException{ - File tempFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX); + File tempFile = Files.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); testFiles.add(tempFile); } private void createNewFolderInSystemTempFolder() throws IOException{ - File tempFile = File.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX); + File tempFile = Files.createTempFile(TEST_FILE_PREFIX, TEST_FILE_SUFFIX).toFile(); tempFile.mkdir(); testFiles.add(tempFile); }