Skip to content

Add null checks for guest account ids, Fixes AB#3330213 #2361

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
melissaahn merged 3 commits into from
Aug 26, 2025
+12 −1
Merged

Add null checks for guest account ids, Fixes AB#3330213 #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9af882
add null checks for guest account ids
melissaahn Aug 21, 2025
c013021
changelog
melissaahn Aug 22, 2025
0760464
Adding warning logs
melissaahn Aug 25, 2025
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
1 change: 1 addition & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr

vNext
----------
- [PATCH] Add null checks for guest account ids (#2361)

Version 7.0.1
----------
Expand Down
12 changes: 11 additions & 1 deletion msal/src/main/java/com/microsoft/identity/client/AccountAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,23 @@ private static class GuestAccountFilter implements CacheRecordFilter {

@Override
public List<ICacheRecord> filter(@NonNull List<ICacheRecord> records) {
final String methodTag = TAG + ":GuestAccountFilter";
final List<ICacheRecord> result = new ArrayList<>();

for (final ICacheRecord cacheRecord : records) {
final String acctHomeAccountId = cacheRecord.getAccount().getHomeAccountId();
final String acctLocalAccountId = cacheRecord.getAccount().getLocalAccountId();
boolean isValid = true;

if (!acctHomeAccountId.contains(acctLocalAccountId)) {
if (acctHomeAccountId == null) {
Logger.warn(methodTag, "Home account ID is null for entry.");
isValid = false;
}
if (acctLocalAccountId == null) {
Logger.warn(methodTag, "Local account ID is null for entry.");
isValid = false;
}
if (isValid && !acctHomeAccountId.contains(acctLocalAccountId)) {
result.add(cacheRecord);
}
}
Expand Down