Match action name

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Nov 27, 2024 · 1369726 · 1369726
1 parent 9de9c24
commit 1369726
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
@@ -38,6 +38,7 @@
 import org.opensearch.action.bulk.BulkItemRequest;
 import org.opensearch.action.bulk.BulkShardRequest;
 import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.update.UpdateAction;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
@@ -135,10 +136,6 @@ public DlsFlsValveImpl(
      */
     @Override
     public boolean invoke(PrivilegesEvaluationContext context, final ActionListener<?> listener) {
-        if (!context.getAction().startsWith("indices:")) {
-            return true;
-        }
-
         DlsFlsProcessedConfig config = this.dlsFlsProcessedConfig.get();
         ActionRequest request = context.getRequest();
         IndexResolverReplacer.Resolved resolved = context.getResolvedRequest();
@@ -268,7 +265,7 @@ public boolean invoke(PrivilegesEvaluationContext context, final ActionListener<
                 }
             }
 
-            if (request instanceof UpdateRequest) {
+            if (UpdateAction.NAME.equals(context.getAction())) {
                 listener.onFailure(new OpenSearchSecurityException("Update is not supported when FLS or DLS or Fieldmasking is activated"));
                 return false;
             }