From 7cfcc098d492383d85cbe48d138c6d5a9588de44 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 18 Mar 2021 12:42:14 +0530 Subject: [PATCH] Remove the rule(s) validation with api names while importing role, to be in sync with the create role permission behavior --- .../org/apache/cloudstack/api/ApiServerService.java | 2 -- .../api/command/admin/acl/ImportRoleCmd.java | 3 --- server/src/main/java/com/cloud/api/ApiServer.java | 11 ----------- 3 files changed, 16 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java b/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java index 1f6d3d503758..54fda7e36b82 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java @@ -42,6 +42,4 @@ public ResponseObject loginUser(HttpSession session, String username, String pas public String handleRequest(Map params, String responseType, StringBuilder auditTrailSb) throws ServerApiException; public Class getCmdClass(String cmdName); - - public boolean isValidApiName(String apiName); } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java index 3afac9fbea02..c5d9c3f99e66 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java @@ -94,9 +94,6 @@ public List> getRules() { if (Strings.isNullOrEmpty(rule)) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Empty rule provided in rules param"); } - if (!rule.contains("*") && !_apiServer.isValidApiName(rule)) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid api name: " + rule + " provided in rules param"); - } ruleDetails.put(ApiConstants.RULE, new Rule(rule)); String permission = detail.get(ApiConstants.PERMISSION); diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java index 586d80b4745e..cf0891fb606b 100644 --- a/server/src/main/java/com/cloud/api/ApiServer.java +++ b/server/src/main/java/com/cloud/api/ApiServer.java @@ -1208,17 +1208,6 @@ else if (cmdList.size() == 1) } } - @Override - public boolean isValidApiName(String apiName) { - if (apiName == null || apiName.isEmpty()) - return false; - - if (!s_apiNameCmdClassMap.containsKey(apiName)) - return false; - - return true; - } - // FIXME: rather than isError, we might was to pass in the status code to give more flexibility private void writeResponse(final HttpResponse resp, final String responseText, final int statusCode, final String responseType, final String reasonPhrase) { try {