Skip to content

Fix deleteAccount API to prevent deletion of the caller #8743

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
JoaoJandre merged 7 commits into from
Aug 27, 2024
Merged

Fix deleteAccount API to prevent deletion of the caller #8743

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a136538
Fix API deleteAccount deleting caller's account
Mar 1, 2024
49e29ed
Remove extra line
Mar 1, 2024
4d037aa
Merge branch 'main'
Mar 5, 2024
c660880
Add unit tests and change message
Mar 5, 2024
9d1dc28
apply suggestion
lucas-a-martins Jul 23, 2024
f3fd289
remove extra parentheses
lucas-a-martins Jul 23, 2024
6f80cb9
Update server/src/test/java/com/cloud/user/AccountManagerImplTest.java
lucas-a-martins Jul 23, 2024
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
7 changes: 3 additions & 4 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,11 @@ public void execute() {
CallContext.current().setEventDetails("Account ID: " + (account != null ? account.getUuid() : getId())); // Account not found is already handled by service

boolean result = _regionService.deleteUserAccount(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
} else {
if (!result) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");
}
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
}

@Override
Expand Down
10 changes: 9 additions & 1 deletion server/src/main/java/com/cloud/user/AccountManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,15 @@ public boolean deleteUserAccount(long accountId) {
// If the user is a System user, return an error. We do not allow this
AccountVO account = _accountDao.findById(accountId);

if (! isDeleteNeeded(account, accountId, caller)) {
if (caller.getId() == accountId) {
Domain domain = _domainDao.findById(account.getDomainId());
throw new InvalidParameterValueException(String.format("The caller is requesting to delete their own account. As a security measure, ACS will not allow this " +
Comment thread
sureshanaparti marked this conversation as resolved.
Outdated
"operation." +
"To delete account %s (ID: %s, Domain: %s), request to another user with permission to execute the operation.",
account.getAccountName(), account.getUuid(), domain.getUuid()));
}

if (!isDeleteNeeded(account, accountId, caller)) {
return true;
}

Expand Down