Fix Fortify Path Manipulation Issue

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / controller / DictionaryImportController.java

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
index c79f203..142f72b 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.compress.utils.IOUtils;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.DisctionaryNames;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.ActionList;
 import org.onap.policy.rest.jpa.ActionPolicyDict;
@@ -104,6 +105,14 @@ public class DictionaryImportController {
                        response.getWriter().write("Error");
                        return;
                }
+               
+               // fix Fortify Path Manipulation issue
+               if(!isValidDictionaryName(dictionaryName)){
+                       LOGGER.error("dictionaryName is invalid");
+                       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                       response.getWriter().write("Error");
+                       return;                 
+               }
                                
                boolean dictionaryImportExists = false;
                try{
@@ -161,7 +170,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("ActionPolicyDictionary")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       ActionPolicyDict attribute = new ActionPolicyDict("",  userId);
+                                       ActionPolicyDict attribute = new ActionPolicyDict();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -196,7 +205,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("OnapName")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       OnapName attribute = new OnapName("",  userId);
+                                       OnapName attribute = new OnapName();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -256,7 +265,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("VNFType")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       VNFType attribute = new VNFType("",  userId);
+                                       VNFType attribute = new VNFType();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -276,7 +285,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("VSCLAction")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       VSCLAction attribute = new VSCLAction("",  userId);
+                                       VSCLAction attribute = new VSCLAction();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -316,7 +325,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("ClosedLoopSite")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       ClosedLoopSite attribute = new ClosedLoopSite("",  userId);
+                                       ClosedLoopSite attribute = new ClosedLoopSite();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -336,7 +345,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("PEPOptions")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       PEPOptions attribute = new PEPOptions("",  userId);
+                                       PEPOptions attribute = new PEPOptions();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -359,7 +368,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("VarbindDictionary")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       VarbindDictionary attribute = new VarbindDictionary("",  userId);
+                                       VarbindDictionary attribute = new VarbindDictionary();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -448,7 +457,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("Settings")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       DecisionSettings attribute = new DecisionSettings("",  userId);
+                                       DecisionSettings attribute = new DecisionSettings();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -632,7 +641,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("TermList")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       TermList attribute = new TermList("",  userId);
+                                       TermList attribute = new TermList();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -673,7 +682,7 @@ public class DictionaryImportController {
                        if(dictionaryName.startsWith("SearchCriteria")){
                                dictionaryImportExists = true;
                                for(int i = 1; i< dictSheet.size(); i++){
-                                       DescriptiveScope attribute = new DescriptiveScope("",  userId);
+                                       DescriptiveScope attribute = new DescriptiveScope();
                                        UserInfo userinfo = new UserInfo();
                                        userinfo.setUserLoginId(userId);
                                        attribute.setUserCreatedBy(userinfo);
@@ -710,4 +719,81 @@ public class DictionaryImportController {
                        response.getWriter().write("Error");
                }
        }
+       
+       public boolean isValidDictionaryName(String dictionaryName){
+               
+               if(dictionaryName.startsWith(DisctionaryNames.Attribute.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ActionPolicyDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.OnapName.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.MSPolicyDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.VNFType.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.VSCLAction.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ClosedLoopService.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ClosedLoopSite.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.PEPOptions.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.VarbindDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.BRMSParamDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.BRMSControllerDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.BRMSDependencyDictionary.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.Settings.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.PrefixList.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.SecurityZone.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.Zone.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ServiceList.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ServiceGroup.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.AddressGroup.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ProtocolList.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.ActionList.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.TermList.toString())){
+                       return true;
+               }
+               if(dictionaryName.startsWith(DisctionaryNames.SearchCriteria.toString())){
+                       return true;
+               }
+               return false;
+       }
 }
\ No newline at end of file