etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
nvazquez 2024-08-06 13:03:31 -03:00
parent b73f634ea6
commit 47a6b7011d
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/com/cloud/acl/DomainChecker.java
View File

@ -234,7 +234,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
Account owner = _accountDao.findById(entity.getAccountId());
if (owner == null) {
s_logger.error(String.format("Owner not found for %s", entityLog));
logger.error(String.format("Owner not found for %s", entityLog));
throw exception;
}
@ -248,12 +248,12 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
// only project owner can delete/modify the project
if (accessType == AccessType.ModifyProject) {
if (!_projectMgr.canModifyProjectAccount(caller, owner.getId())) {
s_logger.error(String.format("Caller ID: %d does not have permission to modify project with " +
logger.error(String.format("Caller ID: %d does not have permission to modify project with " +
"owner ID: %d", caller.getId(), owner.getId()));
throw exception;
}
} else if (!_projectMgr.canAccessProjectAccount(caller, owner.getId())) {
s_logger.error(String.format("Caller ID: %d does not have permission to access project with " +
logger.error(String.format("Caller ID: %d does not have permission to access project with " +
"owner ID: %d", caller.getId(), owner.getId()));
throw exception;
}
@ -261,7 +261,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
return;
}
s_logger.error(String.format("Caller ID: %d does not have permission to access %s", caller.getId(), entityLog));
logger.error(String.format("Caller ID: %d does not have permission to access %s", caller.getId(), entityLog));
throw exception;
}

2
server/src/main/java/com/cloud/user/AccountManagerImpl.java
View File

@ -2783,7 +2783,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
protected void preventRootDomainAdminAccessToRootAdminKeys(User caller, ControlledEntity account) {
if (isDomainAdminForRootDomain(caller) && isRootAdmin(account.getAccountId())) {
String msg = String.format("Caller Username %s does not have access to root admin keys", caller.getUsername());
s_logger.error(msg);
logger.error(msg);
throw new PermissionDeniedException(msg);
}
}