Skip to content

Fix NPE on null user in RP code path #4421

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+67 −2
Open

Fix NPE on null user in RP code path #4421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c688d82
Fix NPE on null user in RP code path
DarshitChanpura Nov 14, 2025
e1dc820
Merge branch 'main' into npe-fix
DarshitChanpura Nov 19, 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
5 changes: 3 additions & 2 deletions plugin/src/main/java/org/opensearch/ml/helper/ModelAccessControlHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void validateModelGroupAccess(User user, String modelGroupId, String acti
.onFailure(
new OpenSearchStatusException(
"User "
+ user.getName()
+ (user == null ? null : user.getName())
Copy link
Collaborator

@ylwu-amzn ylwu-amzn Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If user is null and model group is public, does the user have access or not ?

Copy link
Member Author

@DarshitChanpura DarshitChanpura Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no.. null users are not granted access..

if you are talking from anonymous user login perspective then yes since anonymous users can access resource in two ways:

  1. Resource is shared with anonymous user or backend role (https://github.com/opensearch-project/security/blob/9e6047f99da4df3404e2d52f3afe4e49e508c3a5/src/main/java/org/opensearch/security/auth/BackendRegistry.java#L480)
  2. Resource is marked as public by following the new convention (https://github.com/opensearch-project/security/blob/main/RESOURCE_SHARING_AND_ACCESS_CONTROL.md#example-publicly-shared-resource)

+ " is not authorized to perform action "
+ action
+ " on ml-model-group id: "
Expand Down Expand Up @@ -173,6 +173,7 @@ public void validateModelGroupAccess(
listener.onResponse(true);
return;
}

if (shouldUseResourceAuthz(ML_MODEL_GROUP_RESOURCE_TYPE)) {
var resourceSharingClient = ResourceSharingClientAccessor.getInstance().getResourceSharingClient();
resourceSharingClient.verifyAccess(modelGroupId, ML_MODEL_GROUP_RESOURCE_TYPE, action, ActionListener.wrap(isAuthorized -> {
Expand All @@ -181,7 +182,7 @@ public void validateModelGroupAccess(
.onFailure(
new OpenSearchStatusException(
"User "
+ user.getName()
+ (user == null ? null : user.getName())
+ " is not authorized to perform action "
+ action
+ " on ml-model-group id: "
Expand Down
64 changes: 64 additions & 0 deletions plugin/src/test/java/org/opensearch/ml/helper/ModelAccessControlHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,70 @@ public void test_ShouldUseResourceAuthz_FeatureDisabled_And_ClientNull() {
assertFalse(ModelAccessControlHelper.shouldUseResourceAuthz(CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE));
}

public void test_ResourceAuthz_NotAuthorized_UserNull_UsesUnknownName() {
when(resourceSharingClient.isFeatureEnabledForType(CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE)).thenReturn(true);
ResourceSharingClientAccessor.getInstance().setResourceSharingClient(resourceSharingClient);

doAnswer(invocation -> {
ActionListener<Boolean> listener = invocation.getArgument(3);
listener.onResponse(false);
return null;
}).when(resourceSharingClient).verifyAccess(any(), any(), any(), any());

modelAccessControlHelper
.validateModelGroupAccess(
null, // user
mlFeatureEnabledSetting,
"testTenant",
"testGroupID",
"testAction",
client,
sdkClient,
actionListener
);

ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
verify(actionListener).onFailure(argumentCaptor.capture());
Exception ex = argumentCaptor.getValue();
assertTrue(ex instanceof org.opensearch.OpenSearchStatusException);
assertTrue(ex.getMessage().contains("User null is not authorized"));

ResourceSharingClientAccessor.getInstance().setResourceSharingClient(null);
}

public void test_ResourceAuthz_NotAuthorized_UserPresent_UsesUserName() {
when(resourceSharingClient.isFeatureEnabledForType(CommonValue.ML_MODEL_GROUP_RESOURCE_TYPE)).thenReturn(true);
ResourceSharingClientAccessor.getInstance().setResourceSharingClient(resourceSharingClient);

doAnswer(invocation -> {
ActionListener<Boolean> listener = invocation.getArgument(3);
listener.onResponse(false);
return null;
}).when(resourceSharingClient).verifyAccess(any(), any(), any(), any());

User user = User.parse("owner|IT,HR|myTenant");

modelAccessControlHelper
.validateModelGroupAccess(
user,
mlFeatureEnabledSetting,
"testTenant",
"testGroupID",
"testAction",
client,
sdkClient,
actionListener
);

ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
verify(actionListener).onFailure(argumentCaptor.capture());
Exception ex = argumentCaptor.getValue();
assertTrue(ex instanceof org.opensearch.OpenSearchStatusException);
assertTrue(ex.getMessage().contains("User owner is not authorized"));

ResourceSharingClientAccessor.getInstance().setResourceSharingClient(null);
}

private GetResponse modelGroupBuilder(List<String> backendRoles, String access, String owner) throws IOException {
MLModelGroup mlModelGroup = MLModelGroup
.builder()
Expand Down
Loading