weizhouapache commented on code in PR #11137:
URL: https://github.com/apache/cloudstack/pull/11137#discussion_r2832115757
##########
server/src/main/java/com/cloud/user/AccountManagerImpl.java:
##########
@@ -1432,29 +1432,35 @@ protected void checkRoleEscalation(Account caller,
Account requested) {
requested.getUuid(),
requested.getRoleId()));
}
+ if (caller.getRoleId().equals(requested.getRoleId())) {
+ return;
+ }
List<APIChecker> apiCheckers = getEnabledApiCheckers();
+ for (APIChecker apiChecker : apiCheckers) {
+ checkApiAccess(apiChecker, caller, requested);
+ }
+ }
+
+ private void checkApiAccess(APIChecker apiChecker, Account caller, Account
requested) throws PermissionDeniedException {
+ Pair<Role, List<RolePermission>> roleAndPermissionsForCaller =
apiChecker.getRolePermissions(caller.getRoleId());
+ Pair<Role, List<RolePermission>> roleAndPermissionsForRequested =
apiChecker.getRolePermissions(requested.getRoleId());
for (String command : apiNameList) {
try {
- checkApiAccess(apiCheckers, requested, command);
- } catch (PermissionDeniedException pde) {
- if (logger.isTraceEnabled()) {
- logger.trace(String.format(
- "Checking for permission to \"%s\" is irrelevant
as it is not requested for %s [%s]",
- command,
- requested.getAccountName(),
- requested.getUuid()
- )
- );
+ if (roleAndPermissionsForRequested == null) {
+ apiChecker.checkAccess(caller, command);
+ } else {
+ apiChecker.checkAccess(caller, command,
roleAndPermissionsForRequested.first(),
roleAndPermissionsForRequested.second());
Review Comment:
```suggestion
apiChecker.checkAccess(requested, command,
roleAndPermissionsForRequested.first(),
roleAndPermissionsForRequested.second());
```
##########
server/src/main/java/com/cloud/user/AccountManagerImpl.java:
##########
@@ -1432,29 +1432,35 @@ protected void checkRoleEscalation(Account caller,
Account requested) {
requested.getUuid(),
requested.getRoleId()));
}
+ if (caller.getRoleId().equals(requested.getRoleId())) {
+ return;
+ }
List<APIChecker> apiCheckers = getEnabledApiCheckers();
+ for (APIChecker apiChecker : apiCheckers) {
+ checkApiAccess(apiChecker, caller, requested);
+ }
+ }
+
+ private void checkApiAccess(APIChecker apiChecker, Account caller, Account
requested) throws PermissionDeniedException {
+ Pair<Role, List<RolePermission>> roleAndPermissionsForCaller =
apiChecker.getRolePermissions(caller.getRoleId());
+ Pair<Role, List<RolePermission>> roleAndPermissionsForRequested =
apiChecker.getRolePermissions(requested.getRoleId());
for (String command : apiNameList) {
try {
- checkApiAccess(apiCheckers, requested, command);
- } catch (PermissionDeniedException pde) {
- if (logger.isTraceEnabled()) {
- logger.trace(String.format(
- "Checking for permission to \"%s\" is irrelevant
as it is not requested for %s [%s]",
- command,
- requested.getAccountName(),
- requested.getUuid()
- )
- );
+ if (roleAndPermissionsForRequested == null) {
+ apiChecker.checkAccess(caller, command);
Review Comment:
```suggestion
apiChecker.checkAccess(requested, command);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
