Skip to content

Fixes #29145: Prevent NPE when query tags are null #29249

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
kumarroshan12 wants to merge 3 commits into
base: main
Choose a base branch
from
+23 −1
Open

Fixes #29145: Prevent NPE when query tags are null #29249

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
726d963
Fix NullPointerException when query tags are null in PIIMasker
kumarroshan12 Jun 20, 2026
417d70c
Address review feedback
kumarroshan12 Jun 20, 2026
74fb783
Apply spotless formatting
kumarroshan12 Jun 21, 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
4 changes: 3 additions & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/security/mask/PIIMasker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ public static ResultList<Query> getQueries(
}

private static boolean hasPiiSensitiveTag(Query query) {
return query.getTags().stream().map(TagLabel::getTagFQN).anyMatch(SENSITIVE_PII_TAG::equals);
return listOrEmpty(query.getTags()).stream()
.map(TagLabel::getTagFQN)
.anyMatch(SENSITIVE_PII_TAG::equals);
}

private static boolean hasPiiSensitiveTag(Column column) {
Expand Down
20 changes: 20 additions & 0 deletions openmetadata-service/src/test/java/org/openmetadata/service/security/mask/PIIMaskerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,26 @@ void getQueriesAndMaskUserHideSensitiveValuesForUnauthorizedUsers() {
assertEquals(PIIMasker.MASKED_MAIL, maskedUser.getEmail());
}

@Test
void getQueriesHandlesNullTagsForUnauthorizedUsers() {
Authorizer authorizer = mock(Authorizer.class);
SecurityContext securityContext = mock(SecurityContext.class);

EntityReference owner = entityReference(Entity.USER, "owner");

Query query = new Query().withQuery("select email from customer").withOwners(List.of(owner));

query.setTags(null);

ResultList<Query> queries = new ResultList<>(new ArrayList<>(List.of(query)));

when(authorizer.authorizePII(securityContext, List.of(owner))).thenReturn(false);

ResultList<Query> result = PIIMasker.getQueries(queries, authorizer, securityContext);

assertEquals("select email from customer", result.getData().get(0).getQuery());
}

@Test
void getQueriesAndMaskUserLeaveAuthorizedValuesUntouched() {
Authorizer authorizer = mock(Authorizer.class);
Expand Down
Loading