test fixes

jakelandis · Oct 28, 2024 · c259d9d · c259d9d
1 parent 86c0367
commit c259d9d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/docs/reference/rest-api/security/get-builtin-privileges.asciidoc b/docs/reference/rest-api/security/get-builtin-privileges.asciidoc
@@ -153,7 +153,8 @@ A successful call returns an object with "cluster", "index", and "remote_cluster
     "write"
   ],
   "remote_cluster" : [
-    "monitor_enrich"
+    "monitor_enrich",
+    "monitor_stats"
   ]
 }
 --------------------------------------------------
diff --git a/...org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java b/...org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java
@@ -495,7 +495,6 @@ static RoleDescriptor kibanaSystem(String name) {
                 getRemoteIndicesReadPrivileges("metrics-apm.*"),
                 getRemoteIndicesReadPrivileges("traces-apm.*"),
                 getRemoteIndicesReadPrivileges("traces-apm-*") },
-            // TODO: test this!
             new RemoteClusterPermissions().addGroup(
                 new RemoteClusterPermissionGroup(
                     RemoteClusterPermissions.getSupportedRemoteClusterPermissions()

diff --git a/...plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java b/...plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java
@@ -92,6 +92,7 @@
 import org.elasticsearch.xpack.core.security.authz.privilege.ApplicationPrivilege;
 import org.elasticsearch.xpack.core.security.authz.privilege.ApplicationPrivilegeDescriptor;
 import org.elasticsearch.xpack.core.security.authz.privilege.ApplicationPrivilegeTests;
+import org.elasticsearch.xpack.core.security.authz.privilege.ClusterPrivilegeResolver;
 import org.elasticsearch.xpack.core.security.authz.privilege.ConfigurableClusterPrivileges.ManageApplicationPrivileges;
 import org.elasticsearch.xpack.core.security.authz.privilege.IndexPrivilege;
 import org.elasticsearch.xpack.core.security.authz.privilege.Privilege;
@@ -1792,6 +1793,18 @@ public void testGetRoleDescriptorsForRemoteClusterForReservedRoles() {
                             null,
                             null,
                             null,
+                            null,
+                            null,
+                            new RemoteClusterPermissions().addGroup(
+                                new RemoteClusterPermissionGroup(
+                                    RemoteClusterPermissions.getSupportedRemoteClusterPermissions()
+                                        .stream()
+                                        .filter(s -> s.equals(ClusterPrivilegeResolver.MONITOR_STATS.name()))
+                                        .toArray(String[]::new),
+                                    new String[] { "*" }
+                                )
+                            ),
+                            null,
                             null
                         )
                     )