Merge "Policy Elastic Search Validation Enhancements"

3 files changed, 27 insertions, 17 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
index ee6fd0568..430f9cd65 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElasticSearchPolicyUpdate.java
@@ -177,13 +177,10 @@ public class ElasticSearchPolicyUpdate {
 						while(configResult.next()){
 							String configBody = configResult.getString("configbody");
 							String configType = configResult.getString("configtype");
-							if("JSON".equalsIgnoreCase(configType)){
-								policyDataString.append("\"jsonBodyData\":"+configBody+",\"configType\":\""+configType+"\",");
-							}else if("OTHER".equalsIgnoreCase(configType)){
-								if(configBody!=null){
-									configBody= configBody.replaceAll("\"", "");
-									policyDataString.append("\"jsonBodyData\":\""+configBody+"\",\"configType\":\""+configType+"\",");
-								}
+							if(configBody!=null){
+								configBody = configBody.replace("null", "\"\"");
+								configBody= configBody.replace("\"", "\\\"");
+								policyDataString.append("\"jsonBodyData\":\""+configBody+"\",\"configType\":\""+configType+"\",");
 							}
 						}
 						configResult.close();
@@ -197,7 +194,9 @@ public class ElasticSearchPolicyUpdate {
 						ResultSet actionResult = pstmt.executeQuery();
 						while(actionResult.next()){
 							String actionBody = actionResult.getString("actionbody");
-							policyDataString.append("\"jsonBodyData\":"+actionBody+",");
+							actionBody = actionBody.replace("null", "\"\"");
+							actionBody = actionBody.replace("\"", "\\\"");
+							policyDataString.append("\"jsonBodyData\":\""+actionBody+"\",");
 						}
 						actionResult.close();
 					}	
@@ -205,13 +204,11 @@ public class ElasticSearchPolicyUpdate {
 				
 				String _id = policyWithScopeName;
 				
-				policyDataString.append(constructPolicyData(policyData, policyDataString));
-				
-				String dataString = policyDataString.toString();
+				String dataString = constructPolicyData(policyData, policyDataString);
 				dataString = dataString.substring(0, dataString.length()-1);
 				dataString = dataString.trim().replace(System.getProperty("line.separator"), "") + "}";
 				dataString = dataString.replace("null", "\"\"");
-				dataString = dataString.replaceAll(" ", "").replaceAll("\n", "");
+				dataString = dataString.replaceAll("\n", "");
 				
 				try{
 					Gson gson = new Gson();
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
index 88f9e2c87..9091d79ed 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnectorImpl.java
@@ -101,6 +101,9 @@ public class ElkConnectorImpl implements ElkConnector{
 			throw e;
 		}
 	}
+	private boolean isAlphaNumeric(String query){
+		return query.matches("[a-zA-Z_0-9]+");
+	}
 
 	@Override
 	public JestResult search(PolicyIndexType type, String text) throws IllegalStateException, IllegalArgumentException {
@@ -112,6 +115,10 @@ public class ElkConnectorImpl implements ElkConnector{
 			throw new IllegalArgumentException("No search string provided");
 		}
 
+		if(!isAlphaNumeric(text)){
+			throw new IllegalArgumentException("Search must be alpha numeric");
+		}
+
 		QueryStringQueryBuilder mQ = QueryBuilders.queryStringQuery("*"+text+"*");
 		SearchSourceBuilder searchSourceBuilder = 
 				new SearchSourceBuilder().query(mQ);
@@ -198,6 +205,10 @@ public class ElkConnectorImpl implements ElkConnector{
 			return search(type, text);
 		}
 
+		if(!isAlphaNumeric(text)){
+			throw new IllegalArgumentException("Search must be alpha numeric");
+		}
+
 		String matches_s = "";
 		matches_s = "{\n" +
 				"    \"size\" : "+ ElkConnectorImpl.QUERY_MAXRECORDS + ",\n" +
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
index 78da2a572..77e45e30d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
@@ -231,7 +231,7 @@ public class PolicyElasticSearchController{
 								if(searchData.getPolicyType() != null && "closedLoop".equals(searchData.getPolicyType())){
 									searchKeyValue.put("jsonBodyData", "*" +entry[1] +"*");
 								}else{
-									searchKeyValue.put(entry[0], entry[1]);
+									searchText = entry[1];
 								}
 							}
 						}
@@ -265,13 +265,13 @@ public class PolicyElasticSearchController{
 						searchKeyValue.put("jsonBodyData."+d2Service+"", "true");
 					}	
 					if(searchData.getVnfType() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getVnfType() +"*");					
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getVnfType()+"*");					
 					}
 					if(searchData.getPolicyStatus() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getPolicyStatus()+"*");
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getPolicyStatus()+"*");
 					}
 					if(searchData.getVproAction() != null){
-						searchKeyValue.put("jsonBodyData", "*" +searchData.getVproAction()+"*");
+						searchKeyValue.put("jsonBodyData", "*"+searchData.getVproAction()+"*");
 					}
 					if(searchData.getServiceType() != null){
 						searchKeyValue.put("serviceType", searchData.getServiceType());
@@ -288,8 +288,10 @@ public class PolicyElasticSearchController{
 							type = ElkConnector.PolicyIndexType.decision;
 						}else if(policyType.equalsIgnoreCase("config")){
 							type = ElkConnector.PolicyIndexType.config;
-						}else {
+						}else if(policyType.equalsIgnoreCase("closedloop")){
 							type = ElkConnector.PolicyIndexType.closedloop;
+						}else{
+							type = ElkConnector.PolicyIndexType.all;
 						}
 					}else{
 						type = ElkConnector.PolicyIndexType.all;