Skip to content

[ML] Disable CrossProject for Datafeeds #136897

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
prwhelan merged 4 commits into from
Oct 29, 2025
Merged

[ML] Disable CrossProject for Datafeeds #136897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15d800c
[ML] Disable CrossProject for Datafeeds
prwhelan Oct 14, 2025
c15cd1b
Removing the more generic exception since no other implementation nee…
prwhelan Oct 27, 2025
6f7a2bd
Merge branch 'main' into ES-12911
prwhelan Oct 27, 2025
6d7fc6a
Merge branch 'main' into ES-12911
prwhelan Oct 29, 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
6 changes: 6 additions & 0 deletions ...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.IndicesOptions;
Expand All @@ -21,6 +22,7 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.core.Tuple;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregatorFactories;
import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
Expand Down Expand Up @@ -1050,6 +1052,10 @@ public DatafeedConfig build() {
if (indicesOptions == null) {
indicesOptions = IndicesOptions.STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED;
}
if (indicesOptions.resolveCrossProjectIndexExpression()) {
throw new ElasticsearchStatusException("Cross-project search is not enabled for Datafeeds", RestStatus.FORBIDDEN);
}

return new DatafeedConfig(
id,
jobId,
Expand Down
16 changes: 16 additions & 0 deletions ...re/src/test/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfigBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
*/
package org.elasticsearch.xpack.core.ml.datafeed;

import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.elasticsearch.search.aggregations.AggregationBuilders;
Expand All @@ -30,6 +32,7 @@

import static org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests.randomStringList;
import static org.elasticsearch.xpack.core.ml.utils.QueryProviderTests.createTestQueryProvider;
import static org.hamcrest.Matchers.equalTo;

public class DatafeedConfigBuilderTests extends AbstractWireSerializingTestCase<DatafeedConfig.Builder> {

Expand Down Expand Up @@ -147,4 +150,17 @@ protected Writeable.Reader<DatafeedConfig.Builder> instanceReader() {
return DatafeedConfig.Builder::new;
}

public void testResolveCrossProjectIsDisabled() {
var datafeedBuilder = createRandomizedDatafeedConfigBuilder("jobId", "datafeed-id", 3600000);
datafeedBuilder = datafeedBuilder.setIndicesOptions(
IndicesOptions.builder(datafeedBuilder.getIndicesOptions())
.crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
.build()
);

var actualException = assertThrows(ElasticsearchStatusException.class, datafeedBuilder::build);
assertThat(actualException.getMessage(), equalTo("Cross-project search is not enabled for Datafeeds"));
assertThat(actualException.status(), equalTo(RestStatus.FORBIDDEN));
}

}