Skip to content

Add apm_user reserved role #38206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 5, 2019
Merged

Add apm_user reserved role #38206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97ee68d
Adding apm_user
kobelb Jan 31, 2019
c626170
Fixing SecurityDocumentationIT testGetRoles test
kobelb Feb 1, 2019
f2330ba
Merge remote-tracking branch 'upstream/master' into apm-reserved-role
kobelb Feb 1, 2019
5db657b
Adding access to .ml-anomalies-*
kobelb Feb 4, 2019
fb5eaff
Fixing APM test, we don't have access to the ML state index
kobelb Feb 4, 2019
ceb699a
Merge remote-tracking branch 'upstream/master' into apm-reserved-role
kobelb Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...h-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,8 @@ public void testGetRoles() throws Exception {

List<Role> roles = response.getRoles();
assertNotNull(response);
// 24 system roles plus the three we created
assertThat(roles.size(), equalTo(27));
// 25 system roles plus the three we created
assertThat(roles.size(), equalTo(28));
}

{
Expand Down
7 changes: 7 additions & 0 deletions ...e/src/main/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ private static Map<String, RoleDescriptor> initializeReservedRoles() {
new String[] { "monitor", MonitoringBulkAction.NAME}, null, null, MetadataUtils.DEFAULT_RESERVED_METADATA))
.put(UsernamesField.APM_ROLE, new RoleDescriptor(UsernamesField.APM_ROLE,
new String[] { "monitor", MonitoringBulkAction.NAME}, null, null, MetadataUtils.DEFAULT_RESERVED_METADATA))
.put("apm_user", new RoleDescriptor("apm_user",
null, new RoleDescriptor.IndicesPrivileges[] {
RoleDescriptor.IndicesPrivileges.builder().indices("apm-*")
.privileges("read", "view_index_metadata").build(),
RoleDescriptor.IndicesPrivileges.builder().indices(".ml-anomalies*")
.privileges("view_index_metadata", "read").build(),
Copy link
Member

@sorenlouv sorenlouv Feb 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙇

}, null, MetadataUtils.DEFAULT_RESERVED_METADATA))
.put("machine_learning_user", new RoleDescriptor("machine_learning_user", new String[] { "monitor_ml" },
new RoleDescriptor.IndicesPrivileges[] {
RoleDescriptor.IndicesPrivileges.builder().indices(".ml-anomalies*", ".ml-notifications*")
Expand Down
17 changes: 17 additions & 0 deletions .../test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,23 @@ public void testAPMSystemRole() {
assertNoAccessAllowed(APMSystemRole, RestrictedIndicesNames.NAMES_SET);
}

public void testAPMUserRole() {
final TransportRequest request = mock(TransportRequest.class);

final RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("apm_user");
assertNotNull(roleDescriptor);
assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true));

Role role = Role.builder(roleDescriptor, null).build();

assertThat(role.runAs().check(randomAlphaOfLengthBetween(1, 12)), is(false));

assertNoAccessAllowed(role, "foo");

assertOnlyReadAllowed(role, "apm-" + randomIntBetween(0, 5));
assertOnlyReadAllowed(role, AnomalyDetectorsIndexFields.RESULTS_INDEX_PREFIX + AnomalyDetectorsIndexFields.RESULTS_INDEX_DEFAULT);
}

public void testMachineLearningAdminRole() {
final TransportRequest request = mock(TransportRequest.class);

Expand Down