Skip to content

Extend ReservedRoleNameChecker factory interface #134074

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
merged 2 commits into from
Sep 4, 2025
Merged

Extend ReservedRoleNameChecker factory interface #134074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48534f5
Extend ReservedRoleNameChecker factory interface
slobodanadamovic Sep 3, 2025
69b04fa
Merge branch 'main' of github.com:elastic/elasticsearch into queryabl…
slobodanadamovic Sep 3, 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
3 changes: 2 additions & 1 deletion x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,8 @@ Collection<Object> createComponents(
this.fileRolesStore.set(
new FileRolesStore(settings, environment, resourceWatcherService, getLicenseState(), xContentRegistry, fileRoleValidator.get())
);
ReservedRoleNameChecker reservedRoleNameChecker = reservedRoleNameCheckerFactory.get().create(fileRolesStore.get()::exists);
ReservedRoleNameChecker reservedRoleNameChecker = reservedRoleNameCheckerFactory.get()
.create(clusterService, projectResolver, fileRolesStore.get()::exists);
components.add(new PluginComponentBinding<>(ReservedRoleNameChecker.class, reservedRoleNameChecker));

final Map<String, List<BiConsumer<Set<String>, ActionListener<RoleRetrievalResult>>>> customRoleProviders = new LinkedHashMap<>();
Expand Down
15 changes: 13 additions & 2 deletions ...ecurity/src/main/java/org/elasticsearch/xpack/security/authz/ReservedRoleNameChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,28 @@

package org.elasticsearch.xpack.security.authz;

import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.xpack.core.security.authz.store.ReservedRolesStore;

import java.util.function.Predicate;

public interface ReservedRoleNameChecker {
interface Factory {
ReservedRoleNameChecker create(Predicate<String> fileRoleStoreNameChecker);

ReservedRoleNameChecker create(
ClusterService clusterService,
ProjectResolver projectResolver,
Predicate<String> fileRoleStoreNameChecker
);

class Default implements Factory {
@Override
public ReservedRoleNameChecker create(Predicate<String> fileRoleStoreNameChecker) {
public ReservedRoleNameChecker create(
ClusterService clusterService,
ProjectResolver projectResolver,
Predicate<String> fileRoleStoreNameChecker
) {
return new ReservedRoleNameChecker.Default();
}
}
Expand Down