Skip to content

Combine RestApiPrivilegesEvaluator and RestApiAdminPrivilegesEvaluator to RestApiAuthorizationEvaluator #6072

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
cwperks wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Combine RestApiPrivilegesEvaluator and RestApiAdminPrivilegesEvaluator to RestApiAuthorizationEvaluator #6072

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
e986cc4
Combine RestApiPrivilegesEvaluator and RestApiAdminPrivilegesEvaluato…
cwperks Apr 6, 2026
05ae95d
Fix compileIntegrationTest
cwperks Apr 6, 2026
109df00
Merge branch 'main' into rest-api-refactor
cwperks May 1, 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
10 changes: 5 additions & 5 deletions src/integrationTest/java/org/opensearch/security/api/AbstractApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
import static org.opensearch.security.OpenSearchSecurityPlugin.LEGACY_OPENDISTRO_PREFIX;
import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;
import static org.opensearch.security.api.InternalUsersRestApiIntegrationTest.REST_API_ADMIN_INTERNAL_USERS_ONLY;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.ENDPOINTS_WITH_PERMISSIONS;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.RELOAD_CERTS_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.RESOURCE_MIGRATE_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.SECURITY_CONFIG_UPDATE;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.ENDPOINTS_WITH_PERMISSIONS;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.RELOAD_CERTS_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.RESOURCE_MIGRATE_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.SECURITY_CONFIG_UPDATE;

public abstract class AbstractApiIntegrationTest {

Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/api/CertificatesRestApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.support.ConfigConstants.SECURITY_RESTAPI_ADMIN_ENABLED;
import static org.opensearch.test.framework.matcher.RestMatchers.isForbidden;
import static org.opensearch.test.framework.matcher.RestMatchers.isOk;
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/api/ConfigRestApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.opensearch.security.api.PatchPayloadHelper.patch;
import static org.opensearch.security.api.PatchPayloadHelper.replaceOp;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.SECURITY_CONFIG_UPDATE;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.SECURITY_CONFIG_UPDATE;
import static org.opensearch.security.support.ConfigConstants.SECURITY_RESTAPI_ADMIN_ENABLED;
import static org.opensearch.security.support.ConfigConstants.SECURITY_UNSUPPORTED_RESTAPI_ALLOW_SECURITYCONFIG_MODIFICATION;
import static org.opensearch.test.framework.matcher.RestMatchers.isBadRequest;
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/api/SslCertsRestApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import tools.jackson.databind.JsonNode;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.support.ConfigConstants.SECURITY_RESTAPI_ADMIN_ENABLED;
import static org.opensearch.test.framework.matcher.RestMatchers.isForbidden;
import static org.opensearch.test.framework.matcher.RestMatchers.isOk;
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/privileges/RestEndpointPermissionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.security.DefaultObjectMapper;
import org.opensearch.security.dlic.rest.api.Endpoint;
import org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.PermissionBuilder;
import org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.PermissionBuilder;
import org.opensearch.security.privileges.actionlevel.RoleBasedActionPrivileges;
import org.opensearch.security.privileges.actionlevel.RuntimeOptimizedActionPrivileges;
import org.opensearch.security.privileges.dlsfls.FieldMasking;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@
import org.opensearch.watcher.ResourceWatcherService;

import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_HTTP3_ENABLED;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.ENDPOINTS_WITH_PERMISSIONS;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.SECURITY_CONFIG_UPDATE;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.ENDPOINTS_WITH_PERMISSIONS;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.SECURITY_CONFIG_UPDATE;
import static org.opensearch.security.privileges.dlsfls.FieldMasking.Config.BLAKE2B_LEGACY_DEFAULT;
import static org.opensearch.security.resources.ResourceSharingIndexHandler.getSharingIndex;
import static org.opensearch.security.setting.DeprecatedSettings.checkForDeprecatedSetting;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/opensearch/security/dlic/rest/api/AbstractApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected AbstractApiAction(
}

private void buildDefaultRequestHandlers(final RequestHandler.RequestHandlersBuilder builder) {
builder.withAccessHandler(request -> securityApiDependencies.restApiAdminPrivilegesEvaluator().isCurrentUserAdminFor(endpoint))
builder.withAccessHandler(request -> securityApiDependencies.restApiAuthorizationEvaluator().isCurrentUserAdminFor(endpoint))
.withSaveOrUpdateConfigurationHandler(this::saveOrUpdateConfiguration)
.add(Method.POST, methodNotImplementedHandler)
.add(Method.PATCH, methodNotImplementedHandler)
Expand Down Expand Up @@ -397,7 +397,7 @@ protected ValidationResult<SecurityDynamicConfiguration<?>> loadConfiguration(
);
}
if (omitSensitiveData) {
if (!securityApiDependencies.restApiAdminPrivilegesEvaluator().isCurrentUserAdminFor(endpoint)) {
if (!securityApiDependencies.restApiAuthorizationEvaluator().isCurrentUserAdminFor(endpoint)) {
configuration.removeHidden();
}
configuration.clearHashes();
Expand All @@ -423,8 +423,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down Expand Up @@ -594,7 +594,7 @@ protected final RestChannelConsumer prepareRequest(RestRequest request, NodeClie
}

// check if request is authorized
final String authError = securityApiDependencies.restApiPrivilegesEvaluator().checkAccessPermissions(request, endpoint);
final String authError = securityApiDependencies.restApiAuthorizationEvaluator().checkAccessPermissions(request, endpoint);

final User user = threadPool.getThreadContext().getTransient(ConfigConstants.OPENDISTRO_SECURITY_USER);
final String userName = user == null ? null : user.getName();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/AccountApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/ActionGroupsApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/AllowlistApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/AuditApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/CertificatesApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import static org.opensearch.security.dlic.rest.api.Responses.internalServerError;
import static org.opensearch.security.dlic.rest.api.Responses.ok;
import static org.opensearch.security.dlic.rest.api.RestApiAdminPrivilegesEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.api.RestApiAuthorizationEvaluator.CERTS_INFO_ACTION;
import static org.opensearch.security.dlic.rest.support.Utils.PLUGIN_API_ROUTE_PREFIX;
import static org.opensearch.security.dlic.rest.support.Utils.addRoutesPrefix;

Expand Down Expand Up @@ -118,7 +118,7 @@ private String certType(final RestRequest request) {

boolean accessHandler(final RestRequest request) {
if (request.method() == RestRequest.Method.GET) {
return securityApiDependencies.restApiAdminPrivilegesEvaluator().isCurrentUserAdminFor(endpoint, CERTS_INFO_ACTION);
return securityApiDependencies.restApiAuthorizationEvaluator().isCurrentUserAdminFor(endpoint, CERTS_INFO_ACTION);
} else {
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/ConfigUpgradeApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/InternalUsersApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/MultiTenancyConfigApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/NodesDnApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/org/opensearch/security/dlic/rest/api/PermissionsInfoAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.opensearch.security.auditlog.AuditLog;
import org.opensearch.security.configuration.AdminDNs;
import org.opensearch.security.configuration.ConfigurationRepository;
import org.opensearch.security.privileges.PrivilegesConfiguration;
import org.opensearch.security.privileges.RoleMapper;
import org.opensearch.security.ssl.transport.PrincipalExtractor;
import org.opensearch.security.support.ConfigConstants;
Expand All @@ -58,7 +59,7 @@ public class PermissionsInfoAction extends BaseRestHandler {
ImmutableList.of(new DeprecatedRoute(Method.GET, "/permissionsinfo", OPENDISTRO_API_DEPRECATION_MESSAGE))
);

private final RestApiPrivilegesEvaluator restApiPrivilegesEvaluator;
private final RestApiAuthorizationEvaluator restApiAuthorizationEvaluator;
private final ThreadPool threadPool;
private final RoleMapper roleMapper;
private final ConfigurationRepository configurationRepository;
Expand All @@ -73,19 +74,21 @@ protected PermissionsInfoAction(
final ClusterService cs,
final PrincipalExtractor principalExtractor,
final RoleMapper roleMapper,
final PrivilegesConfiguration privilegesConfiguration,
ThreadPool threadPool,
AuditLog auditLog
) {
super();
this.threadPool = threadPool;
this.roleMapper = roleMapper;
this.restApiPrivilegesEvaluator = new RestApiPrivilegesEvaluator(
this.restApiAuthorizationEvaluator = new RestApiAuthorizationEvaluator(
settings,
adminDNs,
roleMapper,
principalExtractor,
configPath,
threadPool
threadPool,
privilegesConfiguration
);
this.configurationRepository = configurationRepository;
}
Expand Down Expand Up @@ -130,8 +133,8 @@ public void accept(RestChannel channel) throws Exception {
final TransportAddress remoteAddress = threadPool.getThreadContext()
.getTransient(ConfigConstants.OPENDISTRO_SECURITY_REMOTE_ADDRESS);
Set<String> userRoles = roleMapper.map(user, remoteAddress);
Boolean hasApiAccess = restApiPrivilegesEvaluator.currentUserHasRestApiAccess(userRoles);
Map<Endpoint, List<Method>> disabledEndpoints = restApiPrivilegesEvaluator.getDisabledEndpointsForCurrentUser(
Boolean hasApiAccess = restApiAuthorizationEvaluator.currentUserHasRestApiAccess(userRoles);
Map<Endpoint, List<Method>> disabledEndpoints = restApiAuthorizationEvaluator.getDisabledEndpointsForCurrentUser(
user.getName(),
userRoles
);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/dlic/rest/api/RateLimitersApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ public Endpoint endpoint() {
}

@Override
public RestApiAdminPrivilegesEvaluator restApiAdminPrivilegesEvaluator() {
return securityApiDependencies.restApiAdminPrivilegesEvaluator();
public RestApiAuthorizationEvaluator restApiAuthorizationEvaluator() {
return securityApiDependencies.restApiAuthorizationEvaluator();
}

@Override
Expand Down
Loading
Loading