Skip to content

Remove IndexAbstractionResolver #92967

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

Closed
wants to merge 3 commits into from
Closed

Remove IndexAbstractionResolver #92967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be509e8
One invocation of IndexAbstractionResolver#resolveIndexAbstraction
albertzaharovits Jan 16, 2023
df83a2e
Spotless
albertzaharovits Jan 16, 2023
5516da7
Merge branch 'main' into uproot-4
albertzaharovits Jan 18, 2023
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ && isIndexVisible(
return finalIndices;
}

public static boolean isIndexVisible(
private static boolean isIndexVisible(
String expression,
String index,
IndicesOptions indicesOptions,
Expand Down
61 changes: 25 additions & 36 deletions ...urity/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.IndexAbstraction;
import org.elasticsearch.cluster.metadata.IndexAbstractionResolver;
Expand Down Expand Up @@ -205,47 +204,37 @@ ResolvedIndices resolveIndicesAndAliases(
getPutMappingIndexOrAlias((PutMappingRequest) indicesRequest, authorizedIndices::check, metadata)
);
} else if (indicesRequest instanceof final IndicesRequest.Replaceable replaceable) {
final IndicesOptions indicesOptions = indicesRequest.indicesOptions();

// check for all and return list of authorized indices
final String[] indices;
if (IndexNameExpressionResolver.isAllIndices(indicesList(indicesRequest.indices()))) {
if (indicesOptions.expandWildcardExpressions()) {
for (String authorizedIndex : authorizedIndices.all().get()) {
if (IndexAbstractionResolver.isIndexVisible(
"*",
authorizedIndex,
indicesOptions,
metadata,
nameExpressionResolver,
indicesRequest.includeDataStreams()
)) {
resolvedIndicesBuilder.addLocal(authorizedIndex);
}
}
}
// if we cannot replace wildcards the indices list stays empty. Same if there are no authorized indices.
// we honour allow_no_indices like es core does.
} else {
final ResolvedIndices split;
if (replaceable.allowsRemoteIndices()) {
split = remoteClusterResolver.splitLocalAndRemoteIndexNames(indicesRequest.indices());
if (indicesRequest.indicesOptions().expandWildcardExpressions()) {
indices = new String[] { "*" };
} else {
split = new ResolvedIndices(Arrays.asList(indicesRequest.indices()), Collections.emptyList());
// if we cannot replace wildcards the indices list stays empty. Same if there are no authorized indices.
// we honour allow_no_indices like es core does.
indices = new String[0];
}
List<String> replaced = indexAbstractionResolver.resolveIndexAbstractions(
split.getLocal(),
indicesOptions,
metadata,
authorizedIndices.all(),
authorizedIndices::check,
indicesRequest.includeDataStreams()
);
resolvedIndicesBuilder.addLocal(replaced);
resolvedIndicesBuilder.addRemote(split.getRemote());
} else {
indices = indicesRequest.indices();
}
final ResolvedIndices split;
if (replaceable.allowsRemoteIndices()) {
split = remoteClusterResolver.splitLocalAndRemoteIndexNames(indices);
} else {
split = new ResolvedIndices(Arrays.asList(indicesRequest.indices()), Collections.emptyList());
}
List<String> replaced = indexAbstractionResolver.resolveIndexAbstractions(
split.getLocal(),
indicesRequest.indicesOptions(),
metadata,
authorizedIndices.all(),
authorizedIndices::check,
indicesRequest.includeDataStreams()
);
resolvedIndicesBuilder.addLocal(replaced);
resolvedIndicesBuilder.addRemote(split.getRemote());

if (resolvedIndicesBuilder.isEmpty()) {
if (indicesOptions.allowNoIndices()) {
if (indicesRequest.indicesOptions().allowNoIndices()) {
// this is how we tell es core to return an empty response, we can let the request through being sure
// that the '-*' wildcard expression will be resolved to no indices. We can't let empty indices through
// as that would be resolved to _all by es core.
Expand Down