Always error out if CCS expression shows up when CCS is not supported

docs/changelog/139009.yaml

@@ -0,0 +1,5 @@
+pr: 139009
+summary: Always error out if CCS expression shows up when CCS is not supported
+area: CCS
+type: bug
+issues: [ 138987 ]

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/70_remote.yml

@@ -0,0 +1,37 @@
+---
+setup:
+  - do:
+      indices.create:
+        index: test_1
+
+---
+"Remote index mapping, should fail":
+  - requires:
+      cluster_features: [ "search.indices_boost_remote_index_fix" ]
+      reason: "indices_boost remote index fix must be present"
+  - do:
+      catch: /Cross-cluster calls are not supported in this context but remote indices were requested:/
+      indices.get_mapping:
+        index: remote1:test_1
+
+---
+"Remote and local index mapping, should fail":
+  - requires:
+      cluster_features: [ "search.indices_boost_remote_index_fix" ]
+      reason: "indices_boost remote index fix must be present"
+  - do:
+      catch: /Cross-cluster calls are not supported in this context but remote indices were requested:/
+      indices.get_mapping:
+        index: test_1,remote1:test_1
+
+---
+"Remote index mapping, ignore_unavailable=true, should fail":
+  - requires:
+      cluster_features: [ "search.indices_boost_remote_index_fix" ]
+      reason: "indices_boost remote index fix must be present"
+  - do:
+      catch: /Cross-cluster calls are not supported in this context but remote indices were requested:/
+      indices.get_mapping:
+        ignore_unavailable: true
+        index: remote1:test_1
+

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/40_indices_boost.yml

@@ -151,3 +151,17 @@ setup:
   - match: { hits.total: 2}
   - match: { hits.hits.0._index: test_2 }
   - match: { hits.hits.1._index: test_1 }
+
+---
+"Remote expressions not supported in indices boost":
+  - requires:
+      cluster_features: ["search.indices_boost_remote_index_fix"]
+      reason: "indices_boost remote index fix must be present"
+  - do:
+      catch: /Cross-cluster calls are not supported in this context but remote indices were requested:/
+      search:
+        rest_total_hits_as_int: true
+        ignore_unavailable: true
+        index: _all
+        body:
+          indices_boost: [{nonexistent: 2.0}, {remote1:test_1: 1.0}, {test_2: 2.0}]

server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java

@@ -101,7 +101,10 @@ protected void masterOperation(
             request.indices()
         );
         Map<String, AliasFilter> indicesAndFilters = new HashMap<>();
-        Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(project.metadata(), request.indices());
+        Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressionsIgnoringRemotes(
+            project.metadata(),
+            request.indices()
+        );
         for (String index : concreteIndices) {
             final AliasFilter aliasFilter = indicesService.buildAliasFilter(project, index, indicesAndAliases);
             final String[] aliases = indexNameExpressionResolver.allIndexAliases(project.metadata(), index, indicesAndAliases);

server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java

@@ -783,6 +783,7 @@ static void resolveIndices(
                 projectState.metadata(),
                 indicesOptions,
                 true,
+                false,
                 names
             );
             for (ResolvedExpression s : resolvedIndexAbstractions) {

server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java

@@ -152,7 +152,7 @@ private ProjectState getProjectState() {
     @Override
     protected ShardValidateQueryRequest newShardRequest(int numShards, ShardRouting shard, ValidateQueryRequest request) {
         final ProjectState projectState = getProjectState();
-        final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(
+        final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressionsIgnoringRemotes(
             projectState.metadata(),
             request.indices()
         );

server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java

@@ -128,7 +128,7 @@ protected boolean resolveIndex(ExplainRequest request) {
 
     @Override
     protected void resolveRequest(ProjectState state, InternalRequest request) {
-        final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(
+        final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressionsIgnoringRemotes(
             state.metadata(),
             request.request().index()
         );

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -1722,7 +1722,7 @@ private void executeSearch(
         } else {
             final Index[] indices = resolvedIndices.getConcreteLocalIndices();
             concreteLocalIndices = Arrays.stream(indices).map(Index::getName).toArray(String[]::new);
-            final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(
+            final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressionsIgnoringRemotes(
                 projectState.metadata(),
                 searchRequest.indices()
             );

server/src/main/java/org/elasticsearch/action/search/TransportSearchShardsAction.java

@@ -144,7 +144,7 @@ public void searchShards(Task task, SearchShardsRequest searchShardsRequest, Act
             ),
             listener.delegateFailureAndWrap((delegate, searchRequest) -> {
                 Index[] concreteIndices = resolvedIndices.getConcreteLocalIndices();
-                final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(
+                final Set<ResolvedExpression> indicesAndAliases = indexNameExpressionResolver.resolveExpressionsIgnoringRemotes(
                     project.metadata(),
                     searchRequest.indices()
                 );

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

@@ -235,6 +235,12 @@ public String[] concreteIndexNames(ProjectMetadata project, IndicesOptions optio
         Context context = new Context(
             project,
             options,
+            System.currentTimeMillis(),
+            false,
+            false,
+            false,
+            false,
+            false,
             getSystemIndexAccessLevel(),
             getSystemIndexAccessPredicate(),
             getNetNewSystemIndexPredicate()
@@ -299,10 +305,12 @@ public List<ResolvedExpression> dataStreams(ProjectMetadata project, IndicesOpti
         Context context = new Context(
             project,
             options,
+            System.currentTimeMillis(),
             false,
             false,
             true,
             true,
+            false,
             getSystemIndexAccessLevel(),
             getSystemIndexAccessPredicate(),
             getNetNewSystemIndexPredicate()
@@ -463,7 +471,7 @@ public static InvalidIndexNameException invalidExclusion() {
      * Validates the requested expression by performing the following checks:
      * - Ensure it's not empty
      * - Ensure it doesn't start with `_`
-     * - Ensure it's not a remote expression unless the allow unavailable targets is enabled.
+     * - Ensure it's not a remote expression unless remotes are allowed by the context.
      */
     private static void validateResourceExpression(Context context, boolean isExclusion, String current, String[] expressions) {
         if (Strings.isEmpty(current)) {
@@ -476,17 +484,14 @@ private static void validateResourceExpression(Context context, boolean isExclus
         if (current.charAt(0) == '_') {
             throw new InvalidIndexNameException(current, "must not start with '_'.");
         }
-        ensureRemoteExpressionRequireIgnoreUnavailable(context.getOptions(), current, expressions);
+        checkForRemoteIndexExpression(context, current, expressions);
     }
 
     /**
-     * Throws an exception if the expression is a remote expression and we do not allow unavailable targets
+     * Throws an exception if the expression is a remote expression and we do not allow it.
      */
-    private static void ensureRemoteExpressionRequireIgnoreUnavailable(IndicesOptions options, String current, String[] expressions) {
-        if (options.ignoreUnavailable()) {
-            return;
-        }
-        if (RemoteClusterAware.isRemoteIndexName(current)) {
+    private static void checkForRemoteIndexExpression(Context context, String current, String[] expressions) {
+        if (context.isAllowRemoteIndices() == false && RemoteClusterAware.isRemoteIndexName(current)) {
             List<String> crossClusterIndices = RemoteClusterAware.getRemoteIndexExpressions(expressions);
             throw new IllegalArgumentException(
                 "Cross-cluster calls are not supported in this context but remote indices were requested: " + crossClusterIndices
@@ -588,6 +593,7 @@ public Index[] concreteIndices(ProjectMetadata project, IndicesRequest request,
             false,
             request.includeDataStreams(),
             false,
+            false,
             getSystemIndexAccessLevel(),
             getSystemIndexAccessPredicate(),
             getNetNewSystemIndexPredicate()
@@ -1006,8 +1012,8 @@ public static void assertExpressionHasNullOrDataSelector(String expression) {
     /**
      * Resolve an array of expressions to the set of indices and aliases that these expressions match.
      */
-    public Set<ResolvedExpression> resolveExpressions(ProjectMetadata project, String... expressions) {
-        return resolveExpressions(project, IndicesOptions.lenientExpandOpen(), false, expressions);
+    public Set<ResolvedExpression> resolveExpressionsIgnoringRemotes(ProjectMetadata project, String... expressions) {
+        return resolveExpressions(project, IndicesOptions.lenientExpandOpen(), false, true, expressions);
     }
 
     /**
@@ -1019,15 +1025,18 @@ public Set<ResolvedExpression> resolveExpressions(
         ProjectMetadata project,
         IndicesOptions indicesOptions,
         boolean preserveDataStreams,
+        boolean allowRemoteIndices,
         String... expressions
     ) {
         Context context = new Context(
             project,
             indicesOptions,
+            System.currentTimeMillis(),
             true,
             false,
             true,
             preserveDataStreams,
+            allowRemoteIndices,
             getSystemIndexAccessLevel(),
             getSystemIndexAccessPredicate(),
             getNetNewSystemIndexPredicate()
@@ -1226,7 +1235,10 @@ public Map<String, Set<String>> resolveSearchRouting(ProjectMetadata project, @N
         Context context = new Context(
             project,
             IndicesOptions.lenientExpandOpen(),
+            System.currentTimeMillis(),
+            false,
             false,
+            true,
             false,
             true,
             getSystemIndexAccessLevel(),
@@ -1534,52 +1546,24 @@ public static class Context {
         private final boolean resolveToWriteIndex;
         private final boolean includeDataStreams;
         private final boolean preserveDataStreams;
+        private final boolean allowRemoteIndices;
         private final SystemIndexAccessLevel systemIndexAccessLevel;
         private final Predicate<String> systemIndexAccessPredicate;
         private final Predicate<String> netNewSystemIndexPredicate;
 
         Context(ProjectMetadata project, IndicesOptions options, SystemIndexAccessLevel systemIndexAccessLevel) {
-            this(project, options, systemIndexAccessLevel, Predicates.always(), Predicates.never());
-        }
-
-        Context(
-            ProjectMetadata project,
-            IndicesOptions options,
-            SystemIndexAccessLevel systemIndexAccessLevel,
-            Predicate<String> systemIndexAccessPredicate,
-            Predicate<String> netNewSystemIndexPredicate
-        ) {
-            this(
-                project,
-                options,
-                System.currentTimeMillis(),
-                systemIndexAccessLevel,
-                systemIndexAccessPredicate,
-                netNewSystemIndexPredicate
-            );
-        }
-
-        Context(
-            ProjectMetadata project,
-            IndicesOptions options,
-            boolean preserveAliases,
-            boolean resolveToWriteIndex,
-            boolean includeDataStreams,
-            SystemIndexAccessLevel systemIndexAccessLevel,
-            Predicate<String> systemIndexAccessPredicate,
-            Predicate<String> netNewSystemIndexPredicate
-        ) {
             this(
                 project,
                 options,
                 System.currentTimeMillis(),
-                preserveAliases,
-                resolveToWriteIndex,
-                includeDataStreams,
+                false,
+                false,
+                false,
+                false,
                 false,
                 systemIndexAccessLevel,
-                systemIndexAccessPredicate,
-                netNewSystemIndexPredicate
+                Predicates.always(),
+                Predicates.never()
             );
         }
 
@@ -1589,7 +1573,6 @@ public static class Context {
             boolean preserveAliases,
             boolean resolveToWriteIndex,
             boolean includeDataStreams,
-            boolean preserveDataStreams,
             SystemIndexAccessLevel systemIndexAccessLevel,
             Predicate<String> systemIndexAccessPredicate,
             Predicate<String> netNewSystemIndexPredicate
@@ -1601,27 +1584,6 @@ public static class Context {
                 preserveAliases,
                 resolveToWriteIndex,
                 includeDataStreams,
-                preserveDataStreams,
-                systemIndexAccessLevel,
-                systemIndexAccessPredicate,
-                netNewSystemIndexPredicate
-            );
-        }
-
-        Context(
-            ProjectMetadata project,
-            IndicesOptions options,
-            long startTime,
-            SystemIndexAccessLevel systemIndexAccessLevel,
-            Predicate<String> systemIndexAccessPredicate,
-            Predicate<String> netNewSystemIndexPredicate
-        ) {
-            this(
-                project,
-                options,
-                startTime,
-                false,
-                false,
                 false,
                 false,
                 systemIndexAccessLevel,
@@ -1638,6 +1600,7 @@ protected Context(
             boolean resolveToWriteIndex,
             boolean includeDataStreams,
             boolean preserveDataStreams,
+            boolean allowRemoteIndices,
             SystemIndexAccessLevel systemIndexAccessLevel,
             Predicate<String> systemIndexAccessPredicate,
             Predicate<String> netNewSystemIndexPredicate
@@ -1649,6 +1612,7 @@ protected Context(
             this.resolveToWriteIndex = resolveToWriteIndex;
             this.includeDataStreams = includeDataStreams;
             this.preserveDataStreams = preserveDataStreams;
+            this.allowRemoteIndices = allowRemoteIndices;
             this.systemIndexAccessLevel = systemIndexAccessLevel;
             this.systemIndexAccessPredicate = systemIndexAccessPredicate;
             this.netNewSystemIndexPredicate = netNewSystemIndexPredicate;
@@ -1691,6 +1655,10 @@ public boolean isPreserveDataStreams() {
             return preserveDataStreams;
         }
 
+        public boolean isAllowRemoteIndices() {
+            return allowRemoteIndices;
+        }
+
         /**
          * Used to determine system index access is allowed in this context (e.g. for this request).
          */

server/src/main/java/org/elasticsearch/search/SearchFeatures.java

@@ -35,6 +35,7 @@ public Set<NodeFeature> getFeatures() {
     public static final NodeFeature SEARCH_WITH_NO_DIMENSIONS_BUGFIX = new NodeFeature("search.vectors.no_dimensions_bugfix");
     public static final NodeFeature SEARCH_RESCORE_SCRIPT = new NodeFeature("search.rescore.script");
     public static final NodeFeature NEGATIVE_FUNCTION_SCORE_BAD_REQUEST = new NodeFeature("search.negative.function.score.bad.request");
+    public static final NodeFeature INDICES_BOOST_REMOTE_INDEX_FIX = new NodeFeature("search.indices_boost_remote_index_fix");
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
@@ -47,7 +48,8 @@ public Set<NodeFeature> getTestFeatures() {
             BBQ_HNSW_DEFAULT_INDEXING,
             SEARCH_WITH_NO_DIMENSIONS_BUGFIX,
             SEARCH_RESCORE_SCRIPT,
-            NEGATIVE_FUNCTION_SCORE_BAD_REQUEST
+            NEGATIVE_FUNCTION_SCORE_BAD_REQUEST,
+            INDICES_BOOST_REMOTE_INDEX_FIX
         );
     }
 }

server/src/test/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexTests.java

@@ -330,6 +330,7 @@ public void testResolveHiddenProperlyWithDateMath() {
             project,
             IndicesOptions.LENIENT_EXPAND_OPEN,
             true,
+            false,
             requestedIndex
         );
         assertThat(resolvedIndices.size(), is(1));