feat: Allowing any extensions when uploading ingestionFlowFile (#31)

Author: antonioT90

src/main/java/it/gov/pagopa/pu/fileshare/service/FileService.java

@@ -1,23 +1,23 @@
 package it.gov.pagopa.pu.fileshare.service;
 
 import it.gov.pagopa.pu.fileshare.exception.custom.InvalidFileException;
-import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.stream.Stream;
+
 @Slf4j
 @Service
 public class FileService {
 
-  public void validateFile(MultipartFile ingestionFlowFile, String validFileExt) {
+  public void validateFile(MultipartFile ingestionFlowFile) {
     if( ingestionFlowFile == null){
       log.debug("Invalid ingestion flow file");
       throw new InvalidFileException("Invalid file");
     }
     String filename = StringUtils.defaultString(ingestionFlowFile.getOriginalFilename());
-    validateFileExtension(validFileExt, filename);
     validateFilename(filename);
   }
 
@@ -28,10 +28,4 @@ public static void validateFilename(String filename) {
     }
   }
 
-  private static void validateFileExtension(String validFileExt, String filename) {
-    if(!filename.endsWith(validFileExt)){
-      log.debug("Invalid ingestion flow file extension");
-      throw new InvalidFileException("Invalid file extension");
-    }
-  }
 }

src/main/java/it/gov/pagopa/pu/fileshare/service/ingestion/IngestionFlowFileFacadeServiceImpl.java

@@ -36,7 +36,6 @@ public class IngestionFlowFileFacadeServiceImpl implements IngestionFlowFileFaca
   private final FoldersPathsConfig foldersPathsConfig;
   private final IngestionFlowFileService ingestionFlowFileService;
   private final IngestionFlowFileDTOMapper ingestionFlowFileDTOMapper;
-  private final String validIngestionFlowFileExt;
   private final String archivedSubFolder;
 
   public IngestionFlowFileFacadeServiceImpl(
@@ -46,7 +45,6 @@ public IngestionFlowFileFacadeServiceImpl(
     FoldersPathsConfig foldersPathsConfig,
     IngestionFlowFileService ingestionFlowFileService,
     IngestionFlowFileDTOMapper ingestionFlowFileDTOMapper,
-    @Value("${uploads.ingestion-flow-file.valid-extension}") String validIngestionFlowFileExt,
     @Value("${folders.process-target-sub-folders.archive}") String archivedSubFolder
   ) {
     this.userAuthorizationService = userAuthorizationService;
@@ -55,7 +53,6 @@ public IngestionFlowFileFacadeServiceImpl(
     this.foldersPathsConfig = foldersPathsConfig;
     this.ingestionFlowFileService = ingestionFlowFileService;
     this.ingestionFlowFileDTOMapper = ingestionFlowFileDTOMapper;
-    this.validIngestionFlowFileExt = validIngestionFlowFileExt;
     this.archivedSubFolder = archivedSubFolder;
   }
 
@@ -64,7 +61,7 @@ public Long uploadIngestionFlowFile(Long organizationId, IngestionFlowFileType i
                                       FileOrigin fileOrigin, String fileName, MultipartFile ingestionFlowFile,
                                       UserInfo user, String accessToken) {
     userAuthorizationService.checkUserAuthorization(organizationId, user, accessToken);
-    fileService.validateFile(ingestionFlowFile, validIngestionFlowFileExt);
+    fileService.validateFile(ingestionFlowFile);
 
     String ingestionFlowFilePath = foldersPathsConfig.getIngestionFlowFilePath(ingestionFlowFileType);
 

src/main/resources/application.yml

@@ -95,9 +95,5 @@ rest:
     wait-time-millis: "\${PROCESS_EXECUTIONS_WAIT_TIME_MILLIS:500}"
     print-body-when-error: "\${PROCESS_EXECUTIONS_PRINT_BODY_WHEN_ERROR:true}"
 
-uploads:
-  ingestion-flow-file:
-    valid-extension: "\${INGESTION_FLOW_FILE_VALID_EXTENSION:.zip}"
-
 app:
   fileEncryptPassword: "\${FILE_ENCRYPT_PASSWORD:ENCR_PSW}"

src/test/java/it/gov/pagopa/pu/fileshare/service/FileServiceTest.java

@@ -12,7 +12,6 @@
 @ExtendWith(MockitoExtension.class)
 class FileServiceTest {
   private FileService fileService;
-  private static final String VALID_FILE_EXTENSION = ".zip";
 
   @BeforeEach
   void setUp() {
@@ -23,35 +22,18 @@ void setUp() {
   void givenValidFileExtensionWhenValidateFileThenOk(){
     MockMultipartFile file = new MockMultipartFile(
       "ingestionFlowFile",
-      "test"+VALID_FILE_EXTENSION,
+      "test.zip",
       MediaType.TEXT_PLAIN_VALUE,
       "this is a test file".getBytes()
     );
 
-    fileService.validateFile(file, VALID_FILE_EXTENSION);
+    fileService.validateFile(file);
   }
 
   @Test
   void givenNoFileWhenValidateFileThenInvalidFileException(){
     try{
-      fileService.validateFile(null, VALID_FILE_EXTENSION);
-      Assertions.fail("Expected InvalidFileException");
-    }catch(InvalidFileException e){
-      //do nothing
-    }
-  }
-
-  @Test
-  void givenInvalidFileExtensionWhenValidateFileThenInvalidFileException(){
-    MockMultipartFile file = new MockMultipartFile(
-      "ingestionFlowFile",
-      "test.txt",
-      MediaType.TEXT_PLAIN_VALUE,
-      "this is a test file".getBytes()
-    );
-
-    try{
-      fileService.validateFile(file, VALID_FILE_EXTENSION);
+      fileService.validateFile(null);
       Assertions.fail("Expected InvalidFileException");
     }catch(InvalidFileException e){
       //do nothing
@@ -68,7 +50,7 @@ void givenInvalidFilenameWhenValidateFileThenInvalidFileException(){
     );
 
     try{
-      fileService.validateFile(file, VALID_FILE_EXTENSION);
+      fileService.validateFile(file);
       Assertions.fail("Expected InvalidFileException");
     }catch(InvalidFileException e){
       //do nothing

src/test/java/it/gov/pagopa/pu/fileshare/service/ingestion/IngestionFlowFileFacadeServiceImplTest.java

@@ -47,7 +47,6 @@ class IngestionFlowFileFacadeServiceImplTest {
   @Mock
   private IngestionFlowFileDTOMapper ingestionFlowFileDTOMapperMock;
   private IngestionFlowFileFacadeServiceImpl ingestionFlowFileService;
-  private static final String VALID_FILE_EXTENSION = ".zip";
   private static final String ARCHIVED_SUB_FOLDER = "Archived";
 
   @BeforeEach
@@ -59,7 +58,6 @@ void setUp() {
       foldersPathsConfigMock,
       ingestionFlowFileServiceMock,
       ingestionFlowFileDTOMapperMock,
-      VALID_FILE_EXTENSION,
       ARCHIVED_SUB_FOLDER);
   }
 
@@ -84,7 +82,7 @@ void givenAuthorizedUserWhenUploadIngestionFlowFileThenOk() {
     String fileName = "fileName.txt";
     MockMultipartFile file = new MockMultipartFile(
       "ingestionFlowFile",
-      "test" + VALID_FILE_EXTENSION,
+      "test.zip",
       MediaType.TEXT_PLAIN_VALUE,
       "this is a test file".getBytes()
     );
@@ -108,7 +106,7 @@ void givenAuthorizedUserWhenUploadIngestionFlowFileThenOk() {
 
     Assertions.assertSame(expectedIngestionFlowFileId, result);
     Mockito.verify(userAuthorizationServiceMock).checkUserAuthorization(organizationId, TestUtils.getSampleUser(), accessToken);
-    Mockito.verify(fileServiceMock).validateFile(file, VALID_FILE_EXTENSION);
+    Mockito.verify(fileServiceMock).validateFile(file);
   }
 
   @Test
@@ -146,7 +144,7 @@ void givenAlreadyUploadedWhenThenFileAlreadyExistsException() {
           fileName, file, userInfo, accessToken));
 
       Mockito.verify(userAuthorizationServiceMock).checkUserAuthorization(organizationId, userInfo, accessToken);
-      Mockito.verify(fileServiceMock).validateFile(file, VALID_FILE_EXTENSION);
+      Mockito.verify(fileServiceMock).validateFile(file);
     }
   }
 
@@ -191,7 +189,7 @@ void givenAlreadyArchivedWhenThenFileAlreadyExistsException() {
           fileName, file, userInfo, accessToken));
 
       Mockito.verify(userAuthorizationServiceMock).checkUserAuthorization(organizationId, userInfo, accessToken);
-      Mockito.verify(fileServiceMock).validateFile(file, VALID_FILE_EXTENSION);
+      Mockito.verify(fileServiceMock).validateFile(file);
     }
   }