bug(): CORE-13939 - corellium-api getInstance() returned wrong project for instances

Author: Zac Bowhay

src/corellium.js

@@ -2,6 +2,7 @@
 
 const { fetch, fetchApi, CorelliumError } = require('./util/fetch')
 const Project = require('./project')
+const Instance = require('./instance')
 const Team = require('./team')
 const User = require('./user')
 const Role = require('./role')
@@ -487,7 +488,6 @@ class Corellium {
    * await corellium.getInstance({ id: 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' })
    */
   async getInstance (opts) {
-    let lastError
     let id, throwIfNotOn
     if (typeof opts === 'string') {
       id = opts
@@ -496,24 +496,19 @@ class Corellium {
       ({ id, throwIfNotOn = true } = opts)
     }
 
-    const projects = await this.projects()
-    for (const project of projects) {
-      try {
-        const instance = await project.getInstance(id)
-        if (throwIfNotOn && (instance.info.state !== 'on')) {
-          throw new Error('The instance is not turned on')
-        }
-        return instance
-      } catch (err) {
-        if (!(err instanceof CorelliumError)) {
-          throw err
-        } else {
-          lastError = err
-        }
+    try {
+      const info = await fetchApi(this, `/instances/${id}`)
+      const project = await this.getProject(info.project);
+      const instance = new Instance(project, info);
+
+      if (throwIfNotOn && (instance.info.state !== 'on')) {
+        throw new Error('The instance is not turned on')
       }
-    }
 
-    throw lastError || new Error(`Could not retrieve instance!  instanceId=${id}`)
+      return instance
+    } catch (err) {
+      throw err;
+    }
   }
 }
 

src/project.js

@@ -83,6 +83,9 @@ class Project {
    */
   async getInstance (id) {
     const info = await fetchApi(this, `/instances/${id}`)
+    if (info.project !== this.id) {
+      throw new Error('Instance does not belong to this project.');
+    }
     return new Instance(this, info)
   }