Allow storing scripts in multiple projects

This commit makes the `ScriptService`, the `ScriptCache`, and the stored
script APIs project-aware. By adding the project ID to the cache key in
the `ScriptCache`, we avoid data leakage between projects. The method
`ScriptService#compile` has a lot of usages, so we introduce a temporary
method that hard-codes the default project ID. Follow-up PRs will update
the remaining usages to pass the correct project ID.

Author: nielsbauman

modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PredicateTokenScriptFilterTests.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.client.internal.support.AbstractClient;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -66,7 +67,7 @@ public boolean execute(Token token) {
         ScriptService scriptService = new ScriptService(indexSettings, Collections.emptyMap(), Collections.emptyMap(), () -> 1L) {
             @Override
             @SuppressWarnings("unchecked")
-            public <FactoryType> FactoryType compile(Script script, ScriptContext<FactoryType> context) {
+            public <FactoryType> FactoryType compile(ProjectId projectId, Script script, ScriptContext<FactoryType> context) {
                 assertEquals(context, AnalysisPredicateScript.CONTEXT);
                 assertEquals(new Script("my_script"), script);
                 return (FactoryType) factory;

modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterTests.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.client.internal.support.AbstractClient;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -66,7 +67,7 @@ public boolean execute(Token token) {
         @SuppressWarnings("unchecked")
         ScriptService scriptService = new ScriptService(indexSettings, Collections.emptyMap(), Collections.emptyMap(), () -> 1L) {
             @Override
-            public <FactoryType> FactoryType compile(Script script, ScriptContext<FactoryType> context) {
+            public <FactoryType> FactoryType compile(ProjectId projectId, Script script, ScriptContext<FactoryType> context) {
                 assertEquals(context, AnalysisPredicateScript.CONTEXT);
                 assertEquals(new Script("token.getPosition() > 1"), script);
                 return (FactoryType) factory;

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportMultiSearchTemplateAction.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.features.FeatureService;
@@ -47,6 +48,7 @@ public class TransportMultiSearchTemplateAction extends HandledTransportAction<M
     private final Predicate<NodeFeature> clusterSupportsFeature;
     private final NodeClient client;
     private final SearchUsageHolder searchUsageHolder;
+    private final ProjectResolver projectResolver;
 
     @Inject
     public TransportMultiSearchTemplateAction(
@@ -57,7 +59,8 @@ public TransportMultiSearchTemplateAction(
         NodeClient client,
         UsageService usageService,
         ClusterService clusterService,
-        FeatureService featureService
+        FeatureService featureService,
+        ProjectResolver projectResolver
     ) {
         super(
             MustachePlugin.MULTI_SEARCH_TEMPLATE_ACTION.name(),
@@ -68,6 +71,7 @@ public TransportMultiSearchTemplateAction(
         );
         this.scriptService = scriptService;
         this.xContentRegistry = xContentRegistry;
+        this.projectResolver = projectResolver;
         this.clusterSupportsFeature = f -> {
             ClusterState state = clusterService.state();
             return state.clusterRecovered() && featureService.clusterHasFeature(state, f);
@@ -92,6 +96,7 @@ protected void doExecute(Task task, MultiSearchTemplateRequest request, ActionLi
             SearchRequest searchRequest;
             try {
                 searchRequest = convert(
+                    projectResolver.getProjectId(),
                     searchTemplateRequest,
                     searchTemplateResponse,
                     scriptService,

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java

@@ -15,6 +15,8 @@
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -52,6 +54,7 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search
     private final Predicate<NodeFeature> clusterSupportsFeature;
     private final NodeClient client;
     private final SearchUsageHolder searchUsageHolder;
+    private final ProjectResolver projectResolver;
 
     @Inject
     public TransportSearchTemplateAction(
@@ -62,7 +65,8 @@ public TransportSearchTemplateAction(
         NodeClient client,
         UsageService usageService,
         ClusterService clusterService,
-        FeatureService featureService
+        FeatureService featureService,
+        ProjectResolver projectResolver
     ) {
         super(
             MustachePlugin.SEARCH_TEMPLATE_ACTION.name(),
@@ -73,6 +77,7 @@ public TransportSearchTemplateAction(
         );
         this.scriptService = scriptService;
         this.xContentRegistry = xContentRegistry;
+        this.projectResolver = projectResolver;
         this.clusterSupportsFeature = f -> {
             ClusterState state = clusterService.state();
             return state.clusterRecovered() && featureService.clusterHasFeature(state, f);
@@ -87,6 +92,7 @@ protected void doExecute(Task task, SearchTemplateRequest request, ActionListene
         boolean success = false;
         try {
             SearchRequest searchRequest = convert(
+                projectResolver.getProjectId(),
                 request,
                 response,
                 scriptService,
@@ -118,6 +124,7 @@ protected void doExecute(Task task, SearchTemplateRequest request, ActionListene
     }
 
     static SearchRequest convert(
+        ProjectId projectId,
         SearchTemplateRequest searchTemplateRequest,
         SearchTemplateResponse response,
         ScriptService scriptService,
@@ -131,7 +138,7 @@ static SearchRequest convert(
             searchTemplateRequest.getScript(),
             searchTemplateRequest.getScriptParams() == null ? Collections.emptyMap() : searchTemplateRequest.getScriptParams()
         );
-        TemplateScript compiledScript = scriptService.compile(script, TemplateScript.CONTEXT).newInstance(script.getParams());
+        TemplateScript compiledScript = scriptService.compile(projectId, script, TemplateScript.CONTEXT).newInstance(script.getParams());
         String source = compiledScript.execute();
         response.setSource(new BytesArray(source));
 

server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java

@@ -58,7 +58,7 @@ protected void masterOperation(
         ClusterState state,
         ActionListener<AcknowledgedResponse> listener
     ) throws Exception {
-        ScriptService.deleteStoredScript(clusterService, request, listener);
+        ScriptService.deleteStoredScript(clusterService, projectResolver.getProjectId(), request, listener);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java

@@ -11,8 +11,8 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
-import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadProjectAction;
+import org.elasticsearch.cluster.ProjectState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.project.ProjectResolver;
@@ -24,9 +24,7 @@
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
-public class TransportGetStoredScriptAction extends TransportMasterNodeReadAction<GetStoredScriptRequest, GetStoredScriptResponse> {
-
-    private final ProjectResolver projectResolver;
+public class TransportGetStoredScriptAction extends TransportMasterNodeReadProjectAction<GetStoredScriptRequest, GetStoredScriptResponse> {
 
     @Inject
     public TransportGetStoredScriptAction(
@@ -43,25 +41,25 @@ public TransportGetStoredScriptAction(
             threadPool,
             actionFilters,
             GetStoredScriptRequest::new,
+            projectResolver,
             GetStoredScriptResponse::new,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
-        this.projectResolver = projectResolver;
     }
 
     @Override
     protected void masterOperation(
         Task task,
         GetStoredScriptRequest request,
-        ClusterState state,
+        ProjectState state,
         ActionListener<GetStoredScriptResponse> listener
     ) throws Exception {
-        listener.onResponse(new GetStoredScriptResponse(request.id(), ScriptService.getStoredScript(state, request)));
+        listener.onResponse(new GetStoredScriptResponse(request.id(), ScriptService.getStoredScript(state.metadata(), request)));
     }
 
     @Override
-    protected ClusterBlockException checkBlock(GetStoredScriptRequest request, ClusterState state) {
-        return state.blocks().globalBlockedException(projectResolver.getProjectId(), ClusterBlockLevel.METADATA_READ);
+    protected ClusterBlockException checkBlock(GetStoredScriptRequest request, ProjectState state) {
+        return state.blocks().globalBlockedException(state.projectId(), ClusterBlockLevel.METADATA_READ);
     }
 
 }

server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java

@@ -61,7 +61,7 @@ protected void masterOperation(
         ClusterState state,
         ActionListener<AcknowledgedResponse> listener
     ) throws Exception {
-        scriptService.putStoredScript(clusterService, request, listener);
+        scriptService.putStoredScript(clusterService, projectResolver.getProjectId(), request, listener);
     }
 
     @Override

server/src/main/java/org/elasticsearch/script/ScriptCache.java

@@ -11,6 +11,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.breaker.CircuitBreakingException;
 import org.elasticsearch.common.cache.Cache;
@@ -78,13 +79,14 @@ public class ScriptCache {
     <FactoryType> FactoryType compile(
         ScriptContext<FactoryType> context,
         ScriptEngine scriptEngine,
+        ProjectId projectId,
         String id,
         String idOrCode,
         ScriptType type,
         Map<String, String> options
     ) {
         String lang = scriptEngine.getType();
-        CacheKey cacheKey = new CacheKey(lang, idOrCode, context.name, options);
+        CacheKey cacheKey = new CacheKey(lang, projectId, idOrCode, context.name, options);
 
         // Relying on computeIfAbsent to avoid multiple threads from compiling the same script
         try {
@@ -204,12 +206,14 @@ public void onRemoval(RemovalNotification<CacheKey, Object> notification) {
 
     private static final class CacheKey {
         final String lang;
+        final ProjectId projectId;
         final String idOrCode;
         final String context;
         final Map<String, String> options;
 
-        private CacheKey(String lang, String idOrCode, String context, Map<String, String> options) {
+        private CacheKey(String lang, ProjectId projectId, String idOrCode, String context, Map<String, String> options) {
             this.lang = lang;
+            this.projectId = projectId;
             this.idOrCode = idOrCode;
             this.context = context;
             this.options = options;