diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/user/privileges/Role.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/user/privileges/Role.java index 2fa5a8da7de61..fe7020aee25f3 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/user/privileges/Role.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/user/privileges/Role.java @@ -312,7 +312,7 @@ public static class ClusterPrivilegeName { public static final String MANAGE_ROLLUP = "manage_rollup"; public static final String MANAGE_INDEX_TEMPLATES = "manage_index_templates"; public static final String MANAGE_INGEST_PIPELINES = "manage_ingest_pipelines"; - public static final String READ_INGEST_PIPELINES = "read_ingest_pipelines"; + public static final String READ_PIPELINES = "read_pipelines"; public static final String TRANSPORT_CLIENT = "transport_client"; public static final String MANAGE_SECURITY = "manage_security"; public static final String MANAGE_SAML = "manage_saml"; @@ -327,7 +327,7 @@ public static class ClusterPrivilegeName { public static final String MANAGE_ENRICH = "manage_enrich"; public static final String[] ALL_ARRAY = new String[] { NONE, ALL, MONITOR, MONITOR_TRANSFORM_DEPRECATED, MONITOR_TRANSFORM, MONITOR_ML, MONITOR_WATCHER, MONITOR_ROLLUP, MANAGE, MANAGE_TRANSFORM_DEPRECATED, MANAGE_TRANSFORM, - MANAGE_ML, MANAGE_WATCHER, MANAGE_ROLLUP, MANAGE_INDEX_TEMPLATES, MANAGE_INGEST_PIPELINES, READ_INGEST_PIPELINES, + MANAGE_ML, MANAGE_WATCHER, MANAGE_ROLLUP, MANAGE_INDEX_TEMPLATES, MANAGE_INGEST_PIPELINES, READ_PIPELINES, TRANSPORT_CLIENT, MANAGE_SECURITY, MANAGE_SAML, MANAGE_OIDC, MANAGE_TOKEN, MANAGE_PIPELINE, MANAGE_AUTOSCALING, MANAGE_CCR, READ_CCR, MANAGE_ILM, READ_ILM, MANAGE_ENRICH }; } diff --git a/x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc b/x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc index b73a2cf20c323..93eac6544d12f 100644 --- a/x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc +++ b/x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc @@ -96,7 +96,7 @@ A successful call returns an object with "cluster" and "index" fields. "none", "read_ccr", "read_ilm", - "read_ingest_pipelines", + "read_pipelines", "read_slm", "transport_client" ], diff --git a/x-pack/docs/en/security/authorization/privileges.asciidoc b/x-pack/docs/en/security/authorization/privileges.asciidoc index 0965c61a39469..b13721cc45c75 100644 --- a/x-pack/docs/en/security/authorization/privileges.asciidoc +++ b/x-pack/docs/en/security/authorization/privileges.asciidoc @@ -178,7 +178,7 @@ This privilege is necessary only on clusters that contain leader indices. All read-only {Ilm} operations, such as getting policies and checking the status of {Ilm} -`read_ingest_pipelines`:: +`read_pipelines`:: Read-only access to ingest pipline (get, simulate). `read_slm`:: diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java index 84a8c894a947d..36b7df4f94448 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ClusterPrivilegeResolver.java @@ -107,8 +107,8 @@ public class ClusterPrivilegeResolver { new ActionClusterPrivilege("manage_index_templates", MANAGE_IDX_TEMPLATE_PATTERN); public static final NamedClusterPrivilege MANAGE_INGEST_PIPELINES = new ActionClusterPrivilege("manage_ingest_pipelines", MANAGE_INGEST_PIPELINE_PATTERN); - public static final NamedClusterPrivilege READ_INGEST_PIPELINES = - new ActionClusterPrivilege("read_ingest_pipelines", READ_INGEST_PIPELINE_PATTERN); + public static final NamedClusterPrivilege READ_PIPELINES = + new ActionClusterPrivilege("read_pipelines", READ_INGEST_PIPELINE_PATTERN); public static final NamedClusterPrivilege TRANSPORT_CLIENT = new ActionClusterPrivilege("transport_client", TRANSPORT_CLIENT_PATTERN); public static final NamedClusterPrivilege MANAGE_SECURITY = new ActionClusterPrivilege("manage_security", ALL_SECURITY_PATTERN, @@ -157,7 +157,7 @@ public class ClusterPrivilegeResolver { MANAGE_WATCHER, MANAGE_IDX_TEMPLATES, MANAGE_INGEST_PIPELINES, - READ_INGEST_PIPELINES, + READ_PIPELINES, TRANSPORT_CLIENT, MANAGE_SECURITY, MANAGE_SAML, diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/PrivilegeTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/PrivilegeTests.java index 4e666749b0ee9..05eac7cc2a3ea 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/PrivilegeTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/PrivilegeTests.java @@ -271,10 +271,10 @@ public void testIngestPipelinePrivileges() { } { - verifyClusterActionAllowed(ClusterPrivilegeResolver.READ_INGEST_PIPELINES, + verifyClusterActionAllowed(ClusterPrivilegeResolver.READ_PIPELINES, "cluster:admin/ingest/pipeline/get", "cluster:admin/ingest/pipeline/simulate"); - verifyClusterActionDenied(ClusterPrivilegeResolver.READ_INGEST_PIPELINES,"cluster:admin/ingest/pipeline/put", + verifyClusterActionDenied(ClusterPrivilegeResolver.READ_PIPELINES,"cluster:admin/ingest/pipeline/put", "cluster:admin/ingest/pipeline/delete", "cluster:admin/whatever");