@corellium/corellium-cli 1.3.3 → 1.3.5

package/node_modules/@corellium/client-api/dist/model/WebPlayerSession.js

@@ -0,0 +1,142 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _ApiClient = _interopRequireDefault(require("../ApiClient"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /**
+                                                                                                                                                                                                                                                                                                                                                                                               * Corellium API
+                                                                                                                                                                                                                                                                                                                                                                                               * REST API to manage your virtual devices.
+                                                                                                                                                                                                                                                                                                                                                                                               *
+                                                                                                                                                                                                                                                                                                                                                                                               * The version of the OpenAPI document: 4.5.0-16775
+                                                                                                                                                                                                                                                                                                                                                                                               * 
+                                                                                                                                                                                                                                                                                                                                                                                               *
+                                                                                                                                                                                                                                                                                                                                                                                               * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+                                                                                                                                                                                                                                                                                                                                                                                               * https://openapi-generator.tech
+                                                                                                                                                                                                                                                                                                                                                                                               * Do not edit the class manually.
+                                                                                                                                                                                                                                                                                                                                                                                               *
+                                                                                                                                                                                                                                                                                                                                                                                               */
+/**
+ * The WebPlayerSession model module.
+ * @module model/WebPlayerSession
+ * @version 0.3.2
+ */
+var WebPlayerSession = /*#__PURE__*/function () {
+  /**
+   * Constructs a new <code>WebPlayerSession</code>.
+   * 
+   * @alias module:model/WebPlayerSession
+   * @param identifier {String} New Session Identifier
+   * @param token {String} Session Token
+   * @param expiration {Number} Expiration in ISO-8601 format e.g. 2022-05-06T02:39:23.000Z
+   */
+  function WebPlayerSession(identifier, token, expiration) {
+    _classCallCheck(this, WebPlayerSession);
+    WebPlayerSession.initialize(this, identifier, token, expiration);
+  }
+
+  /**
+   * Initializes the fields of this object.
+   * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+   * Only for internal use.
+   */
+  _createClass(WebPlayerSession, null, [{
+    key: "initialize",
+    value: function initialize(obj, identifier, token, expiration) {
+      obj['identifier'] = identifier;
+      obj['token'] = token;
+      obj['expiration'] = expiration;
+    }
+
+    /**
+     * Constructs a <code>WebPlayerSession</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/WebPlayerSession} obj Optional instance to populate.
+     * @return {module:model/WebPlayerSession} The populated <code>WebPlayerSession</code> instance.
+     */
+  }, {
+    key: "constructFromObject",
+    value: function constructFromObject(data, obj) {
+      if (data) {
+        obj = obj || new WebPlayerSession();
+        if (data.hasOwnProperty('identifier')) {
+          obj['identifier'] = _ApiClient["default"].convertToType(data['identifier'], 'String');
+        }
+        if (data.hasOwnProperty('token')) {
+          obj['token'] = _ApiClient["default"].convertToType(data['token'], 'String');
+        }
+        if (data.hasOwnProperty('expiration')) {
+          obj['expiration'] = _ApiClient["default"].convertToType(data['expiration'], 'Number');
+        }
+      }
+      return obj;
+    }
+
+    /**
+     * Validates the JSON data with respect to <code>WebPlayerSession</code>.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @return {boolean} to indicate whether the JSON data is valid with respect to <code>WebPlayerSession</code>.
+     */
+  }, {
+    key: "validateJSON",
+    value: function validateJSON(data) {
+      // check to make sure all required properties are present in the JSON string
+      var _iterator = _createForOfIteratorHelper(WebPlayerSession.RequiredProperties),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var property = _step.value;
+          if (!data[property]) {
+            throw new Error("The required field `" + property + "` is not found in the JSON data: " + JSON.stringify(data));
+          }
+        }
+        // ensure the json data is a string
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      if (data['identifier'] && !(typeof data['identifier'] === 'string' || data['identifier'] instanceof String)) {
+        throw new Error("Expected the field `identifier` to be a primitive type in the JSON string but got " + data['identifier']);
+      }
+      // ensure the json data is a string
+      if (data['token'] && !(typeof data['token'] === 'string' || data['token'] instanceof String)) {
+        throw new Error("Expected the field `token` to be a primitive type in the JSON string but got " + data['token']);
+      }
+      return true;
+    }
+  }]);
+  return WebPlayerSession;
+}();
+WebPlayerSession.RequiredProperties = ["identifier", "token", "expiration"];
+
+/**
+ * New Session Identifier
+ * @member {String} identifier
+ */
+WebPlayerSession.prototype['identifier'] = undefined;
+
+/**
+ * Session Token
+ * @member {String} token
+ */
+WebPlayerSession.prototype['token'] = undefined;
+
+/**
+ * Expiration in ISO-8601 format e.g. 2022-05-06T02:39:23.000Z
+ * @member {Number} expiration
+ */
+WebPlayerSession.prototype['expiration'] = undefined;
+var _default = WebPlayerSession;
+exports["default"] = _default;

package/node_modules/@corellium/client-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corellium/client-api",
-  "version": "0.1.0",
+  "version": "0.3.2",
   "description": "Corellium Client API",
   "license": "Apache-2.0",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corellium/corellium-cli",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Corellium CLI Tool",
   "scripts": {
     "corellium": "node index.js",
@@ -26,7 +26,7 @@
     "yargs"
   ],
   "dependencies": {
-    "@corellium/client-api": "^0.1.0",
+    "@corellium/client-api": "^0.3.0",
     "@corellium/corellium-api": "^1.7.7",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",

package/renovate.json

@@ -0,0 +1,96 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    ":dependencyDashboard",
+    ":dependencyDashboardApproval",
+    ":semanticPrefixFixDepsChoreOthers",
+    ":ignoreModulesAndTests",
+    "replacements:all",
+    "workarounds:all",
+    "npm:unpublishSafe",
+    "group:datadog-browser-sdkMonorepo"
+  ],
+  "enabledManagers": [
+    "npm"
+  ],
+  "prConcurrentLimit": 5,
+  "labels": [
+    "renovate"
+  ],
+  "osvVulnerabilityAlerts": true,
+  "semanticCommits": "enabled",
+  "packageRules": [
+    {
+      "description": "node.js & npm shouldn't be updated automatically, they require manual updates in many places",
+      "matchDepNames": [
+        "node",
+        "npm"
+      ],
+      "enabled": false
+    },
+    {
+      "description": "Ignored",
+      "matchDepNames": [
+        "ts-node",
+        "@types/node",
+        "typescript"
+      ],
+      "matchPackagePatterns": [
+        "^@swc",
+        "^@typescript",
+        "^@commitlint"
+      ],
+      "enabled": false
+    },
+    {
+      "description": "Internal corellium packages major versions, immediately created, requires manual review/approve",
+      "groupName": "corellium-internal",
+      "dependencyDashboardApproval": false,
+      "addLabels": [
+        "corellium-internal-major"
+      ],
+      "matchPackagePatterns": [
+        "^@corellium"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ]
+    },
+    {
+      "description": "Internal corellium packages, minor/patch versions, immediately created, automatically merged",
+      "groupName": "corellium-internal",
+      "dependencyDashboardApproval": false,
+      "addLabels": [
+        "corellium-internal"
+      ],
+      "matchPackagePatterns": [
+        "^@corellium"
+      ],
+      "automerge": true,
+      "autoApprove": true,
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
+    },
+    {
+      "matchPackageNames": ["sinon"],
+      "allowedVersions": "<17.0.0"
+    },
+    {
+      "description": "higher versions drop node 16 support",
+      "matchPackageNames": ["husky", "eslint"],
+      "allowedVersions": "<9.0.0"
+    },
+    {
+      "description": "higher versions drop node 16 support",
+      "matchPackageNames": ["node-fetch"],
+      "allowedVersions": "<3.0.0"
+    },
+    {
+      "description": "higher versions drop node 16 support",
+      "matchPackageNames": ["file-type"],
+      "allowedVersions": "<19.0.0"
+    }
+  ]
+}

package/src/commands/instances/get.js

@@ -1,4 +1,5 @@
 const { handleError } = require('../../error')
+const { displayTable } = require('../../table')
 const { getApi } = require('../../utils')
 
 async function builder (yargs) {
@@ -9,6 +10,13 @@ async function builder (yargs) {
       demandOption: true,
       describe: 'virtual device id'
     })
+    .option('format', {
+      type: 'input',
+      describe: 'Output format (default is json) e.g. table',
+      string: true,
+      choices: ['table', 'json', 'csv'],
+      default: 'json'
+    })
     .option('verbose', {
       alias: 'v',
       type: 'boolean',
@@ -24,13 +32,9 @@ async function handler (argv) {
     if (!instance) {
       throw new Error(`Instance ${argv.instance} not found`)
     }
-    console.log(JSON.stringify({
-      id: instance.id,
-      flavor: instance.flavor,
-      type: instance.type,
-      state: instance.state,
-      os: instance.os
-    }))
+    await displayTable(argv.format, argv.format === 'json' ? instance : [instance], [
+      'id', 'flavor', 'type', 'state', 'os'
+    ], [{ column: 3, width: 5 }, { column: 2, width: 4 }, { column: 1, width: 6 }])
   } catch (err) {
     handleError(err, 'Get instance failed', argv.verbose)
   }

package/src/commands/instances/list.js

@@ -14,7 +14,8 @@ async function builder (yargs) {
     type: 'input',
     describe: 'Output format (default is json) e.g. table',
     string: true,
-    choices: ['table', 'json', 'csv']
+    choices: ['table', 'json', 'csv'],
+    default: 'json'
   })
 }
 

package/src/commands/login.js

@@ -61,19 +61,21 @@ async function handler (argv) {
     })).password
   }
 
+  const sanitizedEndpoint = endpoint.slice(-1) === '/' ? endpoint.slice(0, -1) : endpoint
+
   // We need a special agent just for login because we can't assume profile has been written yet
-  const CACert = await getCACert({ endpoint })
+  const CACert = await getCACert({ endpoint: sanitizedEndpoint })
   axios.defaults.httpsAgent = new https.Agent({ ca: CACert })
 
   try {
     let data
 
     if (apitoken) {
-      data = (await axios.post(`${endpoint}/api/v1/tokens`, { apiToken: apitoken })).data
+      data = (await axios.post(`${sanitizedEndpoint}/api/v1/tokens`, { apiToken: apitoken })).data
     } else {
-      data = (await axios.post(`${endpoint}/api/v1/tokens`, { username, password })).data
+      data = (await axios.post(`${sanitizedEndpoint}/api/v1/tokens`, { username, password })).data
     }
-    await updateProfile({ token: data.token, expiration: data.expiration, endpoint })
+    await updateProfile({ token: data.token, expiration: data.expiration, endpoint: sanitizedEndpoint })
     console.log(
       chalk.green(`Login successful, profile saved to ${profilePath}`)
     )

package/src/commands/mast/constants.js

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

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

@@ -1,6 +1,6 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * Create an assessment via corellium-mast API.
@@ -42,8 +42,7 @@ async function handler (argv) {
   const client = new Client(argv)
   try {
     const body = { instanceId: instance, bundleId: bundle, wordlistId: wordlist }
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    const res = await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments`, body)
+    const res = await client._fetch('POST', `${MAST_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 log = require('../../logging')
-const { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * Delete an assessment via corellium-mast API.
@@ -35,8 +35,7 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    await client._fetch('DELETE', `${API_BASE_PATH}/${instance}/assessments/${assessment}`)
+    await client._fetch('DELETE', `${MAST_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,7 @@
 const Client = require('../../clients/Client')
 const { handleError } = require('../../error')
-const { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
+const { inspect } = require('node:util')
 
 /**
  * Download assessment report via corellium-mast API.
@@ -43,9 +44,8 @@ async function handler (argv) {
   const { assessment, instance, format, verbose } = argv
   const client = new Client(argv)
   try {
-    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)
+    const res = await client._fetch('GET', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/download?format=${format}`)
+    console.log(format === 'json' ? inspect(res, false, null) : res) // print deep json
   } 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 { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * Get an assessment via corellium-mast API.
@@ -36,8 +36,7 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    const res = await client._fetch('GET', `${API_BASE_PATH}/${instance}/assessments/${assessment}`)
+    const res = await client._fetch('GET', `${MAST_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 { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * Get assessments for an instance via corellium-mast API.
@@ -29,8 +29,7 @@ async function handler (argv) {
   const { instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    const res = await client._fetch('GET', `${API_BASE_PATH}/${instance}/instances/${instance}/assessments`)
+    const res = await client._fetch('GET', `${MAST_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 log = require('../../logging')
-const { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * The start-monitor command starts device monitoring via the start-monitor API on corellium-mast
@@ -37,8 +37,7 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/start`)
+    await client._fetch('POST', `${MAST_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 log = require('../../logging')
-const { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * The stop-monitor command stops device monitoring via the stop-monitor API on corellium-mast.
@@ -37,8 +37,7 @@ async function handler (argv) {
   const { assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/stop`)
+    await client._fetch('POST', `${MAST_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 { getMastApiBasePath } = require('./api-base-path')
+const { MAST_API_BASE_PATH } = require('./constants')
 
 /**
  * The test command executes device testing via the test API on corellium-mast.
@@ -47,8 +47,7 @@ async function handler (argv) {
   const { grep, invert, assessment, instance, verbose } = argv
   const client = new Client(argv)
   try {
-    const API_BASE_PATH = await getMastApiBasePath(client, instance)
-    const res = await client._fetch('POST', `${API_BASE_PATH}/${instance}/assessments/${assessment}/test`, { grep, invert })
+    const res = await client._fetch('POST', `${MAST_API_BASE_PATH}/${instance}/assessments/${assessment}/test`, { grep, invert })
     console.log(JSON.stringify(res))
   } catch (error) {
     handleError(error, 'test failed', verbose)

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

@@ -1,21 +0,0 @@
-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 }