Make setting filtered

n1v0lg · Nov 3, 2023 · dff2616 · dff2616
1 parent ec08a46
commit dff2616
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java b/...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
@@ -93,37 +93,24 @@ public class NativeRoleMappingStore implements UserRoleMapper {
     public static final Setting<Boolean> FALLBACK_CACHE_ENABLED_SETTING = Setting.boolSetting(
         "xpack.security.authc.role_mapping.fallback_cache.enabled",
         false,
-        Setting.Property.NodeScope
+        Setting.Property.NodeScope,
+        Setting.Property.Filtered
     );
 
     private final Settings settings;
     private final Client client;
     private final SecurityIndexManager securityIndex;
     private final ScriptService scriptService;
     private final List<String> realmsToRefresh = new CopyOnWriteArrayList<>();
-    private final boolean shouldCacheSuccessfulLoad;
+    private final boolean fallbackCacheEnabled;
     private final AtomicReference<List<ExpressionRoleMapping>> lastSuccessfulLoadRef = new AtomicReference<>(null);
 
     public NativeRoleMappingStore(Settings settings, Client client, SecurityIndexManager securityIndex, ScriptService scriptService) {
         this.settings = settings;
         this.client = client;
         this.securityIndex = securityIndex;
         this.scriptService = scriptService;
-        this.shouldCacheSuccessfulLoad = FALLBACK_CACHE_ENABLED_SETTING.get(settings);
-    }
-
-    NativeRoleMappingStore(
-        Settings settings,
-        Client client,
-        SecurityIndexManager securityIndex,
-        ScriptService scriptService,
-        boolean shouldCacheSuccessfulLoad
-    ) {
-        this.settings = settings;
-        this.client = client;
-        this.securityIndex = securityIndex;
-        this.scriptService = scriptService;
-        this.shouldCacheSuccessfulLoad = shouldCacheSuccessfulLoad;
+        this.fallbackCacheEnabled = FALLBACK_CACHE_ENABLED_SETTING.get(settings);
     }
 
     private static String getNameFromId(String id) {
@@ -165,7 +152,7 @@ protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener
                 new ContextPreservingActionListener<>(supplier, ActionListener.wrap((Collection<ExpressionRoleMapping> mappings) -> {
                     final List<ExpressionRoleMapping> mappingList = mappings.stream().filter(Objects::nonNull).toList();
                     logger.debug("successfully loaded [{}] role-mapping(s) from [{}]", mappingList.size(), securityIndex.aliasName());
-                    if (shouldCacheSuccessfulLoad) {
+                    if (fallbackCacheEnabled) {
                         logger.debug("caching loaded role-mapping(s)");
                         lastSuccessfulLoadRef.set(mappingList);
                     }
@@ -331,7 +318,7 @@ private void getMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
         final List<ExpressionRoleMapping> lastSuccessfulLoad = lastSuccessfulLoadRef.get();
         if (frozenSecurityIndex.indexIsClosed()) {
             if (lastSuccessfulLoad != null) {
-                assert shouldCacheSuccessfulLoad;
+                assert fallbackCacheEnabled;
                 logger.debug("The security index exists but is closed - returning previously cached role mappings");
                 listener.onResponse(lastSuccessfulLoad);
             } else {
@@ -341,7 +328,7 @@ private void getMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
         } else if (frozenSecurityIndex.isAvailable(SEARCH_SHARDS) == false) {
             final ElasticsearchException unavailableReason = frozenSecurityIndex.getUnavailableReason(SEARCH_SHARDS);
             if (lastSuccessfulLoad != null) {
-                assert shouldCacheSuccessfulLoad;
+                assert fallbackCacheEnabled;
                 logger.debug(
                     "The security index exists but is not available - returning previously cached role mappings",
                     unavailableReason