Skip to content

Add null check for ApiKeyPair in getUserByApiKey #12938

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

Open
daviftorres wants to merge 13 commits into
base: main
Choose a base branch
from
+7 −2
Open

Add null check for ApiKeyPair in getUserByApiKey #12938

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9755ba5
Merge pull request #1 from apache/main
daviftorres Oct 21, 2025
e476a68
Merge branch 'apache:main' into main
daviftorres Nov 4, 2025
de4adaa
Merge branch 'apache:main' into main
daviftorres Nov 18, 2025
efafe00
Merge branch 'apache:main' into main
daviftorres Mar 6, 2026
6e9af51
Merge branch 'apache:main' into main
daviftorres Mar 26, 2026
b6b5bfd
Merge branch 'apache:main' into main
daviftorres Mar 31, 2026
a849925
Add null check for ApiKeyPair in getUserByApiKey
daviftorres Mar 31, 2026
a5ae44b
Apply suggestion from @DaanHoogland
daviftorres Mar 31, 2026
5d22e56
Merge branch 'main' into getUserByApiKey-not-checking-for-null-pointers
daviftorres Mar 31, 2026
c484771
Apply suggestion from @bernardodemarco
daviftorres Apr 1, 2026
97e466e
Add validation to USER_API_KEY parameter
daviftorres Apr 1, 2026
5b59d27
Merge branch 'main' into getUserByApiKey-not-checking-for-null-pointers
daviftorres Apr 1, 2026
a6391f6
Add ApiArgValidator import to GetUserCmd.java
daviftorres Apr 2, 2026
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
Prev Previous commit
Next Next commit
Apply suggestion from @bernardodemarco 
Co-authored-by: Bernardo De Marco Gonçalves <bernardomg2004@gmail.com>
  • Loading branch information
@daviftorres @bernardodemarco
daviftorres and bernardodemarco authored Apr 1, 2026
commit c48477135d70260420b868fc09aac5f70ff97580
3 changes: 2 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 @@ -3827,10 +3827,11 @@ public void buildACLViewSearchCriteria(SearchCriteria<? extends ControlledViewEn

@Override
public UserAccount getUserByApiKey(String apiKey) {
ApiKeyPairVO keyPair = apiKeyPairDao.findByApiKey(apiKey);

if (keyPair == null) {
return null;
}
Comment thread
daviftorres marked this conversation as resolved.
ApiKeyPairVO keyPair = apiKeyPairDao.findByApiKey(apiKey);

Comment thread
bernardodemarco marked this conversation as resolved.
return userAccountDao.findById(keyPair.getUserId());
}
Expand Down