diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-08-03 13:56:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-03 13:56:08 +0000 |
| commit | dea7a9791960ac2f913e2ab4c70491706ab9e2a0 (patch) | |
| tree | acb529ca11856ec01301746633e04748e7e07cb6 /POLICY-SDK-APP/src/main/java | |
| parent | f0fec2a861ea0a92b27b40882ea38f9422cde0c6 (diff) | |
| parent | 45dc4e1e09a3d6720ec181de7ebbec693eec2eb7 (diff) | |
Merge "Fix major sonar issues in SDK APP admin mod"
Diffstat (limited to 'POLICY-SDK-APP/src/main/java')
3 files changed, 524 insertions, 479 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java index 2492ab024..526bb4a00 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java @@ -100,6 +100,30 @@ public class PolicyManagerServlet extends HttpServlet { private static final String TYPE = "type"; private static final String CREATED_BY = "createdBy"; private static final String MODIFIED_BY = "modifiedBy"; + private static final String CONTENTTYPE = "application/json"; + private static final String SUPERADMIN = "super-admin"; + private static final String SUPEREDITOR = "super-editor"; + private static final String SUPERGUEST = "super-guest"; + private static final String ADMIN = "admin"; + private static final String EDITOR = "editor"; + private static final String GUEST = "guest"; + private static final String RESULT = "result"; + private static final String EXCEPTION_OCCURED = "Exception Occured"; + private static final String CONFIG = ".Config_"; + private static final String CONFIG1 = ":Config_"; + private static final String ACTION = ".Action_"; + private static final String ACTION1 = ":Action_"; + private static final String DECISION = ".Decision_"; + private static final String DECISION1 = ":Decision_"; + private static final String CONFIG_ = "Config_"; + private static final String ACTION_ = "Action_"; + private static final String DECISION_ = "Decision_"; + private static final String FORWARD_SLASH = "/"; + private static final String BACKSLASH = "\\"; + private static final String ESCAPE_BACKSLASH = "\\\\"; + private static final String BACKSLASH_8TIMES = "\\\\\\\\"; + private static List<String> serviceTypeNamesList = new ArrayList<>(); + private enum Mode { LIST, RENAME, COPY, DELETE, EDITFILE, ADDFOLDER, DESCRIBEPOLICYFILE, VIEWPOLICY, ADDSUBSCOPE, SWITCHVERSION, EXPORT, SEARCHLIST @@ -114,15 +138,6 @@ public class PolicyManagerServlet extends HttpServlet { PolicyManagerServlet.policyController = policyController; } - private static String CONTENTTYPE = "application/json"; - private static String SUPERADMIN = "super-admin"; - private static String SUPEREDITOR = "super-editor"; - private static String SUPERGUEST = "super-guest"; - private static String ADMIN = "admin"; - private static String EDITOR = "editor"; - private static String GUEST = "guest"; - private static String RESULT = "result"; - private static Path closedLoopJsonLocation; private static JsonArray policyNames; private static String testUserId = null; @@ -135,8 +150,6 @@ public class PolicyManagerServlet extends HttpServlet { PolicyManagerServlet.policyNames = policyNames; } - private static List<String> serviceTypeNamesList = new ArrayList<>(); - public static List<String> getServiceTypeNamesList() { return serviceTypeNamesList; } @@ -192,7 +205,7 @@ public class PolicyManagerServlet extends HttpServlet { try { setError(e, response); }catch(Exception e1){ - LOGGER.error("Exception Occured"+e1); + LOGGER.error(EXCEPTION_OCCURED +e1); } } } @@ -206,7 +219,7 @@ public class PolicyManagerServlet extends HttpServlet { out.print(responseJsonObject); out.flush(); } catch (Exception x) { - LOGGER.error("Exception Occured"+x); + LOGGER.error(EXCEPTION_OCCURED +x); response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, x.getMessage()); } } @@ -262,14 +275,19 @@ public class PolicyManagerServlet extends HttpServlet { //File Operation Functionality private void fileOperation(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { JSONObject responseJsonObject = null; - try { - StringBuilder sb = new StringBuilder(); - BufferedReader br = request.getReader(); + StringBuilder sb = new StringBuilder(); + try (BufferedReader br = request.getReader()) { String str; while ((str = br.readLine()) != null) { sb.append(str); } - br.close(); + } catch (Exception e) { + LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While doing File Operation" + e); + responseJsonObject = error(e.getMessage()); + setResponse(response, responseJsonObject); + return; + } + try { JSONObject jObj = new JSONObject(sb.toString()); JSONObject params = jObj.getJSONObject("params"); Mode mode = Mode.valueOf(params.getString("mode")); @@ -278,53 +296,67 @@ public class PolicyManagerServlet extends HttpServlet { LOGGER.info("****************************************Logging UserID while doing actions on Editor tab*******************************************"); LOGGER.info("UserId: " + userId + "Action Mode: "+ mode.toString() + "Action Params: "+params.toString()); LOGGER.info("***********************************************************************************************************************************"); - - switch (mode) { - case ADDFOLDER: - case ADDSUBSCOPE: - responseJsonObject = addFolder(params, request); - break; - case COPY: - responseJsonObject = copy(params, request); - break; - case DELETE: - responseJsonObject = delete(params, request); - break; - case EDITFILE: - case VIEWPOLICY: - responseJsonObject = editFile(params); - break; - case LIST: - responseJsonObject = list(params, request); - break; - case RENAME: - responseJsonObject = rename(params, request); - break; - case DESCRIBEPOLICYFILE: - responseJsonObject = describePolicy(params); - break; - case SWITCHVERSION: - responseJsonObject = switchVersion(params, request); - break; - case SEARCHLIST: - responseJsonObject = searchPolicyList(params, request); - break; - default: - throw new ServletException("not implemented"); - } - if (responseJsonObject == null) { - responseJsonObject = error("generic error : responseJsonObject is null"); - } + responseJsonObject = operateBasedOnMode(mode, params, request); } catch (Exception e) { - LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While doing File Operation" + e); + LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Processing Json" + e); responseJsonObject = error(e.getMessage()); } + setResponse(response, responseJsonObject); + } + + private void setResponse(HttpServletResponse response, JSONObject responseJsonObject) { response.setContentType(CONTENTTYPE); - PrintWriter out = response.getWriter(); - out.print(responseJsonObject); - out.flush(); + try (PrintWriter out = response.getWriter()) { + out.print(responseJsonObject); + out.flush(); + } catch (IOException e) { + LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception occured while writing response" + e); + } + } + + + private JSONObject operateBasedOnMode(Mode mode, JSONObject params, HttpServletRequest request) throws ServletException{ + JSONObject responseJsonObject = null; + switch (mode) { + case ADDFOLDER: + case ADDSUBSCOPE: + responseJsonObject = addFolder(params, request); + break; + case COPY: + responseJsonObject = copy(params, request); + break; + case DELETE: + responseJsonObject = delete(params, request); + break; + case EDITFILE: + case VIEWPOLICY: + responseJsonObject = editFile(params); + break; + case LIST: + responseJsonObject = list(params, request); + break; + case RENAME: + responseJsonObject = rename(params, request); + break; + case DESCRIBEPOLICYFILE: + responseJsonObject = describePolicy(params); + break; + case SWITCHVERSION: + responseJsonObject = switchVersion(params, request); + break; + case SEARCHLIST: + responseJsonObject = searchPolicyList(params, request); + break; + default: + throw new ServletException("not implemented"); + } + if (responseJsonObject == null) { + responseJsonObject = error("generic error : responseJsonObject is null"); + } + return responseJsonObject; } + private JSONObject searchPolicyList(JSONObject params, HttpServletRequest request) { List<Object> policyData = new ArrayList<>(); JSONArray policyList = null; @@ -344,7 +376,7 @@ public class PolicyManagerServlet extends HttpServlet { return new JSONObject().put(RESULT, resultList); } - private boolean lookupPolicyData(HttpServletRequest request, List<Object> policyData, JSONArray policyList, PolicyController controller, List<JSONObject> resultList) throws ServletException { + private boolean lookupPolicyData(HttpServletRequest request, List<Object> policyData, JSONArray policyList, PolicyController controller, List<JSONObject> resultList){ List<String> roles; Set<String> scopes;//Get the Login Id of the User from Request String userId = UserUtils.getUserSession(request).getOrgUserId(); @@ -368,21 +400,25 @@ public class PolicyManagerServlet extends HttpServlet { policyName = policyName.substring(0, policyName.lastIndexOf('.')).replace(".", File.separator); parsePolicyList(resultList, controller, policyName, version); } + }else { + getPolicyDataForSUPERRoles(policyData, controller, resultList, roles, scopes); + } + return true; + } + + private void getPolicyDataForSUPERRoles(List<Object> policyData, PolicyController controller, List<JSONObject> resultList, List<String> roles, Set<String> scopes) { + if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST) ){ + policyData = controller.getData(PolicyVersion.class); }else{ - if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST) ){ - policyData = controller.getData(PolicyVersion.class); - }else{ - List<Object> filterdatas = controller.getData(PolicyVersion.class); - for(Object filter : filterdatas) { - addFilterData(policyData, scopes, (PolicyVersion) filter); - } + List<Object> filterdatas = controller.getData(PolicyVersion.class); + for(Object filter : filterdatas) { + addFilterData(policyData, scopes, (PolicyVersion) filter); } + } - if(!policyData.isEmpty()){ - updateResultList(policyData, resultList); - } + if(!policyData.isEmpty()){ + updateResultList(policyData, resultList); } - return true; } private void addFilterData(List<Object> policyData, Set<String> scopes, PolicyVersion filter) { @@ -400,7 +436,7 @@ public class PolicyManagerServlet extends HttpServlet { for(int i =0; i < policyData.size(); i++){ PolicyVersion policy = (PolicyVersion) policyData.get(i); JSONObject el = new JSONObject(); - el.put(NAME, policy.getPolicyName().replace(File.separator, "/")); + el.put(NAME, policy.getPolicyName().replace(File.separator, FORWARD_SLASH)); el.put(DATE, policy.getModifiedDate()); el.put(VERSION, policy.getActiveVersion()); el.put(SIZE, ""); @@ -412,8 +448,8 @@ public class PolicyManagerServlet extends HttpServlet { } private void parsePolicyList(List<JSONObject> resultList, PolicyController controller, String policyName, String version) { - if(policyName.contains("\\")){ - policyName = policyName.replace("\\", "\\\\"); + if(policyName.contains(BACKSLASH)){ + policyName = policyName.replace(BACKSLASH, ESCAPE_BACKSLASH); } String policyVersionQuery = "From PolicyVersion where policy_name = :policyName and active_version = :version and id >0"; SimpleBindings pvParams = new SimpleBindings(); @@ -423,7 +459,7 @@ public class PolicyManagerServlet extends HttpServlet { if(!activeData.isEmpty()){ PolicyVersion policy = (PolicyVersion) activeData.get(0); JSONObject el = new JSONObject(); - el.put(NAME, policy.getPolicyName().replace(File.separator, "/")); + el.put(NAME, policy.getPolicyName().replace(File.separator, FORWARD_SLASH)); el.put(DATE, policy.getModifiedDate()); el.put(VERSION, policy.getActiveVersion()); el.put(SIZE, ""); @@ -455,7 +491,7 @@ public class PolicyManagerServlet extends HttpServlet { } String policyName; String removeExtension = path.replace(".xml", ""); - if(path.startsWith("/")){ + if(path.startsWith(FORWARD_SLASH)){ policyName = removeExtension.substring(1, removeExtension.lastIndexOf('.')); }else{ policyName = removeExtension.substring(0, removeExtension.lastIndexOf('.')); @@ -472,15 +508,7 @@ public class PolicyManagerServlet extends HttpServlet { return error("The Version shouldn't be greater than Highest Value"); } activePolicy = policyName + "." + activeVersion + ".xml"; - String dbCheckName = activePolicy.replace("/", "."); - if(dbCheckName.contains("Config_")){ - dbCheckName = dbCheckName.replace(".Config_", ":Config_"); - }else if(dbCheckName.contains("Action_")){ - dbCheckName = dbCheckName.replace(".Action_", ":Action_"); - }else if(dbCheckName.contains("Decision_")){ - dbCheckName = dbCheckName.replace(".Decision_", ":Decision_"); - } - String[] splitDBCheckName = dbCheckName.split(":"); + String[] splitDBCheckName = modifyPolicyName(activePolicy); String peQuery = "FROM PolicyEntity where policyName = :splitDBCheckName_1 and scope = :splitDBCheckName_0"; SimpleBindings policyParams = new SimpleBindings(); policyParams.put("splitDBCheckName_1", splitDBCheckName[1]); @@ -490,20 +518,20 @@ public class PolicyManagerServlet extends HttpServlet { if(pentity.isDeleted()){ return error("The Policy is Not Existing in Workspace"); } - if(policyName.contains("/")){ - policyName = policyName.replace("/", File.separator); + if(policyName.contains(FORWARD_SLASH)){ + policyName = policyName.replace(FORWARD_SLASH, File.separator); } policyName = policyName.substring(policyName.indexOf(File.separator)+1); - if(policyName.contains("\\")){ - policyName = policyName.replace(File.separator, "\\"); + if(policyName.contains(BACKSLASH)){ + policyName = policyName.replace(File.separator, BACKSLASH); } policyName = splitDBCheckName[0].replace(".", File.separator)+File.separator+policyName; String watchPolicyName = policyName; - if(policyName.contains("/")){ - policyName = policyName.replace("/", File.separator); + if(policyName.contains(FORWARD_SLASH)){ + policyName = policyName.replace(FORWARD_SLASH, File.separator); } - if(policyName.contains("\\")){ - policyName = policyName.replace("\\", "\\\\"); + if(policyName.contains(BACKSLASH)){ + policyName = policyName.replace(BACKSLASH, ESCAPE_BACKSLASH); } String query = "update PolicyVersion set active_version='"+activeVersion+"' where policy_name ='"+policyName+"' and id >0"; //query the database @@ -522,20 +550,20 @@ public class PolicyManagerServlet extends HttpServlet { JSONObject object = null; String path = params.getString("path"); String policyName = null; - if(path.startsWith("/")){ + if(path.startsWith(FORWARD_SLASH)){ path = path.substring(1); policyName = path.substring(path.lastIndexOf('/') +1); - path = path.replace("/", "."); + path = path.replace(FORWARD_SLASH, "."); }else{ - path = path.replace("/", "."); + path = path.replace(FORWARD_SLASH, "."); policyName = path; } - if(path.contains("Config_")){ - path = path.replace(".Config_", ":Config_"); - }else if(path.contains("Action_")){ - path = path.replace(".Action_", ":Action_"); - }else if(path.contains("Decision_")){ - path = path.replace(".Decision_", ":Decision_"); + if(path.contains(CONFIG_)){ + path = path.replace(CONFIG, CONFIG1); + }else if(path.contains(ACTION_)){ + path = path.replace(ACTION, ACTION1); + }else if(path.contains(DECISION_)){ + path = path.replace(DECISION, DECISION1); } PolicyController controller = getPolicyControllerInstance(); String[] split = path.split(":"); @@ -588,15 +616,14 @@ public class PolicyManagerServlet extends HttpServlet { } private JSONObject processPolicyList(JSONObject params, HttpServletRequest request) throws ServletException { - List<String> roles; - Set<String> scopes;PolicyController controller = getPolicyControllerInstance(); + PolicyController controller = getPolicyControllerInstance(); //Get the Login Id of the User from Request String testUserID = getTestUserId(); String userId = testUserID != null ? testUserID : UserUtils.getUserSession(request).getOrgUserId(); List<Object> userRoles = controller.getRoles(userId); Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles); - roles = pair.u; - scopes = pair.t; + List<String> roles = pair.u; + Set<String> scopes = pair.t; List<JSONObject> resultList = new ArrayList<>(); boolean onlyFolders = params.getBoolean("onlyFolders"); @@ -609,15 +636,15 @@ public class PolicyManagerServlet extends HttpServlet { if(scopes.isEmpty()){ return error("No Scopes has been Assigned to the User. Please, Contact Super-Admin"); }else{ - if(!"/".equals(path)){ + if(!FORWARD_SLASH.equals(path)){ String tempScope = path.substring(1, path.length()); - tempScope = tempScope.replace("/", File.separator); + tempScope = tempScope.replace(FORWARD_SLASH, File.separator); scopes.add(tempScope); } } } - if (!"/".equals(path)) { + if (!FORWARD_SLASH.equals(path)) { try{ String scopeName = path.substring(path.indexOf('/') +1); activePolicyList(scopeName, resultList, roles, scopes, onlyFolders); @@ -689,11 +716,11 @@ public class PolicyManagerServlet extends HttpServlet { private void activePolicyList(String inScopeName, List<JSONObject> resultList, List<String> roles, Set<String> scopes, boolean onlyFolders){ PolicyController controller = getPolicyControllerInstance(); String scopeName = inScopeName; - if(scopeName.contains("/")){ - scopeName = scopeName.replace("/", File.separator); + if(scopeName.contains(FORWARD_SLASH)){ + scopeName = scopeName.replace(FORWARD_SLASH, File.separator); } - if(scopeName.contains("\\")){ - scopeName = scopeName.replace("\\", "\\\\"); + if(scopeName.contains(BACKSLASH)){ + scopeName = scopeName.replace(BACKSLASH, ESCAPE_BACKSLASH); } String query = "from PolicyVersion where POLICY_NAME like :scopeName"; String scopeNamequery = "from PolicyEditorScopes where SCOPENAME like :scopeName"; @@ -718,8 +745,8 @@ public class PolicyManagerServlet extends HttpServlet { PolicyVersion policy = (PolicyVersion) list; String scopeNameValue = policy.getPolicyName().substring(0, policy.getPolicyName().lastIndexOf(File.separator)); if(roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)){ - if(scopeName.contains("\\\\")){ - scopeNameCheck = scopeName.replace("\\\\", File.separator); + if(scopeName.contains(ESCAPE_BACKSLASH)){ + scopeNameCheck = scopeName.replace(ESCAPE_BACKSLASH, File.separator); }else{ scopeNameCheck = scopeName; } @@ -752,8 +779,8 @@ public class PolicyManagerServlet extends HttpServlet { String scope = scopeById.getScopeName(); if(scope.contains(File.separator)){ String targetScope = scope.substring(0, scope.lastIndexOf(File.separator)); - if(scopeName.contains("\\\\")){ - scopeName = scopeName.replace("\\\\", File.separator); + if(scopeName.contains(ESCAPE_BACKSLASH)){ + scopeName = scopeName.replace(ESCAPE_BACKSLASH, File.separator); } if(scope.contains(File.separator)){ scope = scope.substring(targetScope.length()+1); @@ -807,7 +834,7 @@ public class PolicyManagerServlet extends HttpServlet { if(oldPath.endsWith(".xml")){ checkValidation = newPath.replace(".xml", ""); checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1, checkValidation.lastIndexOf(".")); - checkValidation = checkValidation.substring(checkValidation.lastIndexOf("/")+1); + checkValidation = checkValidation.substring(checkValidation.lastIndexOf(FORWARD_SLASH)+1); if(!PolicyUtils.policySpecialCharValidator(checkValidation).contains("success")){ return error("Policy Rename Failed. The Name contains special characters."); } @@ -818,14 +845,14 @@ public class PolicyManagerServlet extends HttpServlet { }else{ String scopeName = oldPath; String newScopeName = newPath; - if(scopeName.contains("/")){ - scopeName = scopeName.replace("/", File.separator); - newScopeName = newScopeName.replace("/", File.separator); + if(scopeName.contains(FORWARD_SLASH)){ + scopeName = scopeName.replace(FORWARD_SLASH, File.separator); + newScopeName = newScopeName.replace(FORWARD_SLASH, File.separator); } checkValidation = newScopeName.substring(newScopeName.lastIndexOf(File.separator)+1); - if(scopeName.contains("\\")){ - scopeName = scopeName.replace("\\", "\\\\\\\\"); - newScopeName = newScopeName.replace("\\", "\\\\\\\\"); + if(scopeName.contains(BACKSLASH)){ + scopeName = scopeName.replace(BACKSLASH, BACKSLASH_8TIMES); + newScopeName = newScopeName.replace(BACKSLASH, BACKSLASH_8TIMES); } if(!PolicyUtils.policySpecialCharValidator(checkValidation).contains("success")){ return error("Scope Rename Failed. The Name contains special characters."); @@ -839,14 +866,14 @@ public class PolicyManagerServlet extends HttpServlet { List<Object> scopesList = controller.getDataByQuery(scopeNamequery, pvParams); for(Object object : activePolicies){ PolicyVersion activeVersion = (PolicyVersion) object; - String policyOldPath = activeVersion.getPolicyName().replace(File.separator, "/") + "." + activeVersion.getActiveVersion() + ".xml"; + String policyOldPath = activeVersion.getPolicyName().replace(File.separator, FORWARD_SLASH) + "." + activeVersion.getActiveVersion() + ".xml"; String policyNewPath = policyOldPath.replace(oldPath, newPath); JSONObject result = policyRename(policyOldPath, policyNewPath, userId); if(!(Boolean)(result.getJSONObject("result").get("success"))){ isActive = true; policyActiveInPDP.add(policyOldPath); String scope = policyOldPath.substring(0, policyOldPath.lastIndexOf('/')); - scopeOfPolicyActiveInPDP.add(scope.replace("/", File.separator)); + scopeOfPolicyActiveInPDP.add(scope.replace(FORWARD_SLASH, File.separator)); } } boolean rename = false; @@ -862,7 +889,7 @@ public class PolicyManagerServlet extends HttpServlet { renameScope(scopesList, scopeName, newScopeName, controller); for(String scope : scopeOfPolicyActiveInPDP){ PolicyEditorScopes editorScopeEntity = new PolicyEditorScopes(); - editorScopeEntity.setScopeName(scope.replace("\\", "\\\\\\\\")); + editorScopeEntity.setScopeName(scope.replace(BACKSLASH, BACKSLASH_8TIMES)); editorScopeEntity.setUserCreatedBy(userInfo); editorScopeEntity.setUserModifiedBy(userInfo); controller.saveData(editorScopeEntity); @@ -879,9 +906,9 @@ public class PolicyManagerServlet extends HttpServlet { for(Object object : scopesList){ PolicyEditorScopes editorScopeEntity = (PolicyEditorScopes) object; String scopeName = inScopeName; - if(scopeName.contains("\\\\\\\\")){ - scopeName = scopeName.replace("\\\\\\\\", File.separator); - newScopeName = newScopeName.replace("\\\\\\\\", File.separator); + if(scopeName.contains(BACKSLASH_8TIMES)){ + scopeName = scopeName.replace(BACKSLASH_8TIMES, File.separator); + newScopeName = newScopeName.replace(BACKSLASH_8TIMES, File.separator); } String scope = editorScopeEntity.getScopeName().replace(scopeName, newScopeName); editorScopeEntity.setScopeName(scope); @@ -895,32 +922,14 @@ public class PolicyManagerServlet extends HttpServlet { PolicyController controller = getPolicyControllerInstance(); String policyVersionName = newPath.replace(".xml", ""); - String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace("/", File.separator); + String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator); String oldpolicyVersionName = oldPath.replace(".xml", ""); - String oldpolicyName = oldpolicyVersionName.substring(0, oldpolicyVersionName.lastIndexOf('.')).replace("/", File.separator); - + String oldpolicyName = oldpolicyVersionName.substring(0, oldpolicyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator); String newpolicyName = newPath.replace("/", "."); - String newPolicyCheck = newpolicyName; - if(newPolicyCheck.contains("Config_")){ - newPolicyCheck = newPolicyCheck.replace(".Config_", ":Config_"); - }else if(newPolicyCheck.contains("Action_")){ - newPolicyCheck = newPolicyCheck.replace(".Action_", ":Action_"); - }else if(newPolicyCheck.contains("Decision_")){ - newPolicyCheck = newPolicyCheck.replace(".Decision_", ":Decision_"); - } - String[] newPolicySplit = newPolicyCheck.split(":"); + String[] newPolicySplit = modifyPolicyName(newPath); - String orignalPolicyName = oldPath.replace("/", "."); - String oldPolicyCheck = orignalPolicyName; - if(oldPolicyCheck.contains("Config_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Config_", ":Config_"); - }else if(oldPolicyCheck.contains("Action_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Action_", ":Action_"); - }else if(oldPolicyCheck.contains("Decision_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Decision_", ":Decision_"); - } - String[] oldPolicySplit = oldPolicyCheck.split(":"); + String[] oldPolicySplit = modifyPolicyName(oldPath); //Check PolicyEntity table with newPolicy Name String policyEntityquery = "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0"; @@ -939,36 +948,36 @@ public class PolicyManagerServlet extends HttpServlet { params.put("policyEntityCheck", policyEntityCheck + "%"); params.put("oldPolicySplit_0", oldPolicySplit[0]); List<Object> oldEntityData = controller.getDataByQuery(oldpolicyEntityquery, params); - if(!oldEntityData.isEmpty()){ - StringBuilder groupQuery = new StringBuilder(); - groupQuery.append("FROM PolicyGroupEntity where ("); - SimpleBindings geParams = new SimpleBindings(); - for(int i=0; i<oldEntityData.size(); i++){ - entity = (PolicyEntity) oldEntityData.get(i); - if(i == 0){ - groupQuery.append("policyid = :policyId"); - geParams.put("policyId", entity.getPolicyId()); - }else{ - groupQuery.append(" or policyid = :policyId" + i); - geParams.put("policyId" + i, entity.getPolicyId()); - } - } - groupQuery.append(")"); - List<Object> groupEntityData = controller.getDataByQuery(groupQuery.toString(), geParams); - if(! groupEntityData.isEmpty()){ - return error("Policy rename failed. Since the policy or its version is active in PDP Groups."); + if(oldEntityData.isEmpty()){ + return error("Policy rename failed due to policy not able to retrieve from database. Please, contact super-admin."); + } + + StringBuilder groupQuery = new StringBuilder(); + groupQuery.append("FROM PolicyGroupEntity where ("); + SimpleBindings geParams = new SimpleBindings(); + for(int i=0; i<oldEntityData.size(); i++){ + entity = (PolicyEntity) oldEntityData.get(i); + if(i == 0){ + groupQuery.append("policyid = :policyId"); + geParams.put("policyId", entity.getPolicyId()); + }else{ + groupQuery.append(" or policyid = :policyId" + i); + geParams.put("policyId" + i, entity.getPolicyId()); } - for(int i=0; i<oldEntityData.size(); i++){ - entity = (PolicyEntity) oldEntityData.get(i); - String checkEntityName = entity.getPolicyName().replace(".xml", ""); - checkEntityName = checkEntityName.substring(0, checkEntityName.lastIndexOf('.')); - String originalPolicyName = oldpolicyName.substring(oldpolicyName.lastIndexOf(File.separator)+1); - if(checkEntityName.equals(originalPolicyName)){ - checkOldPolicyEntryAndUpdate(entity, newPolicySplit[0] , newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1], policyName, newpolicyName, oldpolicyName, userId); - } + } + groupQuery.append(")"); + List<Object> groupEntityData = controller.getDataByQuery(groupQuery.toString(), geParams); + if(! groupEntityData.isEmpty()){ + return error("Policy rename failed. Since the policy or its version is active in PDP Groups."); + } + for(int i=0; i<oldEntityData.size(); i++){ + entity = (PolicyEntity) oldEntityData.get(i); + String checkEntityName = entity.getPolicyName().replace(".xml", ""); + checkEntityName = checkEntityName.substring(0, checkEntityName.lastIndexOf('.')); + String originalPolicyName = oldpolicyName.substring(oldpolicyName.lastIndexOf(File.separator)+1); + if(checkEntityName.equals(originalPolicyName)){ + checkOldPolicyEntryAndUpdate(entity, newPolicySplit[0] , newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1], policyName, newpolicyName, oldpolicyName, userId); } - }else{ - return error("Policy rename failed due to policy not able to retrieve from database. Please, contact super-admin."); } return success(); @@ -978,6 +987,22 @@ public class PolicyManagerServlet extends HttpServlet { } } + private String[] modifyPolicyName(String pathName) { + return modifyPolicyName(FORWARD_SLASH, pathName); + } + + private String[] modifyPolicyName(String separator, String pathName) { + String policyName = pathName.replace(separator, "."); + if(policyName.contains(CONFIG_)){ + policyName = policyName.replace(CONFIG, CONFIG1); + }else if(policyName.contains(ACTION_)){ + policyName = policyName.replace(ACTION, ACTION1); + }else if(policyName.contains(DECISION_)){ + policyName = policyName.replace(DECISION, DECISION1); + } + return policyName.split(":"); + } + private JSONObject checkOldPolicyEntryAndUpdate(PolicyEntity entity, String newScope, String removenewPolicyExtension, String oldScope, String removeoldPolicyExtension, String policyName, String newpolicyName, String oldpolicyName, String userId) throws ServletException{ try { @@ -998,7 +1023,7 @@ public class PolicyManagerServlet extends HttpServlet { String oldConfigurationName = null; String newConfigurationName = null; - if(newpolicyName.contains("Config_")){ + if(newpolicyName.contains(CONFIG_)){ oldConfigurationName = configEntity.getConfigurationName(); configEntity.setConfigurationName(configEntity.getConfigurationName().replace(oldScope +"."+oldPolicyNameWithoutExtension, newScope+"."+newPolicyNameWithoutExtension)); controller.updateData(configEntity); @@ -1008,7 +1033,7 @@ public class PolicyManagerServlet extends HttpServlet { File renamefile = new File(PolicyController.getConfigHome() + File.separator + newConfigurationName); file.renameTo(renamefile); } - }else if(newpolicyName.contains("Action_")){ + }else if(newpolicyName.contains(ACTION_)){ oldConfigurationName = actionEntity.getActionBodyName(); actionEntity.setActionBody(actionEntity.getActionBody().replace(oldScope +"."+oldPolicyNameWithoutExtension, newScope+"."+newPolicyNameWithoutExtension)); controller.updateData(actionEntity); @@ -1036,7 +1061,7 @@ public class PolicyManagerServlet extends HttpServlet { } return success(); } catch (Exception e) { - LOGGER.error("Exception Occured"+e); + LOGGER.error(EXCEPTION_OCCURED +e); return error(e.getMessage()); } } @@ -1055,7 +1080,7 @@ public class PolicyManagerServlet extends HttpServlet { String oldConfigRemoveExtension = removeoldPolicyExtension.replace(".xml", ""); String newConfigRemoveExtension = removenewPolicyExtension.replace(".xml", ""); String newConfigurationName = null; - if(newpolicyName.contains("Config_")){ + if(newpolicyName.contains(CONFIG_)){ ConfigurationDataEntity configurationDataEntity = new ConfigurationDataEntity(); configurationDataEntity.setConfigurationName(entity.getConfigurationData().getConfigurationName().replace(oldScope+"."+oldConfigRemoveExtension, newScope+"."+newConfigRemoveExtension)); queryEntityName = configurationDataEntity.getConfigurationName(); @@ -1074,7 +1099,7 @@ public class PolicyManagerServlet extends HttpServlet { } catch (IOException e) { LOGGER.error("Exception Occured While cloning the configuration file"+e); } - }else if(newpolicyName.contains("Action_")){ + }else if(newpolicyName.contains(ACTION_)){ ActionBodyEntity actionBodyEntity = new ActionBodyEntity(); actionBodyEntity.setActionBodyName(entity.getActionBodyEntity().getActionBodyName().replace(oldScope+"."+oldConfigRemoveExtension, newScope+"."+newConfigRemoveExtension)); queryEntityName = actionBodyEntity.getActionBodyName(); @@ -1116,19 +1141,19 @@ public class PolicyManagerServlet extends HttpServlet { String policyVersionName = newPath.replace(".xml", ""); String version = policyVersionName.substring(policyVersionName.indexOf('.')+1); - String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace("/", File.separator); + String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator); - String newpolicyName = newPath.replace("/", "."); + String newpolicyName = newPath.replace(FORWARD_SLASH, "."); - String orignalPolicyName = oldPath.replace("/", "."); + String orignalPolicyName = oldPath.replace(FORWARD_SLASH, "."); String newPolicyCheck = newpolicyName; - if(newPolicyCheck.contains("Config_")){ - newPolicyCheck = newPolicyCheck.replace(".Config_", ":Config_"); - }else if(newPolicyCheck.contains("Action_")){ - newPolicyCheck = newPolicyCheck.replace(".Action_", ":Action_"); - }else if(newPolicyCheck.contains("Decision_")){ - newPolicyCheck = newPolicyCheck.replace(".Decision_", ":Decision_"); + if(newPolicyCheck.contains(CONFIG_)){ + newPolicyCheck = newPolicyCheck.replace(CONFIG, CONFIG1); + }else if(newPolicyCheck.contains(ACTION_)){ + newPolicyCheck = newPolicyCheck.replace(ACTION, ACTION1); + }else if(newPolicyCheck.contains(DECISION_)){ + newPolicyCheck = newPolicyCheck.replace(DECISION, DECISION1); } if(!newPolicyCheck.contains(":")){ return error("Policy Clone Failed. The Name contains special characters."); @@ -1141,15 +1166,7 @@ public class PolicyManagerServlet extends HttpServlet { return error("Policy Clone Failed. The Name contains special characters."); } - String oldPolicyCheck = orignalPolicyName; - if(oldPolicyCheck.contains("Config_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Config_", ":Config_"); - }else if(oldPolicyCheck.contains("Action_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Action_", ":Action_"); - }else if(oldPolicyCheck.contains("Decision_")){ - oldPolicyCheck = oldPolicyCheck.replace(".Decision_", ":Decision_"); - } - String[] oldPolicySplit = oldPolicyCheck.split(":"); + String[] oldPolicySplit = modifyPolicyName(orignalPolicyName); PolicyController controller = getPolicyControllerInstance(); @@ -1219,23 +1236,13 @@ public class PolicyManagerServlet extends HttpServlet { deleteVersion = params.getString("deleteVersion"); } path = path.substring(path.indexOf('/')+1); - String policyNamewithExtension = path.replace("/", File.separator); + String policyNamewithExtension = path.replace(FORWARD_SLASH, File.separator); String policyVersionName = policyNamewithExtension.replace(".xml", ""); String query; SimpleBindings policyParams = new SimpleBindings(); if(path.endsWith(".xml")){ policyNamewithoutExtension = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')); - policyNamewithoutExtension = policyNamewithoutExtension.replace(File.separator, "."); - String splitPolicyName = null; - if(policyNamewithoutExtension.contains("Config_")){ - splitPolicyName = policyNamewithoutExtension.replace(".Config_", ":Config_"); - }else if(policyNamewithoutExtension.contains("Action_")){ - splitPolicyName = policyNamewithoutExtension.replace(".Action_", ":Action_"); - }else if(policyNamewithoutExtension.contains("Decision_")){ - splitPolicyName = policyNamewithoutExtension.replace(".Decision_", ":Decision_"); - } - String[] split = splitPolicyName.split(":"); - + String[] split = modifyPolicyName(File.separator, policyNamewithoutExtension); query = "FROM PolicyEntity where policyName like :split_1 and scope = :split_0"; policyParams.put("split_1", split[1] + "%"); policyParams.put("split_0", split[0]); @@ -1267,11 +1274,11 @@ public class PolicyManagerServlet extends HttpServlet { restController.deleteElasticData(searchFileName); //Delete the entity from Policy Entity table controller.deleteData(policyEntity); - if(policyNamewithoutExtension.contains("Config_")){ + if(policyNamewithoutExtension.contains(CONFIG_)){ Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName())); controller.deleteData(policyEntity.getConfigurationData()); restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getConfigurationData().getConfigurationName()); - }else if(policyNamewithoutExtension.contains("Action_")){ + }else if(policyNamewithoutExtension.contains(ACTION_)){ Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName())); controller.deleteData(policyEntity.getActionBodyEntity()); restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getActionBodyEntity().getActionBodyName()); @@ -1288,17 +1295,13 @@ public class PolicyManagerServlet extends HttpServlet { //Delete from policyVersion table String getActivePDPPolicyVersion = activePolicyName.replace(".xml", ""); getActivePDPPolicyVersion = getActivePDPPolicyVersion.substring(getActivePDPPolicyVersion.lastIndexOf('.')+1); - String policyVersionQuery = "update PolicyVersion set active_version='"+getActivePDPPolicyVersion+"' , highest_version='"+getActivePDPPolicyVersion+"' where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; - if(policyVersionQuery != null){ - controller.executeQuery(policyVersionQuery); - } + String policyVersionQuery = "update PolicyVersion set active_version='"+getActivePDPPolicyVersion+"' , highest_version='"+getActivePDPPolicyVersion+"' where policy_name ='" +policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH)+"' and id >0"; + controller.executeQuery(policyVersionQuery); return error("Policies with Same name has been deleted. Except the Active Policy in PDP. PolicyName: "+activePolicyName); }else{ //No Active Policy in PDP. So, deleting all entries from policyVersion table - String policyVersionQuery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; - if(policyVersionQuery != null){ - controller.executeQuery(policyVersionQuery); - } + String policyVersionQuery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH)+"' and id >0"; + controller.executeQuery(policyVersionQuery); } }else if("CURRENT".equals(deleteVersion)){ String currentVersionPolicyName = policyNamewithExtension.substring(policyNamewithExtension.lastIndexOf(File.separator)+1); @@ -1313,128 +1316,129 @@ public class PolicyManagerServlet extends HttpServlet { if(!policyEntitys.isEmpty()){ policyEntity = (PolicyEntity) policyEntitys.get(0); } - if(policyEntity != null){ - String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId and policyid > 0"; - SimpleBindings geParams = new SimpleBindings(); - geParams.put("policyEntityId", policyEntity.getPolicyId()); - List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams); - if(groupobject.isEmpty()){ - //Delete the entity from Elastic Search Database - String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName(); - restController.deleteElasticData(searchFileName); - //Delete the entity from Policy Entity table - controller.deleteData(policyEntity); - if(policyNamewithoutExtension.contains("Config_")){ - Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName())); - controller.deleteData(policyEntity.getConfigurationData()); - restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getConfigurationData().getConfigurationName()); - }else if(policyNamewithoutExtension.contains("Action_")){ - Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName())); - controller.deleteData(policyEntity.getActionBodyEntity()); - restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getActionBodyEntity().getActionBodyName()); - } + if(policyEntity == null){ + return success(); + } - if(version > 1){ - int highestVersion = 0; - if(!policyEntityobjects.isEmpty()){ - for(Object object : policyEntityobjects){ - policyEntity = (PolicyEntity) object; - String policyEntityName = policyEntity.getPolicyName().replace(".xml", ""); - int policyEntityVersion = Integer.parseInt(policyEntityName.substring(policyEntityName.lastIndexOf('.')+1)); - if(policyEntityVersion > highestVersion && policyEntityVersion != version){ - highestVersion = policyEntityVersion; - } - } - } + String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId and policyid > 0"; + SimpleBindings geParams = new SimpleBindings(); + geParams.put("policyEntityId", policyEntity.getPolicyId()); + List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams); + if(!groupobject.isEmpty()){ + return error("Policy can't be deleted, it is active in PDP Groups. PolicyName: '"+policyEntity.getScope() + "." +policyEntity.getPolicyName()+"'"); + } - //Policy Notification - PolicyVersion entity = new PolicyVersion(); - entity.setPolicyName(policyNamewithoutExtension); - entity.setActiveVersion(highestVersion); - entity.setModifiedBy(userId); - controller.watchPolicyFunction(entity, policyNamewithExtension, "DeleteOne"); - - String updatequery = ""; - if(highestVersion != 0){ - updatequery = "update PolicyVersion set active_version='"+highestVersion+"' , highest_version='"+highestVersion+"' where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"'"; - }else{ - updatequery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; - } - controller.executeQuery(updatequery); - }else{ - String policyVersionQuery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; - if(policyVersionQuery != null){ - controller.executeQuery(policyVersionQuery); + //Delete the entity from Elastic Search Database + String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName(); + restController.deleteElasticData(searchFileName); + //Delete the entity from Policy Entity table + controller.deleteData(policyEntity); + if(policyNamewithoutExtension.contains(CONFIG_)){ + Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName())); + controller.deleteData(policyEntity.getConfigurationData()); + restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getConfigurationData().getConfigurationName()); + }else if(policyNamewithoutExtension.contains(ACTION_)){ + Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName())); + controller.deleteData(policyEntity.getActionBodyEntity()); + restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getActionBodyEntity().getActionBodyName()); + } + + if(version > 1){ + int highestVersion = 0; + if(!policyEntityobjects.isEmpty()){ + for(Object object : policyEntityobjects){ + policyEntity = (PolicyEntity) object; + String policyEntityName = policyEntity.getPolicyName().replace(".xml", ""); + int policyEntityVersion = Integer.parseInt(policyEntityName.substring(policyEntityName.lastIndexOf('.')+1)); + if(policyEntityVersion > highestVersion && policyEntityVersion != version){ + highestVersion = policyEntityVersion; } } + } + + //Policy Notification + PolicyVersion entity = new PolicyVersion(); + entity.setPolicyName(policyNamewithoutExtension); + entity.setActiveVersion(highestVersion); + entity.setModifiedBy(userId); + controller.watchPolicyFunction(entity, policyNamewithExtension, "DeleteOne"); + + String updatequery = ""; + if(highestVersion != 0){ + updatequery = "update PolicyVersion set active_version='"+highestVersion+"' , highest_version='"+highestVersion+"' where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"'"; }else{ - return error("Policy can't be deleted, it is active in PDP Groups. PolicyName: '"+policyEntity.getScope() + "." +policyEntity.getPolicyName()+"'"); + updatequery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; } + controller.executeQuery(updatequery); + }else{ + String policyVersionQuery = "delete from PolicyVersion where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0"; + controller.executeQuery(policyVersionQuery); } } }else{ List<String> activePoliciesInPDP = new ArrayList<>(); - if(!policyEntityobjects.isEmpty()){ - for(Object object : policyEntityobjects){ - policyEntity = (PolicyEntity) object; - String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId"; - SimpleBindings geParams = new SimpleBindings(); - geParams.put("policyEntityId", policyEntity.getPolicyId()); - List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams); - if(!groupobject.isEmpty()){ - pdpCheck = true; - activePoliciesInPDP.add(policyEntity.getScope()+"."+policyEntity.getPolicyName()); - }else{ - //Delete the entity from Elastic Search Database - String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName(); - restController.deleteElasticData(searchFileName); - //Delete the entity from Policy Entity table - controller.deleteData(policyEntity); - policyNamewithoutExtension = policyEntity.getPolicyName(); - if(policyNamewithoutExtension.contains("Config_")){ - Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName())); - controller.deleteData(policyEntity.getConfigurationData()); - restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getConfigurationData().getConfigurationName()); - }else if(policyNamewithoutExtension.contains("Action_")){ - Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName())); - controller.deleteData(policyEntity.getActionBodyEntity()); - restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getActionBodyEntity().getActionBodyName()); - } + if(policyEntityobjects.isEmpty()){ + String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace(BACKSLASH, ESCAPE_BACKSLASH)+"%' and id >0"; + controller.executeQuery(policyScopeQuery); + return success(); + } + for(Object object : policyEntityobjects){ + policyEntity = (PolicyEntity) object; + String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId"; + SimpleBindings geParams = new SimpleBindings(); + geParams.put("policyEntityId", policyEntity.getPolicyId()); + List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams); + if(!groupobject.isEmpty()){ + pdpCheck = true; + activePoliciesInPDP.add(policyEntity.getScope()+"."+policyEntity.getPolicyName()); + }else{ + //Delete the entity from Elastic Search Database + String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName(); + restController.deleteElasticData(searchFileName); + //Delete the entity from Policy Entity table + controller.deleteData(policyEntity); + policyNamewithoutExtension = policyEntity.getPolicyName(); + if(policyNamewithoutExtension.contains(CONFIG_)){ + Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName())); + controller.deleteData(policyEntity.getConfigurationData()); + restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getConfigurationData().getConfigurationName()); + }else if(policyNamewithoutExtension.contains(ACTION_)){ + Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName())); + controller.deleteData(policyEntity.getActionBodyEntity()); + restController.notifyOtherPAPSToUpdateConfigurations("delete", null, policyEntity.getActionBodyEntity().getActionBodyName()); } } - //Delete from policyVersion and policyEditor Scope table - String policyVersionQuery = "delete PolicyVersion where POLICY_NAME like '"+path.replace("\\", "\\\\")+"%' and id >0"; - controller.executeQuery(policyVersionQuery); - - //Policy Notification - PolicyVersion entity = new PolicyVersion(); - entity.setPolicyName(path); - entity.setModifiedBy(userId); - controller.watchPolicyFunction(entity, path, "DeleteScope"); - if(pdpCheck){ - //Add Active Policies List to PolicyVersionTable - for(int i =0; i < activePoliciesInPDP.size(); i++){ - String activePDPPolicyName = activePoliciesInPDP.get(i).replace(".xml", ""); - int activePDPPolicyVersion = Integer.parseInt(activePDPPolicyName.substring(activePDPPolicyName.lastIndexOf('.')+1)); - activePDPPolicyName = activePDPPolicyName.substring(0, activePDPPolicyName.lastIndexOf('.')).replace(".", File.separator); - PolicyVersion insertactivePDPVersion = new PolicyVersion(); - insertactivePDPVersion.setPolicyName(activePDPPolicyName); - insertactivePDPVersion.setHigherVersion(activePDPPolicyVersion); - insertactivePDPVersion.setActiveVersion(activePDPPolicyVersion); - insertactivePDPVersion.setCreatedBy(userId); - insertactivePDPVersion.setModifiedBy(userId); - controller.saveData(insertactivePDPVersion); - } - - return error("All the Policies has been deleted in Scope. Except the following list of Policies:"+activePoliciesInPDP); - }else{ - String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace("\\", "\\\\")+"%' and id >0"; - controller.executeQuery(policyScopeQuery); + } + //Delete from policyVersion and policyEditor Scope table + String policyVersionQuery = "delete PolicyVersion where POLICY_NAME like '"+path.replace(BACKSLASH, ESCAPE_BACKSLASH)+"%' and id >0"; + controller.executeQuery(policyVersionQuery); + + //Policy Notification + PolicyVersion entity = new PolicyVersion(); + entity.setPolicyName(path); + entity.setModifiedBy(userId); + controller.watchPolicyFunction(entity, path, "DeleteScope"); + if(pdpCheck){ + //Add Active Policies List to PolicyVersionTable + for(int i =0; i < activePoliciesInPDP.size(); i++){ + String activePDPPolicyName = activePoliciesInPDP.get(i).replace(".xml", ""); + int activePDPPolicyVersion = Integer.parseInt(activePDPPolicyName.substring(activePDPPolicyName.lastIndexOf('.')+1)); + activePDPPolicyName = activePDPPolicyName.substring(0, activePDPPolicyName.lastIndexOf('.')).replace(".", File.separator); + PolicyVersion insertactivePDPVersion = new PolicyVersion(); + insertactivePDPVersion.setPolicyName(activePDPPolicyName); + insertactivePDPVersion.setHigherVersion(activePDPPolicyVersion); + insertactivePDPVersion.setActiveVersion(activePDPPolicyVersion); + insertactivePDPVersion.setCreatedBy(userId); + insertactivePDPVersion.setModifiedBy(userId); + controller.saveData(insertactivePDPVersion); } + + return error("All the Policies has been deleted in Scope. Except the following list of Policies:"+activePoliciesInPDP); }else{ - String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace("\\", "\\\\")+"%' and id >0"; + String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace(BACKSLASH, ESCAPE_BACKSLASH)+"%' and id >0"; controller.executeQuery(policyScopeQuery); } + } return success(); } catch (Exception e) { @@ -1453,20 +1457,13 @@ public class PolicyManagerServlet extends HttpServlet { LOGGER.debug("editFile path: {}"+ path); String domain = path.substring(1, path.lastIndexOf('/')); - domain = domain.replace("/", "."); + domain = domain.replace(FORWARD_SLASH, "."); path = path.substring(1); - path = path.replace("/", "."); - String dbCheckName = path; - if(dbCheckName.contains("Config_")){ - dbCheckName = dbCheckName.replace(".Config_", ":Config_"); - }else if(dbCheckName.contains("Action_")){ - dbCheckName = dbCheckName.replace(".Action_", ":Action_"); - }else if(dbCheckName.contains("Decision_")){ - dbCheckName = dbCheckName.replace(".Decision_", ":Decision_"); - } + path = path.replace(FORWARD_SLASH, "."); + + String[] split = modifyPolicyName(path); - String[] split = dbCheckName.split(":"); String query = "FROM PolicyEntity where policyName = :split_1 and scope = :split_0"; SimpleBindings peParams = new SimpleBindings(); peParams.put("split_1", split[1]); @@ -1524,7 +1521,7 @@ public class PolicyManagerServlet extends HttpServlet { try{ if(params.has("subScopename")){ if(! "".equals(params.getString("subScopename"))) { - name = params.getString("path").replace("/", File.separator) + File.separator +params.getString("subScopename"); + name = params.getString("path").replace(FORWARD_SLASH, File.separator) + File.separator +params.getString("subScopename"); } }else{ name = params.getString(NAME); diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java index c791910ad..da73613fc 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyNotificationMail.java @@ -54,6 +54,8 @@ public class PolicyNotificationMail{ private static final String POLICY_WATCHING_MESSAGE = "The Policy Which you are watching in "; private static final String EMAIL_MESSAGE_POSTSCRIPT = "Policy Notification System (please don't respond to this email)"; private static final String ACTIVE_VERSION = "Active Version : "; + private static final String SCOPE_POLICY_NAME = "Scope + Policy Name : "; + private static final String DELETED_TIME = "Deleted Time : "; private static Logger policyLogger = FlexLogger.getLogger(PolicyNotificationMail.class); @Bean @@ -89,56 +91,50 @@ public class PolicyNotificationMail{ Date date = new Date(); if("EditPolicy".equalsIgnoreCase(mode)){ subject = "Policy has been Updated : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Updated" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Updated" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + '\n' + '\n' + "Modified By : " +entityItem.getModifiedBy() + '\n' + "Modified Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("Rename".equalsIgnoreCase(mode)){ subject = "Policy has been Renamed : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Renamed" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Renamed" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + '\n' + '\n' + "Renamed By : " +entityItem.getModifiedBy() + '\n' + "Renamed Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("DeleteAll".equalsIgnoreCase(mode)){ subject = "Policy has been Deleted : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Deleted with All Versions" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' - + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + "Deleted Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Deleted with All Versions" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' + + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + DELETED_TIME +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("DeleteOne".equalsIgnoreCase(mode)){ subject = "Policy has been Deleted : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Deleted" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' +"Policy Version : " +entityItem.getActiveVersion() - + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + "Deleted Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Deleted" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' +"Policy Version : " +entityItem.getActiveVersion() + + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + DELETED_TIME +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("DeleteScope".equalsIgnoreCase(mode)){ subject = "Scope has been Deleted : "+entityItem.getPolicyName(); message = "The Scope Which you are watching in " + PolicyController.getSmtpApplicationName() + " has been Deleted" + '\n' + '\n' + '\n'+ "Scope + Scope Name : " + policyName + '\n' - + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + "Deleted Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; + + '\n' + '\n' + "Deleted By : " +entityItem.getModifiedBy() + '\n' + DELETED_TIME +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("SwitchVersion".equalsIgnoreCase(mode)){ subject = "Policy has been SwitchedVersion : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been SwitchedVersion" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been SwitchedVersion" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + '\n' + '\n' + "Switched By : " +entityItem.getModifiedBy() + '\n' + "Switched Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } if("Move".equalsIgnoreCase(mode)){ subject = "Policy has been Moved to Other Scope : "+entityItem.getPolicyName(); - message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Moved to Other Scope" + '\n' + '\n' + '\n'+ "Scope + Policy Name : " + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + message = POLICY_WATCHING_MESSAGE + PolicyController.getSmtpApplicationName() + " has been Moved to Other Scope" + '\n' + '\n' + '\n'+ SCOPE_POLICY_NAME + policyName + '\n' + ACTIVE_VERSION +entityItem.getActiveVersion() + '\n' + '\n' + "Moved By : " +entityItem.getModifiedBy() + '\n' + "Moved Time : " +dateFormat.format(date) + '\n' + '\n' + '\n' + '\n' + EMAIL_MESSAGE_POSTSCRIPT; } - String policyFileName = entityItem.getPolicyName(); - String checkPolicyName = policyName; - if(checkPolicyName.endsWith(".xml") || checkPolicyName.contains(".")){ - checkPolicyName = checkPolicyName.substring(0, checkPolicyName.indexOf('.')); - } - if(policyFileName.contains("/")){ - policyFileName = policyFileName.substring(0, policyFileName.indexOf('/')); - policyFileName = policyFileName.replace("/", File.separator); - } - if(policyFileName.contains("\\")){ - policyFileName = policyFileName.substring(0, policyFileName.indexOf('\\')); - policyFileName = policyFileName.replace("\\", "\\\\"); - } + String checkPolicyName = findCheckPolicyName(policyName); - policyFileName += "%"; + String policyFileName = findPolicyFileName(entityItem); String query = "from WatchPolicyNotificationTable where policyName like:policyFileName"; + List<Object> watchList = findWatchList(policyNotificationDao, policyFileName, query); + if (watchList == null) return; + composeAndSendMail(mode, policyNotificationDao, subject, message, checkPolicyName, watchList); + } + + private List<Object> findWatchList(CommonClassDao policyNotificationDao, String policyFileName, String query) { SimpleBindings params = new SimpleBindings(); params.put("policyFileName", policyFileName); List<Object> watchList; @@ -150,10 +146,32 @@ public class PolicyNotificationMail{ if(watchList == null || watchList.isEmpty()) { policyLogger.debug("List of policy being watched is either null or empty, hence return without sending mail"); - return; + return null; + } + return watchList; + } + + private String findPolicyFileName(PolicyVersion entityItem) { + String policyFileName = entityItem.getPolicyName(); + if(policyFileName.contains("/")){ + policyFileName = policyFileName.substring(0, policyFileName.indexOf('/')); + policyFileName = policyFileName.replace("/", File.separator); + } + if(policyFileName.contains("\\")){ + policyFileName = policyFileName.substring(0, policyFileName.indexOf('\\')); + policyFileName = policyFileName.replace("\\", "\\\\"); } - composeAndSendMail(mode, policyNotificationDao, subject, message, checkPolicyName, watchList); + policyFileName += "%"; + return policyFileName; + } + + private String findCheckPolicyName(String policyName) { + String checkPolicyName = policyName; + if(checkPolicyName.endsWith(".xml") || checkPolicyName.contains(".")){ + checkPolicyName = checkPolicyName.substring(0, checkPolicyName.indexOf('.')); + } + return checkPolicyName; } /** diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java index 2a52335e5..1c613ef5e 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.Base64; import java.util.List; +import javax.mail.MessagingException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -83,6 +84,19 @@ public class PolicyRestController extends RestrictedBaseController{ private static final String model = "model"; private static final String importDictionary = "import_dictionary"; + private static final String FILE = "file"; + private static final String TYPE = "type"; + private static final String PATH = "path"; + private static final String NAME = "name"; + private static final String CLOSED_LOOP_FAULT = "ClosedLoop_Fault"; + private static final String FIREWALL_CONFIG = "Firewall Config"; + private static final String MICRO_SERVICE = "Micro Service"; + private static final String OPTIMIZATION = "Optimization"; + private static final String POLICY_NAME = "policyName"; + private static final String SUCCESS = "success"; + private static final String XML = ".xml"; + private static final String UTF_8 = "UTF-8"; + private static final String DATA = "data"; private static CommonClassDao commonClassDao; @@ -111,87 +125,95 @@ public class PolicyRestController extends RestrictedBaseController{ ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); try{ - JsonNode root = mapper.readTree(request.getReader()); + updateAndSendToPAP(request, response, userId, mapper); + }catch(Exception e){ + policyLogger.error("Exception Occured while saving policy" , e); + } + } - policyLogger.info("****************************************Logging UserID while Create/Update Policy**************************************************"); - policyLogger.info("UserId: " + userId + "Policy Data Object: "+ root.get(PolicyController.getPolicydata()).get("policy").toString()); - policyLogger.info("***********************************************************************************************************************************"); + private void updateAndSendToPAP(HttpServletRequest request, HttpServletResponse response, String userId, ObjectMapper mapper) throws IOException, MessagingException { + JsonNode root = mapper.readTree(request.getReader()); - PolicyRestAdapter policyData = mapper.readValue(root.get(PolicyController.getPolicydata()).get("policy").toString(), PolicyRestAdapter.class); + policyLogger.info("****************************************Logging UserID while Create/Update Policy**************************************************"); + policyLogger.info("UserId: " + userId + "Policy Data Object: "+ root.get(PolicyController.getPolicydata()).get("policy").toString()); + policyLogger.info("***********************************************************************************************************************************"); - if("file".equals(root.get(PolicyController.getPolicydata()).get(model).get("type").toString().replace("\"", ""))){ - policyData.setEditPolicy(true); - } - if(root.get(PolicyController.getPolicydata()).get(model).get("path").size() != 0){ - String dirName = ""; - for(int i = 0; i < root.get(PolicyController.getPolicydata()).get(model).get("path").size(); i++){ - dirName = dirName.replace("\"", "") + root.get(PolicyController.getPolicydata()).get(model).get("path").get(i).toString().replace("\"", "") + File.separator; - } - if(policyData.isEditPolicy()){ - policyData.setDomainDir(dirName.substring(0, dirName.lastIndexOf(File.separator))); - }else{ - policyData.setDomainDir(dirName + root.get(PolicyController.getPolicydata()).get(model).get("name").toString().replace("\"", "")); - } - }else{ - String domain = root.get(PolicyController.getPolicydata()).get(model).get("name").toString(); - if(domain.contains("/")){ - domain = domain.substring(0, domain.lastIndexOf('/')).replace("/", File.separator); - } - domain = domain.replace("\"", ""); - policyData.setDomainDir(domain); - } + PolicyRestAdapter policyData = mapper.readValue(root.get(PolicyController.getPolicydata()).get("policy").toString(), PolicyRestAdapter.class); - if(policyData.getConfigPolicyType() != null){ - if("ClosedLoop_Fault".equalsIgnoreCase(policyData.getConfigPolicyType())){ - policyData = new CreateClosedLoopFaultController().setDataToPolicyRestAdapter(policyData, root); - }else if("Firewall Config".equalsIgnoreCase(policyData.getConfigPolicyType())){ - policyData = new CreateFirewallController().setDataToPolicyRestAdapter(policyData); - }else if("Micro Service".equalsIgnoreCase(policyData.getConfigPolicyType())){ - policyData = new CreateDcaeMicroServiceController().setDataToPolicyRestAdapter(policyData, root); - }else if("Optimization".equalsIgnoreCase(policyData.getConfigPolicyType())){ - policyData = new CreateOptimizationController().setDataToPolicyRestAdapter(policyData, root); - } + modifyPolicyData(root, policyData); + + if(policyData.getConfigPolicyType() != null){ + if(CLOSED_LOOP_FAULT.equalsIgnoreCase(policyData.getConfigPolicyType())){ + policyData = new CreateClosedLoopFaultController().setDataToPolicyRestAdapter(policyData, root); + }else if(FIREWALL_CONFIG.equalsIgnoreCase(policyData.getConfigPolicyType())){ + policyData = new CreateFirewallController().setDataToPolicyRestAdapter(policyData); + }else if(MICRO_SERVICE.equalsIgnoreCase(policyData.getConfigPolicyType())){ + policyData = new CreateDcaeMicroServiceController().setDataToPolicyRestAdapter(policyData, root); + }else if(OPTIMIZATION.equalsIgnoreCase(policyData.getConfigPolicyType())){ + policyData = new CreateOptimizationController().setDataToPolicyRestAdapter(policyData, root); } + } - policyData.setUserId(userId); - - String result; - String body = PolicyUtils.objectToJsonString(policyData); - String uri = request.getRequestURI(); - ResponseEntity<?> responseEntity = sendToPAP(body, uri, HttpMethod.POST); - if(responseEntity != null && responseEntity.getBody().equals(HttpServletResponse.SC_CONFLICT)){ - result = "PolicyExists"; - }else if(responseEntity != null){ - result = responseEntity.getBody().toString(); - String policyName = responseEntity.getHeaders().get("policyName").get(0); - if(policyData.isEditPolicy() && "success".equalsIgnoreCase(result)){ - PolicyNotificationMail email = new PolicyNotificationMail(); - String mode = "EditPolicy"; - String watchPolicyName = policyName.replace(".xml", ""); - String version = watchPolicyName.substring(watchPolicyName.lastIndexOf('.')+1); - watchPolicyName = watchPolicyName.substring(0, watchPolicyName.lastIndexOf('.')).replace(".", File.separator); - String policyVersionName = watchPolicyName.replace(".", File.separator); - watchPolicyName = watchPolicyName + "." + version + ".xml"; - PolicyVersion entityItem = new PolicyVersion(); - entityItem.setPolicyName(policyVersionName); - entityItem.setActiveVersion(Integer.parseInt(version)); - entityItem.setModifiedBy(userId); - email.sendMail(entityItem, watchPolicyName, mode, commonClassDao); - } - }else{ - result = "Response is null from PAP"; + policyData.setUserId(userId); + + String result; + String body = PolicyUtils.objectToJsonString(policyData); + String uri = request.getRequestURI(); + ResponseEntity<?> responseEntity = sendToPAP(body, uri, HttpMethod.POST); + if(responseEntity != null && responseEntity.getBody().equals(HttpServletResponse.SC_CONFLICT)){ + result = "PolicyExists"; + }else if(responseEntity != null){ + result = responseEntity.getBody().toString(); + String policyName = responseEntity.getHeaders().get(POLICY_NAME).get(0); + if(policyData.isEditPolicy() && SUCCESS.equalsIgnoreCase(result)){ + PolicyNotificationMail email = new PolicyNotificationMail(); + String mode = "EditPolicy"; + String watchPolicyName = policyName.replace(XML, ""); + String version = watchPolicyName.substring(watchPolicyName.lastIndexOf('.')+1); + watchPolicyName = watchPolicyName.substring(0, watchPolicyName.lastIndexOf('.')).replace(".", File.separator); + String policyVersionName = watchPolicyName.replace(".", File.separator); + watchPolicyName = watchPolicyName + "." + version + XML; + PolicyVersion entityItem = new PolicyVersion(); + entityItem.setPolicyName(policyVersionName); + entityItem.setActiveVersion(Integer.parseInt(version)); + entityItem.setModifiedBy(userId); + email.sendMail(entityItem, watchPolicyName, mode, commonClassDao); } + }else{ + result = "Response is null from PAP"; + } - response.setCharacterEncoding(PolicyController.getCharacterencoding()); - response.setContentType(PolicyController.getContenttype()); - request.setCharacterEncoding(PolicyController.getCharacterencoding()); + response.setCharacterEncoding(PolicyController.getCharacterencoding()); + response.setContentType(PolicyController.getContenttype()); + request.setCharacterEncoding(PolicyController.getCharacterencoding()); - PrintWriter out = response.getWriter(); - String responseString = mapper.writeValueAsString(result); - JSONObject j = new JSONObject("{policyData: " + responseString + "}"); - out.write(j.toString()); - }catch(Exception e){ - policyLogger.error("Exception Occured while saving policy" , e); + PrintWriter out = response.getWriter(); + String responseString = mapper.writeValueAsString(result); + JSONObject j = new JSONObject("{policyData: " + responseString + "}"); + out.write(j.toString()); + } + + private void modifyPolicyData(JsonNode root, PolicyRestAdapter policyData) { + if(FILE.equals(root.get(PolicyController.getPolicydata()).get(model).get(TYPE).toString().replace("\"", ""))){ + policyData.setEditPolicy(true); + } + if(root.get(PolicyController.getPolicydata()).get(model).get(PATH).size() != 0){ + String dirName = ""; + for(int i = 0; i < root.get(PolicyController.getPolicydata()).get(model).get(PATH).size(); i++){ + dirName = dirName.replace("\"", "") + root.get(PolicyController.getPolicydata()).get(model).get(PATH).get(i).toString().replace("\"", "") + File.separator; + } + if(policyData.isEditPolicy()){ + policyData.setDomainDir(dirName.substring(0, dirName.lastIndexOf(File.separator))); + }else{ + policyData.setDomainDir(dirName + root.get(PolicyController.getPolicydata()).get(model).get(NAME).toString().replace("\"", "")); + } + }else{ + String domain = root.get(PolicyController.getPolicydata()).get(model).get(NAME).toString(); + if(domain.contains("/")){ + domain = domain.substring(0, domain.lastIndexOf('/')).replace("/", File.separator); + } + domain = domain.replace("\"", ""); + policyData.setDomainDir(domain); } } @@ -284,45 +306,13 @@ public class PolicyRestController extends RestrictedBaseController{ connection.setDoOutput(true); connection.setDoInput(true); - if(!uri.contains("searchPolicy?action=delete&")){ - - if(!(uri.endsWith("set_BRMSParamData") || uri.contains(importDictionary))){ - connection.setRequestProperty("Content-Type",PolicyController.getContenttype()); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = getJsonNode(request, mapper); - - ObjectMapper mapper1 = new ObjectMapper(); - mapper1.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true); + if(uri.contains("searchPolicy?action=delete&")){ + //do something + return doConnect(connection); + } - Object obj = mapper1.treeToValue(root, Object.class); - String json = mapper1.writeValueAsString(obj); + checkURI(request, uri, connection, item); - // send current configuration - try(InputStream content = new ByteArrayInputStream(json.getBytes()); - OutputStream os = connection.getOutputStream()) { - int count = IOUtils.copy(content, os); - if (policyLogger.isDebugEnabled()) { - policyLogger.debug("copied to output, bytes=" + count); - } - } - }else{ - if(uri.endsWith("set_BRMSParamData")){ - connection.setRequestProperty("Content-Type",PolicyController.getContenttype()); - try (OutputStream os = connection.getOutputStream()) { - IOUtils.copy((InputStream) request.getInputStream(), os); - } - }else{ - boundary = "===" + System.currentTimeMillis() + "==="; - connection.setRequestProperty("Content-Type","multipart/form-data; boundary=" + boundary); - try (OutputStream os = connection.getOutputStream()) { - if(item != null){ - IOUtils.copy((InputStream) item.getInputStream(), os); - } - } - } - } - } return doConnect(connection); } catch (Exception e) { policyLogger.error("Exception Occured"+e); @@ -347,6 +337,46 @@ public class PolicyRestController extends RestrictedBaseController{ return null; } + private void checkURI(HttpServletRequest request, String uri, HttpURLConnection connection, FileItem item) throws IOException { + String boundary; + if(!(uri.endsWith("set_BRMSParamData") || uri.contains(importDictionary))){ + connection.setRequestProperty("Content-Type",PolicyController.getContenttype()); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNode root = getJsonNode(request, mapper); + + ObjectMapper mapper1 = new ObjectMapper(); + mapper1.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true); + + Object obj = mapper1.treeToValue(root, Object.class); + String json = mapper1.writeValueAsString(obj); + + // send current configuration + try(InputStream content = new ByteArrayInputStream(json.getBytes()); + OutputStream os = connection.getOutputStream()) { + int count = IOUtils.copy(content, os); + if (policyLogger.isDebugEnabled()) { + policyLogger.debug("copied to output, bytes=" + count); + } + } + }else{ + if(uri.endsWith("set_BRMSParamData")){ + connection.setRequestProperty("Content-Type",PolicyController.getContenttype()); + try (OutputStream os = connection.getOutputStream()) { + IOUtils.copy((InputStream) request.getInputStream(), os); + } + }else{ + boundary = "===" + System.currentTimeMillis() + "==="; + connection.setRequestProperty("Content-Type","multipart/form-data; boundary=" + boundary); + try (OutputStream os = connection.getOutputStream()) { + if(item != null){ + IOUtils.copy((InputStream) item.getInputStream(), os); + } + } + } + } + } + private JsonNode getJsonNode(HttpServletRequest request, ObjectMapper mapper) { JsonNode root = null; try { @@ -493,16 +523,16 @@ public class PolicyRestController extends RestrictedBaseController{ resultList = json.get("policyresult"); }catch(Exception e){ List<String> data = new ArrayList<>(); - resultList = json.get("data"); + resultList = json.get(DATA); data.add("Exception"); data.add(resultList.toString()); resultList = data; policyLogger.error("Exception Occured while searching for Policy in Elastic Database" +e); } - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF_8); response.setContentType("application / json"); - request.setCharacterEncoding("UTF-8"); + request.setCharacterEncoding(UTF_8); PrintWriter out = response.getWriter(); JSONObject j = new JSONObject("{result: " + resultList + "}"); |