Skip to content

Remove the rule(s) validation with api names while importing a role #4840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Mar 29, 2021
Merged

Remove the rule(s) validation with api names while importing a role #4840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/src/main/java/org/apache/cloudstack/api/ApiServerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,4 @@ public ResponseObject loginUser(HttpSession session, String username, String pas
public String handleRequest(Map<String, Object[]> params, String responseType, StringBuilder auditTrailSb) throws ServerApiException;

public Class<?> getCmdClass(String cmdName);

public boolean isValidApiName(String apiName);
}
3 changes: 0 additions & 3 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ public List<Map<String, Object>> 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);
Expand Down
11 changes: 0 additions & 11 deletions server/src/main/java/com/cloud/api/ApiServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down