Code restructuring

Signed-off-by: Nils Bandener <[email protected]>
nibix · Oct 30, 2024 · 45f40b8 · 45f40b8
1 parent ca66928
commit 45f40b8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
@@ -170,15 +170,13 @@ public boolean invoke(PrivilegesEvaluationContext context, final ActionListener<
                 doFilterLevelDls = false;
             } else { // mode == Mode.ADAPTIVE
                 Mode modeByHeader = getDlsModeHeader();
+                dlsRestrictionMap = config.getDocumentPrivileges()
+                    .getRestrictions(context, resolved.getAllIndicesResolved(clusterService, context.getIndexNameExpressionResolver()));
 
                 if (modeByHeader == Mode.FILTER_LEVEL) {
                     doFilterLevelDls = true;
                     log.debug("Doing filter-level DLS due to header");
-                    dlsRestrictionMap = config.getDocumentPrivileges()
-                        .getRestrictions(context, resolved.getAllIndicesResolved(clusterService, context.getIndexNameExpressionResolver()));
                 } else {
-                    dlsRestrictionMap = config.getDocumentPrivileges()
-                        .getRestrictions(context, resolved.getAllIndicesResolved(clusterService, context.getIndexNameExpressionResolver()));
                     doFilterLevelDls = dlsRestrictionMap.containsAny(DlsRestriction::containsTermLookupQuery);
 
                     if (doFilterLevelDls) {