Update View CRUD Actions to be Index Actions

docs/changelog/141570.yaml

@@ -0,0 +1,5 @@
+area: "Authorization"
+issues: []
+pr: 141570
+summary: Update View CRUD Actions to be Index Actions
+type: enhancement

server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java

@@ -97,19 +97,21 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
      * @param resolveAliases, aliases will be included in the result, if false we treat them like they do not exist
      * @param allowEmptyExpressions, when an expression does not result in any indices, if false it throws an error if true it treats it as
      *                               an empty result
+     * @param resolveViews, views will be included in the result, if false we treat them like they do not exist
      */
     public record WildcardOptions(
         boolean matchOpen,
         boolean matchClosed,
         boolean includeHidden,
         boolean resolveAliases,
-        boolean allowEmptyExpressions
+        boolean allowEmptyExpressions,
+        boolean resolveViews
     ) implements ToXContentFragment {
 
         public static final String EXPAND_WILDCARDS = "expand_wildcards";
         public static final String ALLOW_NO_INDICES = "allow_no_indices";
 
-        public static final WildcardOptions DEFAULT = new WildcardOptions(true, false, false, true, true);
+        public static final WildcardOptions DEFAULT = new WildcardOptions(true, false, false, true, true, false);
 
         public static WildcardOptions parseParameters(Object expandWildcards, Object allowNoIndices, WildcardOptions defaultOptions) {
             if (expandWildcards == null && allowNoIndices == null) {
@@ -178,6 +180,7 @@ public static class Builder {
             private boolean includeHidden;
             private boolean resolveAliases;
             private boolean allowEmptyExpressions;
+            private boolean resolveViews;
 
             Builder() {
                 this(DEFAULT);
@@ -189,6 +192,7 @@ public static class Builder {
                 includeHidden = options.includeHidden;
                 resolveAliases = options.resolveAliases;
                 allowEmptyExpressions = options.allowEmptyExpressions;
+                resolveViews = options.resolveViews;
             }
 
             /**
@@ -244,6 +248,14 @@ public Builder matchNone() {
                 return this;
             }
 
+            /**
+             * Resolve views. Defaults to false
+             */
+            public Builder resolveViews(boolean resolveViews) {
+                this.resolveViews = resolveViews;
+                return this;
+            }
+
             /**
              * Maximises the resolution of indices, we will match open, closed and hidden targets.
              */
@@ -281,7 +293,7 @@ public Builder expandStates(String[] expandStates) {
             }
 
             public WildcardOptions build() {
-                return new WildcardOptions(matchOpen, matchClosed, includeHidden, resolveAliases, allowEmptyExpressions);
+                return new WildcardOptions(matchOpen, matchClosed, includeHidden, resolveAliases, allowEmptyExpressions, resolveViews);
             }
         }
 

server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java

@@ -308,8 +308,7 @@ private static boolean isIndexVisible(
             throw new IllegalStateException("could not resolve index abstraction [" + index + "]");
         }
         if (indexAbstraction.getType() == IndexAbstraction.Type.VIEW) {
-            // TODO: perhaps revisit this in the future if we make views "visible" or "hidden"?
-            return false;
+            return indicesOptions.wildcardOptions().resolveViews();
         }
         final boolean isHidden = indexAbstraction.isHidden();
         boolean isVisible = isWildcardExpression == false

server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java

@@ -725,6 +725,10 @@ public static boolean shouldIncludeFailureIndices(IndicesOptions indicesOptions,
         return indicesOptions.includeFailureIndices();
     }
 
+    public static boolean shouldPreserveViews(IndicesOptions indicesOptions) {
+        return indicesOptions.wildcardOptions().resolveViews();
+    }
+
     private static boolean resolvesToMoreThanOneIndex(IndexAbstraction indexAbstraction, Context context, ResolvedExpression expression) {
         if (indexAbstraction.getType() == Type.ALIAS && indexAbstraction.isDataStreamRelated()) {
             // We inline this logic instead of calling aliasDataStreams because we want to return as soon as we've identified that we have
@@ -1788,7 +1792,7 @@ private static boolean shouldExpandToIndexAbstraction(
             String wildcardExpression,
             IndexAbstraction indexAbstraction
         ) {
-            if (indexAbstraction.getType() == Type.VIEW) {
+            if (shouldPreserveViews(context.getOptions()) == false && indexAbstraction.getType() == Type.VIEW) {
                 return false;
             }
             if (context.getOptions().ignoreAliases() && indexAbstraction.getType() == Type.ALIAS) {
@@ -1843,8 +1847,9 @@ private static Set<ResolvedExpression> expandToOpenClosed(
             } else if (context.isPreserveDataStreams() && indexAbstraction.getType() == Type.DATA_STREAM) {
                 resources.add(new ResolvedExpression(indexAbstraction.getName(), selector));
             } else if (indexAbstraction.getType() == Type.VIEW) {
-                // a view cannot expand to any indices, return an empty set
-                return Set.of();
+                if (shouldPreserveViews(context.getOptions())) {
+                    resources.add(new ResolvedExpression(indexAbstraction.getName(), selector));
+                }
             } else {
                 if (shouldIncludeRegularIndices(context.getOptions(), selector)) {
                     for (int i = 0, n = indexAbstraction.getIndices().size(); i < n; i++) {

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java

@@ -1851,7 +1851,7 @@ static SortedMap<String, IndexAbstraction> buildIndicesLookup(
             ViewMetadata viewMetadata,
             ImmutableOpenMap<String, IndexMetadata> indices
         ) {
-            if (indices.isEmpty()) {
+            if (indices.isEmpty() && viewMetadata.views().isEmpty()) {
                 return Collections.emptySortedMap();
             }
             Map<String, IndexAbstraction> indicesLookup = new HashMap<>();

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestTests.java

@@ -86,7 +86,8 @@ public void testToXContent() throws IOException {
                             randomBoolean(),
                             randomBoolean(),
                             defaultResolveAliasForThisRequest,
-                            randomBoolean()
+                            randomBoolean(),
+                            false  // Specifying views in the create snapshot request is not supported
                         )
                     )
                     .gatekeeperOptions(IndicesOptions.GatekeeperOptions.builder().allowSelectors(false).includeFailureIndices(true).build())

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestTests.java

@@ -30,8 +30,6 @@
 import java.util.Map;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 public class RestoreSnapshotRequestTests extends AbstractWireSerializingTestCase<RestoreSnapshotRequest> {
     private RestoreSnapshotRequest randomState(RestoreSnapshotRequest instance) {
@@ -89,7 +87,8 @@ private RestoreSnapshotRequest randomState(RestoreSnapshotRequest instance) {
                             randomBoolean(),
                             randomBoolean(),
                             instance.indicesOptions().ignoreAliases() == false,
-                            randomBoolean()
+                            randomBoolean(),
+                            false // Specifying views in the restore snapshot request is not supported
                         )
                     )
                     .gatekeeperOptions(IndicesOptions.GatekeeperOptions.builder().allowSelectors(false).includeFailureIndices(true).build())

server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java

@@ -345,6 +345,7 @@ public void testToXContent() throws IOException {
             randomBoolean(),
             randomBoolean(),
             randomBoolean(),
+            randomBoolean(),
             randomBoolean()
         );
         GatekeeperOptions gatekeeperOptions = new GatekeeperOptions(
@@ -384,6 +385,7 @@ public void testFromXContent() throws IOException {
             randomBoolean(),
             randomBoolean(),
             randomBoolean(),
+            randomBoolean(),
             randomBoolean()
         );
         ConcreteTargetOptions concreteTargetOptions = new ConcreteTargetOptions(randomBoolean());

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlViewActionNames.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.core.esql;
+
+/**
+ * Exposes ES|QL view action names for RBACEngine.
+ */
+public class EsqlViewActionNames {
+    public static final String ESQL_PUT_VIEW_ACTION_NAME = "indices:admin/esql/view/put";
+    public static final String ESQL_GET_VIEW_ACTION_NAME = "indices:admin/esql/view/get";
+    public static final String ESQL_DELETE_VIEW_ACTION_NAME = "indices:admin/esql/view/delete";
+}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilege.java

@@ -39,6 +39,7 @@
 import org.elasticsearch.xpack.core.ccr.action.ForgetFollowerAction;
 import org.elasticsearch.xpack.core.ccr.action.PutFollowAction;
 import org.elasticsearch.xpack.core.ccr.action.UnfollowAction;
+import org.elasticsearch.xpack.core.esql.EsqlViewActionNames;
 import org.elasticsearch.xpack.core.ilm.action.ExplainLifecycleAction;
 import org.elasticsearch.xpack.core.inference.action.GetInferenceFieldsInternalAction;
 import org.elasticsearch.xpack.core.rollup.action.GetRollupIndexCapsAction;
@@ -194,6 +195,10 @@ public final class IndexPrivilege extends Privilege {
         "internal:transport/proxy/indices:internal/admin/ccr/restore/session/clear*",
         "internal:transport/proxy/indices:internal/admin/ccr/restore/file_chunk/get*"
     );
+    private static final Automaton CREATE_VIEW_AUTOMATON = patterns(EsqlViewActionNames.ESQL_PUT_VIEW_ACTION_NAME);
+    private static final Automaton READ_VIEW_METADATA_AUTOMATON = patterns(EsqlViewActionNames.ESQL_GET_VIEW_ACTION_NAME);
+    private static final Automaton DELETE_VIEW_AUTOMATON = patterns(EsqlViewActionNames.ESQL_DELETE_VIEW_ACTION_NAME);
+    private static final Automaton MANAGE_VIEW_AUTOMATON = patterns("indices:admin/esql/view*");
 
     public static final IndexPrivilege NONE = new IndexPrivilege("none", Automatons.EMPTY);
     public static final IndexPrivilege ALL = new IndexPrivilege("all", ALL_AUTOMATON, IndexComponentSelectorPredicate.ALL);
@@ -231,6 +236,10 @@ public final class IndexPrivilege extends Privilege {
         "cross_cluster_replication_internal",
         CROSS_CLUSTER_REPLICATION_INTERNAL_AUTOMATON
     );
+    public static final IndexPrivilege MANAGE_VIEW = new IndexPrivilege("manage_view", MANAGE_VIEW_AUTOMATON);
+    public static final IndexPrivilege CREATE_VIEW = new IndexPrivilege("create_view", CREATE_VIEW_AUTOMATON);
+    public static final IndexPrivilege DELETE_VIEW = new IndexPrivilege("delete_view", DELETE_VIEW_AUTOMATON);
+    public static final IndexPrivilege READ_VIEW_METADATA = new IndexPrivilege("read_view_metadata", READ_VIEW_METADATA_AUTOMATON);
 
     public static final IndexPrivilege READ_FAILURE_STORE = new IndexPrivilege(
         "read_failure_store",
@@ -275,7 +284,11 @@ public final class IndexPrivilege extends Privilege {
                 entry("maintenance", MAINTENANCE),
                 entry("auto_configure", AUTO_CONFIGURE),
                 entry("cross_cluster_replication", CROSS_CLUSTER_REPLICATION),
-                entry("cross_cluster_replication_internal", CROSS_CLUSTER_REPLICATION_INTERNAL)
+                entry("cross_cluster_replication_internal", CROSS_CLUSTER_REPLICATION_INTERNAL),
+                entry("manage_view", MANAGE_VIEW),
+                entry("create_view", CREATE_VIEW),
+                entry("delete_view", DELETE_VIEW),
+                entry("read_view_metadata", READ_VIEW_METADATA)
             ).collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue))
         )
     );

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilegeTests.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.iterable.Iterables;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.core.esql.EsqlViewActionNames;
 import org.elasticsearch.xpack.core.rollup.action.GetRollupIndexCapsAction;
 import org.elasticsearch.xpack.core.security.support.Automatons;
 import org.elasticsearch.xpack.core.transform.action.GetCheckpointAction;
@@ -71,6 +72,18 @@ public void testFindPrivilegesThatGrant() {
             equalTo(List.of("monitor", "cross_cluster_replication", "manage", "all"))
         );
         assertThat(findPrivilegesThatGrant(RefreshAction.NAME), equalTo(List.of("maintenance", "manage", "all")));
+        assertThat(
+            findPrivilegesThatGrant(EsqlViewActionNames.ESQL_PUT_VIEW_ACTION_NAME),
+            equalTo(List.of("create_view", "manage_view", "manage", "all"))
+        );
+        assertThat(
+            findPrivilegesThatGrant(EsqlViewActionNames.ESQL_GET_VIEW_ACTION_NAME),
+            equalTo(List.of("read_view_metadata", "manage_view", "manage", "all"))
+        );
+        assertThat(
+            findPrivilegesThatGrant(EsqlViewActionNames.ESQL_DELETE_VIEW_ACTION_NAME),
+            equalTo(List.of("delete_view", "manage_view", "manage", "all"))
+        );
 
         Predicate<IndexPrivilege> failuresOnly = p -> p.getSelectorPredicate() == IndexComponentSelectorPredicate.FAILURES;
         assertThat(findPrivilegesThatGrant(TransportSearchAction.TYPE.name(), failuresOnly), equalTo(List.of("read_failure_store")));
@@ -114,6 +127,26 @@ public void testGet() {
             assertThat(Automatons.subsetOf(IndexPrivilege.ALL.automaton, actual.automaton), is(true));
             assertThat(actual.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.ALL));
         }
+        {
+            IndexPrivilege actual = IndexPrivilege.get("create_view");
+            assertThat(actual, equalTo(IndexPrivilege.CREATE_VIEW));
+            assertThat(actual.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+        }
+        {
+            IndexPrivilege actual = IndexPrivilege.get("delete_view");
+            assertThat(actual, equalTo(IndexPrivilege.DELETE_VIEW));
+            assertThat(actual.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+        }
+        {
+            IndexPrivilege actual = IndexPrivilege.get("read_view_metadata");
+            assertThat(actual, equalTo(IndexPrivilege.READ_VIEW_METADATA));
+            assertThat(actual.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+        }
+        {
+            IndexPrivilege actual = IndexPrivilege.get("manage_view");
+            assertThat(actual, equalTo(IndexPrivilege.MANAGE_VIEW));
+            assertThat(actual.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+        }
     }
 
     public void testResolveSameSelectorPrivileges() {
@@ -395,6 +428,43 @@ public void testCrossClusterReplicationPrivileges() {
         );
     }
 
+    public void testViewPrivileges() {
+        final IndexPrivilege createView = resolvePrivilegeAndAssertSingleton(Set.of("create_view"));
+        assertThat(createView.predicate.test(EsqlViewActionNames.ESQL_PUT_VIEW_ACTION_NAME), is(true));
+        assertThat(createView.predicate.test(EsqlViewActionNames.ESQL_PUT_VIEW_ACTION_NAME + randomAlphaOfLengthBetween(1, 8)), is(false));
+        assertThat(createView.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+
+        final IndexPrivilege deleteView = resolvePrivilegeAndAssertSingleton(Set.of("delete_view"));
+        assertThat(deleteView.predicate.test(EsqlViewActionNames.ESQL_DELETE_VIEW_ACTION_NAME), is(true));
+        assertThat(
+            deleteView.predicate.test(EsqlViewActionNames.ESQL_DELETE_VIEW_ACTION_NAME + randomAlphaOfLengthBetween(1, 8)),
+            is(false)
+        );
+        assertThat(deleteView.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+
+        final IndexPrivilege readViewMetadata = resolvePrivilegeAndAssertSingleton(Set.of("read_view_metadata"));
+        assertThat(readViewMetadata.predicate.test(EsqlViewActionNames.ESQL_GET_VIEW_ACTION_NAME), is(true));
+        assertThat(
+            readViewMetadata.predicate.test(EsqlViewActionNames.ESQL_GET_VIEW_ACTION_NAME + randomAlphaOfLengthBetween(1, 8)),
+            is(false)
+        );
+        assertThat(readViewMetadata.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+
+        final IndexPrivilege manageView = resolvePrivilegeAndAssertSingleton(Set.of("manage_view"));
+        assertThat(manageView.predicate.test(EsqlViewActionNames.ESQL_PUT_VIEW_ACTION_NAME), is(true));
+        assertThat(manageView.predicate.test(EsqlViewActionNames.ESQL_GET_VIEW_ACTION_NAME), is(true));
+        assertThat(manageView.predicate.test(EsqlViewActionNames.ESQL_DELETE_VIEW_ACTION_NAME), is(true));
+        assertThat(manageView.predicate.test("indices:admin/esql/view/other"), is(true));
+        assertThat(manageView.getSelectorPredicate(), equalTo(IndexComponentSelectorPredicate.DATA));
+
+        assertThat(Automatons.subsetOf(createView.automaton, manageView.automaton), is(true));
+        assertThat(Automatons.subsetOf(deleteView.automaton, manageView.automaton), is(true));
+        assertThat(Automatons.subsetOf(readViewMetadata.automaton, manageView.automaton), is(true));
+
+        assertThat(Automatons.subsetOf(manageView.automaton, resolvePrivilegeAndAssertSingleton(Set.of("all")).automaton), is(true));
+        assertThat(Automatons.subsetOf(manageView.automaton, resolvePrivilegeAndAssertSingleton(Set.of("manage")).automaton), is(true));
+    }
+
     public void testInvalidPrivilegeErrorMessage() {
         final String unknownPrivilege = randomValueOtherThanMany(
             i -> IndexPrivilege.values().containsKey(i),