From: Jorge Hernandez <jh1730@att.com>
Date: Thu, 12 Apr 2018 16:04:49 +0000 (+0000)
Subject: Merge "OOF Policy Config File Creation Issue"
X-Git-Tag: v1.2.0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Ftags%2Fv1.2.0;hp=882850a0f5a147c45749facf2e78bccafce1760d;p=policy%2Fengine.git

Merge "OOF Policy Config File Creation Issue"
---

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
index 85b6e24a1..f3dda33fc 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandler.java
@@ -64,7 +64,7 @@ public class DeleteHandler {
 	public static final String POLICY_IN_PDP = "PolicyInPDP";
 	public static final String ERROR = "error";
 	public static final String UNKNOWN = "unknown";
-
+	private static final String REGEX = "[0-9a-zA-Z._]*";
 
 	public void doAPIDeleteFromPAP(HttpServletRequest request, HttpServletResponse response) throws IOException, SQLException  {
 		// get the request content into a String
@@ -320,6 +320,13 @@ public class DeleteHandler {
 		String groupId = request.getParameter("groupId");
 		String responseString = null;
 		
+		if(groupId != null && !groupId.matches(REGEX) ){
+			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+			response.addHeader("error",ERROR);
+			response.addHeader("message", "Group Id is not valid");
+			return;
+		}
+				
 		PolicyLogger.info("JSON request from API to Delete Policy from the PDP: " + policyName);
 
 		// for PUT operations the group may or may not need to exist before the operation can be done