Fix

Author: n1v0lg

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java

@@ -114,7 +114,8 @@ public void addIndex(
         String[] grantedFields,
         String[] deniedFields,
         @Nullable BytesReference query,
-        boolean allowRestrictedIndices
+        boolean allowRestrictedIndices,
+        List<String> selectors
     ) {
         this.indicesPrivileges.add(
             RoleDescriptor.IndicesPrivileges.builder()
@@ -123,6 +124,7 @@ public void addIndex(
                 .grantedFields(grantedFields)
                 .deniedFields(deniedFields)
                 .query(query)
+                .selectors(selectors)
                 .allowRestrictedIndices(allowRestrictedIndices)
                 .build()
         );

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestBuilder.java

@@ -7,13 +7,15 @@
 package org.elasticsearch.xpack.core.security.action.role;
 
 import org.elasticsearch.action.ActionRequestBuilder;
+import org.elasticsearch.action.support.IndexComponentSelector;
 import org.elasticsearch.client.internal.ElasticsearchClient;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -75,7 +77,28 @@ public PutRoleRequestBuilder addIndices(
         @Nullable BytesReference query,
         boolean allowRestrictedIndices
     ) {
-        request.addIndex(indices, privileges, grantedFields, deniedFields, query, allowRestrictedIndices);
+        request.addIndex(
+            indices,
+            privileges,
+            grantedFields,
+            deniedFields,
+            query,
+            allowRestrictedIndices,
+            List.of(IndexComponentSelector.DATA.getKey())
+        );
+        return this;
+    }
+
+    public PutRoleRequestBuilder addIndices(
+        String[] indices,
+        String[] privileges,
+        String[] grantedFields,
+        String[] deniedFields,
+        @Nullable BytesReference query,
+        boolean allowRestrictedIndices,
+        List<String> selectors
+    ) {
+        request.addIndex(indices, privileges, grantedFields, deniedFields, query, allowRestrictedIndices, selectors);
         return this;
     }
 

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

@@ -1646,6 +1646,10 @@ public IndicesPrivileges build() {
                 if (indicesPrivileges.privileges == null || indicesPrivileges.privileges.length == 0) {
                     throw new IllegalArgumentException("indices privileges must define at least one privilege");
                 }
+                // TODO
+                if (indicesPrivileges.selectors == null || indicesPrivileges.selectors.isEmpty()) {
+                    indicesPrivileges.selectors = DEFAULT_SELECTORS;
+                }
                 return indicesPrivileges;
             }
         }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestTests.java

@@ -7,6 +7,7 @@
 package org.elasticsearch.xpack.core.security.action.role;
 
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.support.IndexComponentSelector;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.core.security.authz.RoleDescriptor.ApplicationResourcePrivileges;
@@ -76,7 +77,8 @@ public void testValidationErrorWithUnknownIndexPrivilegeName() {
             null,
             null,
             null,
-            randomBoolean()
+            randomBoolean(),
+            List.of(IndexComponentSelector.DATA.getKey())
         );
 
         // Fail
@@ -180,7 +182,8 @@ public void testValidationSuccessWithCorrectIndexPrivilegeName() {
             null,
             null,
             null,
-            randomBoolean()
+            randomBoolean(),
+            List.of(IndexComponentSelector.DATA.getKey())
         );
         assertSuccessfulValidation(request);
     }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageRolesPrivilegesTests.java

@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.core.security.authz.privilege;
 
 import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.support.IndexComponentSelector;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.test.AbstractNamedWriteableTestCase;
 import org.elasticsearch.xcontent.ToXContent;
@@ -276,7 +277,7 @@ private static void assertAllowedIndexPatterns(
         {
             final PutRoleRequest putRoleRequest = new PutRoleRequest();
             putRoleRequest.name(randomAlphaOfLength(3));
-            putRoleRequest.addIndex(indexPatterns, privileges, null, null, null, false);
+            putRoleRequest.addIndex(indexPatterns, privileges, null, null, null, false, List.of(IndexComponentSelector.DATA.getKey()));
             assertThat(permissionCheck(permission, "cluster:admin/xpack/security/role/put", putRoleRequest), is(expected));
         }
         {