Skip to content

Commit 7d3c9a9

Browse files
Extend ReservedRoleNameChecker factory interface (elastic#134074)
Extending `ReservedRoleNameChecker#Factory` to pass additionally `ClusterService` and `ProjectResolver` to `create` method.
1 parent 01ceb7e commit 7d3c9a9

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,8 @@ Collection<Object> createComponents(
972972
this.fileRolesStore.set(
973973
new FileRolesStore(settings, environment, resourceWatcherService, getLicenseState(), xContentRegistry, fileRoleValidator.get())
974974
);
975-
ReservedRoleNameChecker reservedRoleNameChecker = reservedRoleNameCheckerFactory.get().create(fileRolesStore.get()::exists);
975+
ReservedRoleNameChecker reservedRoleNameChecker = reservedRoleNameCheckerFactory.get()
976+
.create(clusterService, projectResolver, fileRolesStore.get()::exists);
976977
components.add(new PluginComponentBinding<>(ReservedRoleNameChecker.class, reservedRoleNameChecker));
977978

978979
final Map<String, List<BiConsumer<Set<String>, ActionListener<RoleRetrievalResult>>>> customRoleProviders = new LinkedHashMap<>();

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/ReservedRoleNameChecker.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,28 @@
77

88
package org.elasticsearch.xpack.security.authz;
99

10+
import org.elasticsearch.cluster.project.ProjectResolver;
11+
import org.elasticsearch.cluster.service.ClusterService;
1012
import org.elasticsearch.xpack.core.security.authz.store.ReservedRolesStore;
1113

1214
import java.util.function.Predicate;
1315

1416
public interface ReservedRoleNameChecker {
1517
interface Factory {
16-
ReservedRoleNameChecker create(Predicate<String> fileRoleStoreNameChecker);
18+
19+
ReservedRoleNameChecker create(
20+
ClusterService clusterService,
21+
ProjectResolver projectResolver,
22+
Predicate<String> fileRoleStoreNameChecker
23+
);
1724

1825
class Default implements Factory {
1926
@Override
20-
public ReservedRoleNameChecker create(Predicate<String> fileRoleStoreNameChecker) {
27+
public ReservedRoleNameChecker create(
28+
ClusterService clusterService,
29+
ProjectResolver projectResolver,
30+
Predicate<String> fileRoleStoreNameChecker
31+
) {
2132
return new ReservedRoleNameChecker.Default();
2233
}
2334
}

0 commit comments

Comments
 (0)