Skip to content

Commit eb41995

Browse files
tsullivanjkakavas
andauthored
Designate reporting_user as a deprecated role (#72057) (#72116)
* Designate reporting_user as a deprecated role * fix compilation Co-authored-by: Ioannis Kakavas <[email protected]> Co-authored-by: Ioannis Kakavas <[email protected]>
1 parent 2aacd98 commit eb41995

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,15 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
103103
.put("ingest_admin", new RoleDescriptor("ingest_admin", new String[] { "manage_index_templates", "manage_pipeline" },
104104
null, null, MetadataUtils.DEFAULT_RESERVED_METADATA))
105105
// reporting_user doesn't have any privileges in Elasticsearch, and Kibana authorizes privileges based on this role
106-
.put("reporting_user", new RoleDescriptor("reporting_user", null, null,
107-
null, MetadataUtils.DEFAULT_RESERVED_METADATA))
106+
.put("reporting_user", new RoleDescriptor(
107+
"reporting_user",
108+
null,
109+
null,
110+
null,
111+
null,
112+
null,
113+
MetadataUtils.getDeprecatedReservedMetadata("Please use Kibana feature privileges instead"),
114+
null))
108115
.put("kibana_dashboard_only_user", new RoleDescriptor(
109116
"kibana_dashboard_only_user",
110117
null,

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,7 @@ public void testReportingUserRole() {
952952
RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("reporting_user");
953953
assertNotNull(roleDescriptor);
954954
assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true));
955+
assertThat(roleDescriptor.getMetadata(), hasEntry("_deprecated", true));
955956

956957
Role reportingUserRole = Role.builder(roleDescriptor, null).build();
957958
assertThat(reportingUserRole.cluster().check(ClusterHealthAction.NAME, request, authentication), is(false));

0 commit comments

Comments
 (0)