Skip to content

Commit bcb49a5

Browse files
committed
Change reporting_user role to leverage reserved kibana privileges
1 parent eac438b commit bcb49a5

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -328,18 +328,10 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
328328
null,
329329
new RoleDescriptor.ApplicationResourcePrivileges[] {
330330
RoleDescriptor.ApplicationResourcePrivileges.builder()
331-
.application("kibana-.kibana")
331+
.application("kibana-*")
332332
.resources("*")
333333
.privileges(
334-
"feature_discover.minimal_read",
335-
"feature_discover.generate_report",
336-
"feature_dashboard.minimal_read",
337-
"feature_dashboard.generate_report",
338-
"feature_dashboard.download_csv_report",
339-
"feature_canvas.minimal_read",
340-
"feature_canvas.generate_report",
341-
"feature_visualize.minimal_read",
342-
"feature_visualize.generate_report"
334+
"reserved_reporting_user"
343335
)
344336
.build() },
345337
null,
@@ -353,7 +345,7 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
353345
+ "including generating and downloading reports. "
354346
+ "This role implicitly grants access to all Kibana reporting features, "
355347
+ "with each user having access only to their own reports. Note that reporting users should also be assigned "
356-
+ "additional roles that grant read access to the indices that will be used to generate reports."
348+
+ "additional roles that grant read access to Kibana, and the indices that will be used to generate reports."
357349
)
358350
),
359351
entry(KibanaSystemUser.ROLE_NAME, kibanaSystemRoleDescriptor(KibanaSystemUser.ROLE_NAME)),

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2773,15 +2773,7 @@ public void testReportingUserRole() {
27732773
final String applicationName = "kibana-.kibana";
27742774

27752775
final Set<String> applicationPrivilegeNames = Set.of(
2776-
"feature_discover.minimal_read",
2777-
"feature_discover.generate_report",
2778-
"feature_dashboard.minimal_read",
2779-
"feature_dashboard.generate_report",
2780-
"feature_dashboard.download_csv_report",
2781-
"feature_canvas.minimal_read",
2782-
"feature_canvas.generate_report",
2783-
"feature_visualize.minimal_read",
2784-
"feature_visualize.generate_report"
2776+
"reserved_reporting_user"
27852777
);
27862778

27872779
final Set<String> allowedApplicationActionPatterns = Set.of(

0 commit comments

Comments
 (0)