@corellium/corellium-cli 1.2.5 → 1.2.7

package/coverage/cobertura-coverage.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="0" lines-covered="0" line-rate="NaN" branches-valid="0" branches-covered="0" branch-rate="NaN" timestamp="1715703576196" complexity="0" version="0.1">
+<coverage lines-valid="0" lines-covered="0" line-rate="NaN" branches-valid="0" branches-covered="0" branch-rate="NaN" timestamp="1715716510523" complexity="0" version="0.1">
   <sources>
     <source>/builds/middleware/corellium-cli</source>
   </sources>

package/coverage/lcov-report/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-05-14T16:19:36.203Z
+                at 2024-05-14T19:55:10.530Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corellium/corellium-cli",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Corellium CLI Tool",
   "scripts": {
     "corellium": "node index.js",

package/src/commands/mast/api-base-path.js

@@ -0,0 +1,21 @@
+const { MAST_API_BASE_PATH, MAST_API_BASE_PATH_LEGACY } = require('./constants')
+
+/**
+ * Temporarily support backwards compatibility with mast/matrix routes.
+ * Until all environments are listening on /matrix at the conclusion of release 6.4.0, we need to handle
+ * the possibility that some environments will listen to MAST on /mast or /matrix
+ *
+ * This temporary code can be removed in release 6.5.0 - CORE-7670
+ */
+async function getMastApiBasePath (client, instance) {
+  try {
+    await client._fetch('GET', `${MAST_API_BASE_PATH}/${instance}/instances/${instance}/assessments`)
+    return MAST_API_BASE_PATH
+  } catch (_) {
+    // no-op, we want to fall back to legacy route.
+  }
+
+  return MAST_API_BASE_PATH_LEGACY
+}
+
+module.exports = { getMastApiBasePath }

package/src/commands/mast/constants.js

@@ -1,3 +1,4 @@
 module.exports = {
-  MAST_API_BASE_PATH: 'v1/services/mast'
+  MAST_API_BASE_PATH: 'v1/services/matrix',
+  MAST_API_BASE_PATH_LEGACY: 'v1/services/mast' // CORE-7670
 }

package/src/commands/mast/create-assessment.js

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * Create an assessment via corellium-mast API.
@@ -42,7 +42,8 @@ async function handler (argv) {
   const client = new Client(argv)
   try {
     const body = { instanceId: instance, bundleId: bundle, wordlistId: wordlist }
-    const res = await client._fetch('POST', `${MAST_API_BASE_PATH}/${instance}/assessments`, body)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    const res = await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments`, body)
     console.log(JSON.stringify(res))
   } catch (error) {
     handleError(error, 'create-assessment failed', verbose)

package/src/commands/mast/delete-assessment.js

@@ -1,7 +1,7 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
 const log = require('../../logging')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * Delete an assessment via corellium-mast API.
@@ -35,7 +35,8 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    await client._fetch('DELETE', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    await client._fetch('DELETE', `${API_BASE_PATH}/${instance}/assessments/${assessment}`)
     log.info('Assessment deleted.')
   } catch (error) {
     handleError(error, 'delete-assessment failed', verbose)

package/src/commands/mast/download-report.js

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * Download assessment report via corellium-mast API.
@@ -43,7 +43,8 @@ async function handler (argv) {
   const { assessment, instance, format, verbose } = argv
   const client = new Client(argv)
   try {
-    const res = await client._fetch('GET', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/download?format=${format}`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    const res = await client._fetch('GET', `${API_BASE_PATH}/${instance}/assessments/${assessment}/download?format=${format}`)
     console.log(res)
   } catch (error) {
     handleError(error, 'download-report failed', verbose)

package/src/commands/mast/get-assessment.js

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * Get an assessment via corellium-mast API.
@@ -36,7 +36,8 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const res = await client._fetch('GET', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    const res = await client._fetch('GET', `${API_BASE_PATH}/${instance}/assessments/${assessment}`)
     console.log(JSON.stringify(res))
   } catch (error) {
     handleError(error, 'get-assessment failed', verbose)

package/src/commands/mast/get-assessments.js

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * Get assessments for an instance via corellium-mast API.
@@ -29,7 +29,8 @@ async function handler (argv) {
   const { instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const res = await client._fetch('GET', `${MAST_API_BASE_PATH}/${instance}/instances/${instance}/assessments`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    const res = await client._fetch('GET', `${API_BASE_PATH}/${instance}/instances/${instance}/assessments`)
     console.log(JSON.stringify(res))
   } catch (error) {
     handleError(error, 'get-assessments failed', verbose)

package/src/commands/mast/start-monitor.js

@@ -1,7 +1,7 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
 const log = require('../../logging')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * The start-monitor command starts device monitoring via the start-monitor API on corellium-mast
@@ -37,7 +37,8 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    await client._fetch('POST', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/start`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/start`)
     log.info('Monitoring started.')
   } catch (error) {
     handleError(error, 'start-monitor failed', verbose)

package/src/commands/mast/stop-monitor.js

@@ -1,7 +1,7 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
 const log = require('../../logging')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * The stop-monitor command stops device monitoring via the stop-monitor API on corellium-mast.
@@ -37,7 +37,8 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    await client._fetch('POST', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/stop`)
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/stop`)
     log.info('Monitoring stopped.')
   } catch (error) {
     handleError(error, 'stop-monitor failed', verbose)

package/src/commands/mast/test.js

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { MAST_API_BASE_PATH } = require('./constants')
+const { getMastApiBasePath } = require('./api-base-path')
 
 /**
  * The test command executes device testing via the test API on corellium-mast.
@@ -47,7 +47,8 @@ async function handler (argv) {
   const { grep, invert, assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const res = await client._fetch('POST', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/test`, { grep, invert })
+    const API_BASE_PATH = await getMastApiBasePath(client, instance)
+    const res = await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/test`, { grep, invert })
     console.log(JSON.stringify(res))
   } catch (error) {
     handleError(error, 'test failed', verbose)