Fixed issue with "Update is not supported when FLS or DLS or Fieldmasking is active" in Dashboards multi tenancy

Signed-off-by: Nils Bandener <[email protected]>

Author: nibix

src/integrationTest/java/org/opensearch/security/privileges/int_tests/DashboardMultiTenancyIntTests.java

@@ -41,7 +41,6 @@
 import static org.opensearch.test.framework.matcher.RestMatchers.isForbidden;
 import static org.opensearch.test.framework.matcher.RestMatchers.isOk;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * An integration test matrix for Dashboards multi-tenancy. Verifies both read and write operations
@@ -660,25 +659,13 @@ public void bulkWithUpdate_withTenantHeader_humanResources() {
             );
 
             if (user.reference(WRITE).covers(dashboards_index_human_resources)) {
-                if (user == GLOBAL_TENANT_READ_WRITE_USER || user == WILDCARD_TENANT_USER) {
-                    assertThat(response, isOk());
-                    assertThat(
-                        response,
-                        containsExactly(dashboards_index_human_resources).at("items[*].update[?(@.result == 'updated')]._index")
-                            .reducedBy(user.reference(WRITE))
-                            .whenEmpty(isOk())
-                    );
-                } else {
-                    // At the moment, we get here a nested error:
-                    // Update is not supported when FLS or DLS or Fieldmasking is activated
-                    // This is a bug; even though it does not seem to have an impact on Dashboards functionality
-                    assertThat(response, isOk());
-                    assertTrue(
-                        response.getBody(),
-                        response.getBody().contains("Update is not supported when FLS or DLS or Fieldmasking is activated")
-                    );
-                }
-
+                assertThat(response, isOk());
+                assertThat(
+                    response,
+                    containsExactly(dashboards_index_human_resources).at("items[*].update[?(@.result == 'updated')]._index")
+                        .reducedBy(user.reference(WRITE))
+                        .whenEmpty(isOk())
+                );
             } else {
                 assertThat(
                     response,

src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java

@@ -191,6 +191,18 @@ public boolean invoke(PrivilegesEvaluationContext context, final ActionListener<
         DlsFlsProcessedConfig config = this.dlsFlsProcessedConfig.get();
         IndexResolverReplacer.Resolved resolved = context.getResolvedRequest();
 
+        DocumentAllowList documentAllowList = DocumentAllowList.get(threadContext);
+
+        if (!resolved.isLocalAll() && resolved.getAllIndices().stream().anyMatch(index -> documentAllowList.isAllowed(index, "*"))) {
+            // The documentAllowList is needed here for Dashboards multi tenancy which can redirect index accesses to indices for which no
+            // normal index privileges are present
+            // If we would not use the documentAllowList here, the index would appear to be protected
+
+            if (resolved.getAllIndices().size() == 1) {
+                return true;
+            }
+        }
+
         try {
             boolean hasDlsRestrictions = !config.getDocumentPrivileges().isUnrestricted(context, resolved);
             boolean hasFlsRestrictions = !config.getFieldPrivileges().isUnrestricted(context, resolved);