From 767286e2da8c94e46007e3327471b5a05d813bc8 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Mon, 30 Nov 2020 09:34:33 +0000
Subject: [PATCH] [ML] Fix spaces job ID check (#84404)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../ml/server/lib/ml_client/ml_client.ts      | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
index a75ba46a9b22a..8cfb066c9d092 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
@@ -39,15 +39,19 @@ export function getMlClient(
     const jobIds =
       jobType === 'anomaly-detector' ? getADJobIdsFromRequest(p) : getDFAJobIdsFromRequest(p);
     if (jobIds.length) {
-      const filteredJobIds = await jobSavedObjectService.filterJobIdsForSpace(jobType, jobIds);
-      let missingIds = jobIds.filter((j) => filteredJobIds.indexOf(j) === -1);
-      if (allowWildcards === true && missingIds.join().match('\\*') !== null) {
-        // filter out wildcard ids from the error
-        missingIds = missingIds.filter((id) => id.match('\\*') === null);
-      }
-      if (missingIds.length) {
-        throw new MLJobNotFound(`No known job with id '${missingIds.join(',')}'`);
-      }
+      await checkIds(jobType, jobIds, allowWildcards);
+    }
+  }
+
+  async function checkIds(jobType: JobType, jobIds: string[], allowWildcards: boolean = false) {
+    const filteredJobIds = await jobSavedObjectService.filterJobIdsForSpace(jobType, jobIds);
+    let missingIds = jobIds.filter((j) => filteredJobIds.indexOf(j) === -1);
+    if (allowWildcards === true && missingIds.join().match('\\*') !== null) {
+      // filter out wildcard ids from the error
+      missingIds = missingIds.filter((id) => id.match('\\*') === null);
+    }
+    if (missingIds.length) {
+      throw new MLJobNotFound(`No known job with id '${missingIds.join(',')}'`);
     }
   }
 
@@ -59,8 +63,17 @@ export function getMlClient(
     if (ids.length) {
       // find all groups from unfiltered jobs
       const responseGroupIds = [...new Set(allJobs.map((j) => j.groups ?? []).flat())];
-      // work out which ids requested are actually groups
-      const requestedGroupIds = ids.filter((id) => responseGroupIds.includes(id));
+
+      // work out which ids requested are actually groups and which are jobs
+      const requestedGroupIds: string[] = [];
+      const requestedJobIds: string[] = [];
+      ids.forEach((id) => {
+        if (responseGroupIds.includes(id)) {
+          requestedGroupIds.push(id);
+        } else {
+          requestedJobIds.push(id);
+        }
+      });
 
       // find all groups from filtered jobs
       const groupIdsFromFilteredJobs = [
@@ -77,10 +90,15 @@ export function getMlClient(
       );
 
       if (groupsIdsThatDidNotMatch.length) {
-        // is there are group ids which were requested but didn't
+        // if there are group ids which were requested but didn't
         // exist in filtered jobs, list them in an error
         throw new MLJobNotFound(`No known job with id '${groupsIdsThatDidNotMatch.join(',')}'`);
       }
+
+      // check the remaining jobs ids
+      if (requestedJobIds.length) {
+        await checkIds('anomaly-detector', requestedJobIds, true);
+      }
     }
   }