Skip to content

[Failure Store] Access for internal users #125660

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 7 commits into from
Mar 27, 2025
Merged

[Failure Store] Access for internal users #125660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c68f3ac
Failure store access for internal users
n1v0lg Mar 26, 2025
0bf61b8
No need for reindex user
n1v0lg Mar 26, 2025
f276787
Tests
n1v0lg Mar 26, 2025
59534b9
Merge branch 'main' into failure-store-internal-user-access
n1v0lg Mar 26, 2025
6fc8acd
Merge branch 'main' into failure-store-internal-user-access
n1v0lg Mar 27, 2025
d1e0c37
Merge branch 'main' into failure-store-internal-user-access
n1v0lg Mar 27, 2025
cfdc1bb
Merge branch 'main' into failure-store-internal-user-access
n1v0lg Mar 27, 2025
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
77 changes: 42 additions & 35 deletions ...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/user/InternalUsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
import org.elasticsearch.xpack.core.security.authz.RoleDescriptor;
import org.elasticsearch.xpack.core.security.support.MetadataUtils;

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -157,14 +159,18 @@ public class InternalUsers {
RoleDescriptor.IndicesPrivileges.builder()
.indices("*")
.privileges(
"delete_index",
RolloverAction.NAME,
ForceMergeAction.NAME + "*",
// indices stats is used by rollover, so we need to grant it here
IndicesStatsAction.NAME + "*",
TransportUpdateSettingsAction.TYPE.name(),
DownsampleAction.NAME,
TransportAddIndexBlockAction.TYPE.name()
filterNonNull(
// needed to rollover failure store
DataStream.isFailureStoreFeatureFlagEnabled() ? "manage_failure_store" : null,
"delete_index",
RolloverAction.NAME,
ForceMergeAction.NAME + "*",
// indices stats is used by rollover, so we need to grant it here
IndicesStatsAction.NAME + "*",
TransportUpdateSettingsAction.TYPE.name(),
DownsampleAction.NAME,
TransportAddIndexBlockAction.TYPE.name()
)
)
.allowRestrictedIndices(false)
.build(),
Expand All @@ -176,14 +182,18 @@ public class InternalUsers {
".fleet-fileds*"
)
.privileges(
"delete_index",
RolloverAction.NAME,
ForceMergeAction.NAME + "*",
// indices stats is used by rollover, so we need to grant it here
IndicesStatsAction.NAME + "*",
TransportUpdateSettingsAction.TYPE.name(),
DownsampleAction.NAME,
TransportAddIndexBlockAction.TYPE.name()
filterNonNull(
// needed to rollover failure store
DataStream.isFailureStoreFeatureFlagEnabled() ? "manage_failure_store" : null,
"delete_index",
RolloverAction.NAME,
ForceMergeAction.NAME + "*",
// indices stats is used by rollover, so we need to grant it here
IndicesStatsAction.NAME + "*",
TransportUpdateSettingsAction.TYPE.name(),
DownsampleAction.NAME,
TransportAddIndexBlockAction.TYPE.name()
)
)
.allowRestrictedIndices(true)
.build() },
Expand Down Expand Up @@ -246,25 +256,18 @@ public class InternalUsers {
new RoleDescriptor(
UsernamesField.LAZY_ROLLOVER_ROLE,
new String[] {},
DataStream.isFailureStoreFeatureFlagEnabled()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just refactoring, no actual changes for this user.

? new RoleDescriptor.IndicesPrivileges[] {
RoleDescriptor.IndicesPrivileges.builder()
.indices("*")
.privileges(LazyRolloverAction.NAME)
.allowRestrictedIndices(true)
.build(),
RoleDescriptor.IndicesPrivileges.builder()
.indices("*")
// needed to rollover failure store
.privileges("manage_failure_store")
.allowRestrictedIndices(true)
.build() }
: new RoleDescriptor.IndicesPrivileges[] {
RoleDescriptor.IndicesPrivileges.builder()
.indices("*")
.privileges(LazyRolloverAction.NAME)
.allowRestrictedIndices(true)
.build(), },
new RoleDescriptor.IndicesPrivileges[] {
RoleDescriptor.IndicesPrivileges.builder()
.indices("*")
.privileges(
filterNonNull(
// needed to rollover failure store
DataStream.isFailureStoreFeatureFlagEnabled() ? "manage_failure_store" : null,
LazyRolloverAction.NAME
)
)
.allowRestrictedIndices(true)
.build() },
null,
null,
new String[] {},
Expand Down Expand Up @@ -322,4 +325,8 @@ public static InternalUser getUser(String username) {
}
return instance;
}

private static String[] filterNonNull(String... privileges) {
return Arrays.stream(privileges).filter(Objects::nonNull).toArray(String[]::new);
}
}
18 changes: 18 additions & 0 deletions ...gin/core/src/test/java/org/elasticsearch/xpack/core/security/user/InternalUsersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ public void testDataStreamLifecycleUser() {
TransportAddIndexBlockAction.TYPE.name()
);
final String dataStream = randomAlphaOfLengthBetween(3, 12);

checkIndexAccess(role, randomFrom(sampleIndexActions), dataStream, true);
// Also check backing index access
checkIndexAccess(
Expand All @@ -280,6 +281,15 @@ public void testDataStreamLifecycleUser() {
true
);

checkIndexAccess(role, randomFrom(sampleIndexActions), dataStream + "::failures", true);
// Also check failure index access
checkIndexAccess(
role,
randomFrom(sampleIndexActions),
DataStream.FAILURE_STORE_PREFIX + dataStream + randomAlphaOfLengthBetween(4, 8),
true
);

allowedSystemDataStreams.forEach(allowedSystemDataStream -> {
checkIndexAccess(role, randomFrom(sampleSystemDataStreamActions), allowedSystemDataStream, true);
checkIndexAccess(
Expand All @@ -288,6 +298,14 @@ public void testDataStreamLifecycleUser() {
DataStream.BACKING_INDEX_PREFIX + allowedSystemDataStream + randomAlphaOfLengthBetween(4, 8),
true
);

checkIndexAccess(role, randomFrom(sampleSystemDataStreamActions), allowedSystemDataStream + "::failures", true);
checkIndexAccess(
role,
randomFrom(sampleSystemDataStreamActions),
DataStream.FAILURE_STORE_PREFIX + allowedSystemDataStream + randomAlphaOfLengthBetween(4, 8),
true
);
});

checkIndexAccess(role, randomFrom(sampleSystemDataStreamActions), randomFrom(TestRestrictedIndices.SAMPLE_RESTRICTED_NAMES), false);
Expand Down