Fix security hotspot and improve coverage

[nonrtric/plt/rappmanager.git] / rapp-manager-models / src / main / java / com / oransc / rappmanager / models / csar / RappCsarConfigurationHandler.java

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
index bbf59bb..e088463 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
@@ -53,9 +53,12 @@ public class RappCsarConfigurationHandler {
 
 
     public boolean isValidRappPackage(MultipartFile multipartFile) {
-        return multipartFile != null && multipartFile.getOriginalFilename() != null
-                       && multipartFile.getOriginalFilename().endsWith(".csar") && isFileExistsInCsar(multipartFile,
-                ACM_COMPOSITION_JSON_LOCATION);
+        String originalFilename = multipartFile.getOriginalFilename();
+        if (originalFilename != null) {
+            return originalFilename.endsWith(".csar") && isFileExistsInCsar(multipartFile,
+                    ACM_COMPOSITION_JSON_LOCATION);
+        }
+        return false;
     }
 
     boolean isFileExistsInCsar(MultipartFile multipartFile, String fileLocation) {