Skip to content

Fix NPE if on port 8096 getUserKeys #14104

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

Draft
resmo wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −6
Draft

Fix NPE if on port 8096 getUserKeys #14104

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
20 changes: 14 additions & 6 deletions 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 @@ -3315,15 +3315,16 @@ public Pair<Boolean, Map<String, String>> getKeys(GetUserKeysCmd cmd) {
verifyCallerPrivilegeForUserOrAccountOperations(user);

String accessingApiKey = getAccessingApiKey(cmd);
ApiKeyPair keyPair;
ApiKeyPair keyPair = null;
if (accessingApiKey != null) {
ApiKeyPair accessingKeyPair = apiKeyPairService.findByApiKey(accessingApiKey);
if (userId == accessingKeyPair.getUserId()) {
keyPair = apiKeyPairService.findByApiKey(accessingApiKey);
} else {
keyPair = _accountService.getLatestUserKeyPair(userId);
if (accessingKeyPair == null) {
logger.debug("Unable to find the API key pair used to access the API; falling back to the latest key pair of user with ID [{}].", userId);
} else if (userId == accessingKeyPair.getUserId()) {
keyPair = accessingKeyPair;
}
} else {
}
if (keyPair == null) {
keyPair = _accountService.getLatestUserKeyPair(userId);
}

Expand Down Expand Up @@ -3436,6 +3437,10 @@ private Boolean isAccessingKeypairSuperset(ApiKeyPair accessedKeyPair, BaseCmd c
return Boolean.TRUE;
}
ApiKeyPair accessingKeyPair = apiKeyPairService.findByApiKey(apiKey);
if (accessingKeyPair == null) {
logger.info("Unable to find the API key pair used to access the API; therefore, its permissions cannot be verified.");
return Boolean.FALSE;
}
return isApiKeySupersetOfPermission(new ArrayList<>(getAllKeypairPermissions(accessingKeyPair.getApiKey())), new ArrayList<>(getAllKeypairPermissions(accessedKeyPair.getApiKey())));
}

Expand Down Expand Up @@ -3727,6 +3732,9 @@ public List<RolePermissionEntity> getAllKeypairPermissions(String apiKey) {
throw new InvalidParameterValueException("API key not present in the request's URL and, thus, unable to fetch API key rules.");
}
ApiKeyPair apiKeyPair = keyPairManager.findByApiKey(apiKey);
if (apiKeyPair == null) {
throw new InvalidParameterValueException("Unable to find an API key pair matching the API key present in the request's URL and, thus, unable to fetch API key rules.");
}
Account account = _accountDao.findById(apiKeyPair.getAccountId());
List<ApiKeyPairPermission> keyPairPermissions = keyPairManager.findAllPermissionsByKeyPairId(apiKeyPair.getId(), account.getRoleId());
return new ArrayList<>(keyPairPermissions);
Expand Down
Loading