More

Author: n1v0lg

server/src/main/java/org/elasticsearch/CrossProjectResolvableRequest.java

@@ -10,14 +10,18 @@
 package org.elasticsearch;
 
 import org.elasticsearch.action.IndicesRequest;
+import org.elasticsearch.core.Nullable;
 
 import java.util.List;
 
 public interface CrossProjectResolvableRequest extends IndicesRequest {
     /**
      * Only called if cross-project rewriting was applied
      */
-    void rewritten(List<RewrittenExpression> rewrittenExpressions);
+    void setRewrittenExpressions(List<RewrittenExpression> rewrittenExpressions);
+
+    @Nullable
+    List<RewrittenExpression> getRewrittenExpressions();
 
     /**
      * Used to track a mapping from original expression (potentially flat) to canonical CCS expressions.

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java

@@ -382,12 +382,17 @@ public String getDescription() {
     }
 
     @Override
-    public void rewritten(List<RewrittenExpression> rewrittenExpressions) {
+    public void setRewrittenExpressions(List<RewrittenExpression> rewrittenExpressions) {
         this.rewrittenExpressions = rewrittenExpressions;
         indices(
             rewrittenExpressions.stream()
                 .flatMap(indexExpression -> indexExpression.canonicalExpressions().stream().map(CanonicalExpression::expression))
                 .toArray(String[]::new)
         );
     }
+
+    @Override
+    public List<RewrittenExpression> getRewrittenExpressions() {
+        return rewrittenExpressions;
+    }
 }

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

@@ -863,12 +863,17 @@ public String toString() {
     }
 
     @Override
-    public void rewritten(List<RewrittenExpression> rewrittenExpressions) {
+    public void setRewrittenExpressions(List<RewrittenExpression> rewrittenExpressions) {
         this.rewrittenExpressions = rewrittenExpressions;
         indices(
             rewrittenExpressions.stream()
                 .flatMap(indexExpression -> indexExpression.canonicalExpressions().stream().map(CanonicalExpression::expression))
                 .toArray(String[]::new)
         );
     }
+
+    @Override
+    public List<RewrittenExpression> getRewrittenExpressions() {
+        return rewrittenExpressions;
+    }
 }

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

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.core.security.authz;
 
+import org.elasticsearch.core.Nullable;
 import org.elasticsearch.xpack.core.security.SecurityContext;
 
 import java.util.List;
@@ -25,7 +26,11 @@ public ResolvedProjects resolve(SecurityContext securityContext) {
         }
     }
 
-    record ResolvedProjects(List<String> projects) {
-        public static ResolvedProjects VOID = new ResolvedProjects(List.of());
+    record ResolvedProjects(@Nullable String origin, List<String> projects) {
+        public static ResolvedProjects VOID = new ResolvedProjects(null, List.of());
+
+        public boolean isOriginOnly() {
+            return origin != null && projects.isEmpty();
+        }
     }
 }

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java

@@ -157,6 +157,11 @@ void maybeRewriteCrossProjectResolvableRequest(
             return;
         }
 
+        if (resolvedProjects.isOriginOnly()) {
+            logger.info("Cross-project search is only for the origin project [{}], skipping rewrite...", resolvedProjects.origin());
+            return;
+        }
+
         if (resolvedProjects.projects().isEmpty()) {
             throw new ResourceNotFoundException("no target projects for cross-project search request");
         }
@@ -184,7 +189,7 @@ void maybeRewriteCrossProjectResolvableRequest(
             }
         }
 
-        request.rewritten(rewrittenExpressions);
+        request.setRewrittenExpressions(rewrittenExpressions);
     }
 
     private List<CrossProjectResolvableRequest.CanonicalExpression> rewriteUnqualified(String indexExpression, List<String> projects) {