refactor: merge pull request (#30) from refactor/polish-code

refactor: rename SecureTempFileManager to TempFileManager & handle privilege access with FileValidatorTest

Author: Abega1642

src/main/java/com/example/arinfra/file/BucketComponent.java

@@ -38,7 +38,7 @@
  *
  * <ul>
  *   <li>All bucket keys are sanitized before logging
- *   <li>Temporary files are created using {@link SecureTempFileManager}
+ *   <li>Temporary files are created using {@link TempFileManager}
  *   <li>Exceptions are domain-specific and controller-advice friendly
  * </ul>
  *
@@ -51,7 +51,7 @@
 public class BucketComponent {
 
   private final BucketConf bucketConf;
-  private final SecureTempFileManager secureTempFileManager;
+  private final TempFileManager tempFileManager;
 
   /**
    * Uploads a file or directory to the configured bucket.
@@ -116,7 +116,7 @@ public File download(String bucketKey) {
 
     try {
       File destination =
-          secureTempFileManager.createSecureTempFile("b2-", "-" + bucketKey.replace("/", "-"));
+          tempFileManager.createSecureTempFile("b2-", "-" + bucketKey.replace("/", "-"));
 
       var request =
           DownloadFileRequest.builder()

src/main/java/com/example/arinfra/file/FileZipManager.java

@@ -83,7 +83,7 @@ public class FileZipManager {
   private static final int SYMLINK_UNIX_MODE = 0120000;
   private static final int UNIX_FILE_TYPE_MASK = 0170000;
 
-  private final SecureTempFileManager secureTempFileManager;
+  private final TempFileManager tempFileManager;
   private final FilenameSanitizer filenameSanitizer;
   private final FileValidator fileValidator;
   private final ZipEntryValidator zipEntryValidator;
@@ -105,7 +105,7 @@ public File zipFile(
     fileValidator.validateReadableFile(sourcePath);
 
     String sanitizedZipFileName = ensureZipExtension(filenameSanitizer.apply(zipFileName));
-    File zipFile = secureTempFileManager.createSecureTempFile(ZIP_PREFIX, sanitizedZipFileName);
+    File zipFile = tempFileManager.createSecureTempFile(ZIP_PREFIX, sanitizedZipFileName);
 
     try (ZipArchiveOutputStream zos = createZipOutputStream(zipFile.toPath())) {
       addFileToZip(zos, sourcePath, sourcePath.getFileName().toString());
@@ -116,7 +116,7 @@ public File zipFile(
           forJava(zipFile.getAbsolutePath()));
       return zipFile;
     } catch (IOException e) {
-      secureTempFileManager.deleteTempFile(zipFile);
+      tempFileManager.deleteTempFile(zipFile);
       log.error("Failed to zip file: {}", forJava(sourcePath.toString()), e);
       throw e;
     }
@@ -139,7 +139,7 @@ public File zipDirectory(
     fileValidator.validateReadableDirectory(sourcePath);
 
     String sanitizedZipFileName = ensureZipExtension(filenameSanitizer.apply(zipFileName));
-    File zipFile = secureTempFileManager.createSecureTempFile(ZIP_PREFIX, sanitizedZipFileName);
+    File zipFile = tempFileManager.createSecureTempFile(ZIP_PREFIX, sanitizedZipFileName);
 
     try (ZipArchiveOutputStream zos = createZipOutputStream(zipFile.toPath())) {
       AtomicLong entryCount = new AtomicLong(0);
@@ -152,7 +152,7 @@ public File zipDirectory(
           forJava(zipFile.getAbsolutePath()));
       return zipFile;
     } catch (IOException | SecurityException e) {
-      secureTempFileManager.deleteTempFile(zipFile);
+      tempFileManager.deleteTempFile(zipFile);
       log.error("Failed to zip directory: {}", forJava(sourcePath.toString()), e);
       throw e;
     }
@@ -211,7 +211,7 @@ public File unzipToTempDirectory(@NotNull(message = "ZIP file cannot be null") F
       throws IOException {
 
     fileValidator.validateReadableFile(zipFile.toPath());
-    File tempDir = secureTempFileManager.createSecureTempDirectory(UNZIP_PREFIX);
+    File tempDir = tempFileManager.createSecureTempDirectory(UNZIP_PREFIX);
     return unzip(zipFile, tempDir);
   }
 

src/main/java/com/example/arinfra/file/MultipartFileConverter.java

@@ -27,7 +27,7 @@ public class MultipartFileConverter implements Function<MultipartFile, File> {
   private static final String DEFAULT_EXTENSION = "tmp";
   private static final int MAX_EXTENSION_LENGTH = 10;
 
-  private final SecureTempFileManager secureTempFileManager;
+  private final TempFileManager tempFileManager;
 
   /**
    * Converts a MultipartFile to a secure temporary File.
@@ -43,7 +43,7 @@ public File apply(MultipartFile multipartFile) {
 
     try {
       String safeSuffix = "." + extractSafeFileExtension(originalFilename);
-      File tempFile = secureTempFileManager.createSecureTempFile(UPLOAD_PREFIX, safeSuffix);
+      File tempFile = tempFileManager.createSecureTempFile(UPLOAD_PREFIX, safeSuffix);
 
       multipartFile.transferTo(tempFile);
 

…/arinfra/file/SecureTempFileManager.java …xample/arinfra/file/TempFileManager.javasrc/main/java/com/example/arinfra/file/SecureTempFileManager.java renamed to src/main/java/com/example/arinfra/file/TempFileManager.java src/main/java/com/example/arinfra/file/SecureTempFileManager.java renamed to src/main/java/com/example/arinfra/file/TempFileManager.java

@@ -32,7 +32,7 @@
 @Component
 @InfraGenerated
 @RequiredArgsConstructor
-public class SecureTempFileManager {
+public class TempFileManager {
 
   private static final String POSIX_OWNER_ONLY_PERMISSIONS = "rw-------";
   private static final String POSIX_DIRECTORY_OWNER_ONLY_PERMISSIONS = "rwx------";

src/main/java/com/example/arinfra/service/health/HealthBucketService.java

@@ -6,7 +6,7 @@
 import com.example.arinfra.InfraGenerated;
 import com.example.arinfra.exception.bucket.BucketHealthCheckException;
 import com.example.arinfra.file.BucketComponent;
-import com.example.arinfra.file.SecureTempFileManager;
+import com.example.arinfra.file.TempFileManager;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -29,7 +29,7 @@ public class HealthBucketService {
   private static final Duration PRESIGN_DURATION = Duration.ofMinutes(2);
 
   private final BucketComponent bucketComponent;
-  private final SecureTempFileManager secureTempFileManager;
+  private final TempFileManager tempFileManager;
 
   /**
    * Performs a comprehensive health check on bucket operations including file upload, download,
@@ -66,7 +66,7 @@ private void testFileUploadAndDownload() throws IOException {
     String content = generateRandomContent();
 
     File fileToUpload =
-        secureTempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
+        tempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
 
     try {
       String fileBucketKey = buildBucketKey(fileId);
@@ -79,10 +79,10 @@ private void testFileUploadAndDownload() throws IOException {
         validateFileContent(fileToUpload, downloaded);
         log.debug("File upload and download validation successful");
       } finally {
-        secureTempFileManager.deleteTempFile(downloaded);
+        tempFileManager.deleteTempFile(downloaded);
       }
     } finally {
-      secureTempFileManager.deleteTempFile(fileToUpload);
+      tempFileManager.deleteTempFile(fileToUpload);
     }
   }
 
@@ -94,13 +94,13 @@ private void testDirectoryUpload() throws IOException {
     String dirId = randomUUID().toString();
     String dirPrefix = DIR_PREFIX + dirId;
 
-    File dir = secureTempFileManager.createSecureTempDirectory(dirPrefix);
+    File dir = tempFileManager.createSecureTempDirectory(dirPrefix);
     File fileInDir = null;
 
     try {
       String content = generateRandomContent();
       fileInDir =
-          secureTempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
+          tempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
 
       File targetFile = new File(dir, fileInDir.getName());
       Files.move(fileInDir.toPath(), targetFile.toPath());
@@ -126,15 +126,14 @@ private String uploadTestFile() throws IOException {
     String fileId = randomUUID().toString();
     String content = generateRandomContent();
 
-    File file =
-        secureTempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
+    File file = tempFileManager.createSecureTempFileWithContent(FILE_PREFIX, FILE_SUFFIX, content);
 
     try {
       String bucketKey = buildBucketKey(fileId);
       bucketComponent.upload(file, bucketKey);
       return bucketKey;
     } finally {
-      secureTempFileManager.deleteTempFile(file);
+      tempFileManager.deleteTempFile(file);
     }
   }
 
@@ -183,7 +182,7 @@ private void validateFileContent(File original, File downloaded) throws IOExcept
    * @param fileInDir the file inside the directory (can be null)
    */
   private void cleanupDirectory(File dir, File fileInDir) {
-    if (fileInDir != null && fileInDir.exists()) secureTempFileManager.deleteTempFile(fileInDir);
+    if (fileInDir != null && fileInDir.exists()) tempFileManager.deleteTempFile(fileInDir);
 
     if (dir != null && dir.exists()) {
       try {

src/main/java/com/example/arinfra/service/health/HealthEmailService.java

@@ -4,7 +4,7 @@
 
 import com.example.arinfra.InfraGenerated;
 import com.example.arinfra.exception.health.EmailHealthCheckException;
-import com.example.arinfra.file.SecureTempFileManager;
+import com.example.arinfra.file.TempFileManager;
 import com.example.arinfra.mail.Email;
 import com.example.arinfra.mail.Mailer;
 import jakarta.mail.internet.AddressException;
@@ -27,7 +27,7 @@ public class HealthEmailService {
   private static final String TEST_ATTACHMENT_SUFFIX = ".txt";
 
   private final Mailer mailer;
-  private final SecureTempFileManager secureTempFileManager;
+  private final TempFileManager tempFileManager;
 
   /**
    * Sends a comprehensive set of test emails to verify email functionality.
@@ -139,7 +139,7 @@ private void sendEmailWithAttachment(InternetAddress toAddress) throws EmailHeal
     File attachment = null;
     try {
       attachment =
-          secureTempFileManager.createSecureTempFileWithContent(
+          tempFileManager.createSecureTempFileWithContent(
               TEST_ATTACHMENT_PREFIX, TEST_ATTACHMENT_SUFFIX, attachmentContent);
 
       mailer.accept(
@@ -156,7 +156,7 @@ private void sendEmailWithAttachment(InternetAddress toAddress) throws EmailHeal
           "with-attachment", "Failed to create or send attachment", e);
     } finally {
       if (attachment != null) {
-        secureTempFileManager.deleteTempFile(attachment);
+        tempFileManager.deleteTempFile(attachment);
       }
     }
   }

src/test/java/com/example/arinfra/conf/FacadeIT.java

@@ -18,10 +18,10 @@
  * <p>This class starts and manages the lifecycle of the following Testcontainers:
  *
  * <ul>
- *   <li><b>PostgreSQL</b> – persistence layer
- *   <li><b>RabbitMQ</b> – asynchronous messaging
- *   <li><b>S3-compatible bucket</b> – file storage
- *   <li><b>Email service</b> – outbound email testing
+ *   <li><b>PostgreSQL</b> - persistence layer
+ *   <li><b>RabbitMQ</b> - asynchronous messaging
+ *   <li><b>S3-compatible bucket</b> - file storage
+ *   <li><b>Email service</b> - outbound email testing
  * </ul>
  *
  * <p>Additionally, it dynamically injects environment variables and container connection properties

src/test/java/com/example/arinfra/file/FileZipManagerTest.java

@@ -45,7 +45,7 @@ class FileZipManagerTest {
 
   @TempDir Path tempDir;
 
-  @Mock private SecureTempFileManager secureTempFileManager;
+  @Mock private TempFileManager tempFileManager;
 
   @Mock private FilenameSanitizer filenameSanitizer;
 
@@ -58,8 +58,7 @@ class FileZipManagerTest {
   @BeforeEach
   void setUp() {
     fileZipManager =
-        new FileZipManager(
-            secureTempFileManager, filenameSanitizer, fileValidator, zipEntryValidator);
+        new FileZipManager(tempFileManager, filenameSanitizer, fileValidator, zipEntryValidator);
   }
 
   @Test
@@ -68,8 +67,7 @@ void zip_file_with_valid_file_should_create_zip() throws IOException {
     File zipFile = tempDir.resolve(TEST_ZIP_NAME).toFile();
 
     when(filenameSanitizer.apply(TEST_ZIP_NAME)).thenReturn(TEST_ZIP_NAME);
-    when(secureTempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME)))
-        .thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME))).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableFile(any(Path.class));
 
     File result = fileZipManager.zipFile(sourceFile, TEST_ZIP_NAME);
@@ -78,7 +76,7 @@ void zip_file_with_valid_file_should_create_zip() throws IOException {
     assertTrue(result.exists());
     verify(fileValidator).validateReadableFile(sourceFile.toPath());
     verify(filenameSanitizer).apply(TEST_ZIP_NAME);
-    verify(secureTempFileManager).createSecureTempFile(anyString(), eq(TEST_ZIP_NAME));
+    verify(tempFileManager).createSecureTempFile(anyString(), eq(TEST_ZIP_NAME));
 
     verifyZipContainsEntry(result, TEST_FILE_NAME);
   }
@@ -114,8 +112,7 @@ void zip_file_should_add_zip_extension_if_missing() throws IOException {
     String nameWithoutExtension = "test";
 
     when(filenameSanitizer.apply(nameWithoutExtension)).thenReturn(nameWithoutExtension);
-    when(secureTempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME)))
-        .thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME))).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableFile(any(Path.class));
 
     File result = fileZipManager.zipFile(sourceFile, nameWithoutExtension);
@@ -130,8 +127,7 @@ void zip_directory_with_valid_directory_should_create_zip() throws IOException {
     File zipFile = tempDir.resolve(TEST_ZIP_NAME).toFile();
 
     when(filenameSanitizer.apply(anyString())).thenAnswer(i -> i.getArgument(0));
-    when(secureTempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME)))
-        .thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME))).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableDirectory(any(Path.class));
     doNothing().when(zipEntryValidator).validateEntryCount(anyInt());
 
@@ -157,7 +153,7 @@ void zip_directory_with_nested_structure_should_preserve_hierarchy() throws IOEx
     File zipFile = tempDir.resolve(TEST_ZIP_NAME).toFile();
 
     when(filenameSanitizer.apply(anyString())).thenAnswer(i -> i.getArgument(0));
-    when(secureTempFileManager.createSecureTempFile(anyString(), anyString())).thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), anyString())).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableDirectory(any(Path.class));
     doNothing().when(zipEntryValidator).validateEntryCount(anyInt());
 
@@ -176,8 +172,7 @@ void zip_directory_with_empty_directory_should_succeed() throws IOException {
     File zipFile = tempDir.resolve(TEST_ZIP_NAME).toFile();
 
     when(filenameSanitizer.apply(TEST_ZIP_NAME)).thenReturn(TEST_ZIP_NAME);
-    when(secureTempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME)))
-        .thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), eq(TEST_ZIP_NAME))).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableDirectory(any(Path.class));
 
     File result = fileZipManager.zipDirectory(emptyDir.toFile(), TEST_ZIP_NAME);
@@ -192,18 +187,18 @@ void zip_directory_exceeding_entry_limit_should_throw_exception() throws IOExcep
     File zipFile = tempDir.resolve(TEST_ZIP_NAME).toFile();
 
     when(filenameSanitizer.apply(anyString())).thenAnswer(i -> i.getArgument(0));
-    when(secureTempFileManager.createSecureTempFile(anyString(), anyString())).thenReturn(zipFile);
+    when(tempFileManager.createSecureTempFile(anyString(), anyString())).thenReturn(zipFile);
     doNothing().when(fileValidator).validateReadableDirectory(any(Path.class));
     doThrow(new SecurityException("Too many entries"))
         .when(zipEntryValidator)
         .validateEntryCount(anyInt());
-    doNothing().when(secureTempFileManager).deleteTempFile(zipFile);
+    doNothing().when(tempFileManager).deleteTempFile(zipFile);
 
     assertThrows(
         SecurityException.class,
         () -> fileZipManager.zipDirectory(sourceDir.toFile(), TEST_ZIP_NAME));
 
-    verify(secureTempFileManager).deleteTempFile(zipFile);
+    verify(tempFileManager).deleteTempFile(zipFile);
   }
 
   @Test
@@ -309,7 +304,7 @@ void unzip_to_temp_directory_should_extract_to_temp_location() throws IOExceptio
     File zipFile = createZipWithFiles();
     Path tempExtractDir = tempDir.resolve("temp-extract");
 
-    when(secureTempFileManager.createSecureTempDirectory(anyString()))
+    when(tempFileManager.createSecureTempDirectory(anyString()))
         .thenReturn(tempExtractDir.toFile());
     doNothing().when(fileValidator).validateReadableFile(any(Path.class));
     doNothing().when(fileValidator).validateWritableDirectory(any(Path.class));
@@ -325,7 +320,7 @@ void unzip_to_temp_directory_should_extract_to_temp_location() throws IOExceptio
     File result = fileZipManager.unzipToTempDirectory(zipFile);
 
     assertNotNull(result);
-    verify(secureTempFileManager).createSecureTempDirectory(anyString());
+    verify(tempFileManager).createSecureTempDirectory(anyString());
     verify(fileValidator, times(2)).validateReadableFile(any(Path.class));
   }
 

src/test/java/com/example/arinfra/file/MultipartFileConverterTest.java

@@ -22,7 +22,7 @@ class MultipartFileConverterTest {
   private static final String TEST_CONTENT = "test file content";
   private static final String VALID_FILENAME = "document.pdf";
   private final TempFileCleaner cleaner = new TempFileCleaner();
-  private final SecureTempFileManager TEMP_FILE_MANAGER = new SecureTempFileManager(cleaner);
+  private final TempFileManager TEMP_FILE_MANAGER = new TempFileManager(cleaner);
   private MultipartFileConverter converter;
 
   @BeforeEach

…nfra/file/SecureTempFileManagerTest.java …le/arinfra/file/TempFileManagerTest.javasrc/test/java/com/example/arinfra/file/SecureTempFileManagerTest.java renamed to src/test/java/com/example/arinfra/file/TempFileManagerTest.java src/test/java/com/example/arinfra/file/SecureTempFileManagerTest.java renamed to src/test/java/com/example/arinfra/file/TempFileManagerTest.java

@@ -27,7 +27,7 @@
 
 @Slf4j
 @InfraGenerated
-class SecureTempFileManagerTest {
+class TempFileManagerTest {
 
   private static final String TEST_PREFIX = "test-";
   private static final String TEST_SUFFIX = ".txt";
@@ -41,13 +41,13 @@ class SecureTempFileManagerTest {
   private static final int LARGE_CONTENT_SIZE = 10_000;
 
   private final TempFileCleaner tempFileCleaner = new TempFileCleaner();
-  private SecureTempFileManager subject;
+  private TempFileManager subject;
   private File createdFile;
 
   @BeforeEach
   void setUp() {
 
-    subject = new SecureTempFileManager(tempFileCleaner);
+    subject = new TempFileManager(tempFileCleaner);
     createdFile = null;
   }