@contrast/contrast 2.0.2-beta.3 → 2.0.2-beta.5

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@contrast/contrast",
-  "version": "2.0.2-beta.3",
+  "version": "2.0.2-beta.5",
   "description": "Contrast Security's command line tool",
-  "main": "dist/index.js",
+  "exports": "./dist/index.js",
+  "type": "module",
+  "author": "Jamie Mcgurk <jamie.mcgurk@contrastsecurity.com>",
   "bin": {
-    "contrast": "./bin/contrast.js"
+    "contrast": "./dist/index.js"
   },
-  "author": "Jamie Mcgurk <jamie.mcgurk@contrastsecurity.com>",
   "contributors": [
     {
       "name": "Chris Dunne",
@@ -24,22 +25,22 @@
   "license": "ISC",
   "scripts": {
     "build": "tsc",
-    "test": "jest --testPathIgnorePatterns=./test-integration/",
-    "test-int": "jest ./test-integration/",
-    "test-int-scan": "jest ./test-integration/scan",
-    "test-int-audit": "jest test-integration/audit",
-    "test-int-audit-reports": "jest test-integration/audit/audit-language-reports-old-services.spec.js",
-    "test-int-scan-errors": "jest test-integration/scan/scanLocalErrors.spec.js",
-    "test-int-scan-reports": "jest test-integration/scan/scanReport.spec.js",
-    "test-int-audit-features": "jest test-integration/audit/auditFeatures/",
-    "test-int-audit-projects": "jest test-integration/audit/audit-projects.spec.js",
+    "build-binary": "esbuild src/index.ts --bundle --outdir=dist-binary --platform=node",
+    "package-binary": "pkg dist-binary/index.js --out-path binaries --targets node16-macos,node16-linux,node16-win",
+    "test": "export VITEST_MAX_THREADS=4 && export VITEST_MIN_THREADS=1 && vitest ./test/",
+    "test-int": "vitest ./test-integration/ --no-threads",
+    "test-int-scan": "vitest ./test-integration/scan --no-threads",
+    "test-int-audit": "vitest ./test-integration/audit --no-threads",
+    "test-int-scan-errors": "vitest ./test-integration/scan/scanLocalErrors.spec.js --no-threads",
+    "test-int-scan-reports": "vitest ./test-integration/scan/scanReport.spec.js --no-threads",
+    "test-int-audit-features": "vitest ./test-integration/audit/auditFeatures/ --no-threads",
+    "test-int-audit-projects": "vitest ./test-integration/audit/audit-projects.spec.js --no-threads",
     "format": "prettier --write \"**/*.{ts,tsx,js,json,md,yml}\" .eslintrc.*",
-    "check-format": "prettier --check \"**/*.{ts,tsx,js,json,md,yml}\" .eslintrc.*",
-    "coverage-local": "nyc --reporter=text mocha './test/**/*.spec.js'",
+    "check-format": "prettier --check \"**/*.{ts,tsx,js,json,md,yml,mjs,cjs}\" .eslintrc.*",
+    "coverage-local": "c8 --reporter=text mocha './test/**/*.spec.js'",
     "coverage": "yarn test --coverage",
     "lint": "eslint --config .eslintrc.json . --ext .ts",
     "extract-licenses": "node scripts/extract-licenses",
-    "test-jest": "jest",
     "lambda-dev": "npx ts-node src/index.ts lambda",
     "dev": "npx ts-node src/index.ts"
   },
@@ -53,11 +54,11 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "bluebird": "^3.7.2",
     "boxen": "5.1.2",
-    "chalk": "4.1.2",
+    "chalk": "5.2.0",
     "cli-table3": "^0.6.2",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
-    "conf": "^10.1.2",
+    "conf": "^11.0.1",
     "cross-spawn": "^7.0.3",
     "dotenv": "^16.0.0",
     "fast-glob": "^3.2.11",
@@ -67,12 +68,13 @@
     "hpagent": "^1.2.0",
     "i18n": "^0.15.1",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "log-symbols": "^4.1.0",
     "open": "^8.4.0",
-    "ora": "5.4.1",
+    "ora": "6.3.0",
     "prettyjson": "^1.2.5",
     "request": "^2.88.2",
+    "request-promise-native": "^1.0.9",
     "semver": "^7.3.7",
     "string-builder": "^0.1.8",
     "string-multiple-replace": "^1.0.5",
@@ -81,33 +83,32 @@
     "yarn-lockfile": "^1.1.1"
   },
   "devDependencies": {
-    "@tsconfig/node16": "^1.0.2",
+    "@babel/core": "^7.21.8",
+    "@babel/preset-modules": "^0.1.5",
     "@types/command-line-args": "^5.2.0",
     "@types/command-line-usage": "^5.0.2",
     "@types/i18n": "^0.13.2",
-    "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.182",
-    "@types/node": "*",
+    "@types/lodash-es": "^4.17.7",
+    "@types/node": "^18.14.2",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
+    "@vitest/coverage-c8": "^0.31.0",
     "csv-writer": "^1.6.0",
+    "esbuild": "^0.17.18",
     "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^3.1.0",
-    "jest": "^27.5.1",
-    "jest-junit": "^16.0.0",
     "mocha": "^10.2.0",
-    "nock": "^13.3.0",
+    "nock": "^13.3.1",
     "npm-license-crawler": "^0.2.1",
-    "nyc": "^15.1.0",
     "pkg": "^5.6.0",
     "prettier": "^2.7.1",
     "tmp": "^0.2.1",
-    "ts-jest": "^27.1.4",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.3",
-    "uuid": "^9.0.0"
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.3",
+    "uuid": "^9.0.0",
+    "vitest": "^0.31.0"
   },
   "resolutions": {
     "faker": "5.5.3",
@@ -133,15 +134,5 @@
         }
       }
     ]
-  },
-  "pkg": {
-    "scripts": [
-      "dist/**/*.js",
-      "bin/contrast"
-    ],
-    "assets": [
-      "dist"
-    ],
-    "outputPath": "binaries"
   }
 }

package/.prettierignore

@@ -1 +0,0 @@
-dist/**

package/bin/contrast.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-require('../dist/index.js')

package/dist/audit/languageAnalysisEngine/util/requestUtils.js

@@ -1,14 +0,0 @@
-"use strict";
-const request = require('request');
-const Promise = require('bluebird');
-Promise.promisifyAll(request);
-function sendRequest({ options, method = 'put' }) {
-    return request[`${method}Async`](options.url, options);
-}
-const sleep = ms => {
-    return new Promise(resolve => setTimeout(resolve, ms));
-};
-module.exports = {
-    sendRequest: sendRequest,
-    sleep: sleep
-};

package/dist/lambda/__mocks__/aws.js

@@ -1,21 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLambdaPolicies = exports.getLayersLinks = exports.getLambdaFunctionConfiguration = exports.getLambdaClient = void 0;
-const lambdaConfig_json_1 = __importDefault(require("./lambdaConfig.json"));
-const getLambdaClient = (lambdaOptions) => {
-    return {};
-};
-exports.getLambdaClient = getLambdaClient;
-const getLambdaFunctionConfiguration = async (client, lambdaOptions) => {
-    return Promise.resolve(lambdaConfig_json_1.default);
-};
-exports.getLambdaFunctionConfiguration = getLambdaFunctionConfiguration;
-const getLayersLinks = async (client, functionConfiguration) => {
-    return [];
-};
-exports.getLayersLinks = getLayersLinks;
-const getLambdaPolicies = async (functionConfiguration, lambdaOptions) => [];
-exports.getLambdaPolicies = getLambdaPolicies;

package/dist/lambda/__mocks__/lambdaConfig.json

@@ -1,42 +0,0 @@
-{
-    "$metadata": {
-        "httpStatusCode": 200,
-        "requestId": "c1495998-4606-46ba-b4fc-f7d0d165172d",
-        "attempts": 1,
-        "totalRetryDelay": 0
-    },
-    "Code": {
-        "Location": "https://awslambda-eu-cent-1-tasks.s3.eu-central-1.amazonaws.com/snapshots/123456789012/FunctionLambda-90e7680-c598cb5f-6bc9-4107-9fe7-13c126eb3b9e?versionId=ThxUComOVL.qnyEN9Bmi3xzK1JshuKA3&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEGcaDGV1LWNlbnRyYWwtMSJIMEYCIQDAMKTGQ5WEMHM9H7cZQugjEX8QWvq5zRxtXg%2Fz6m9lmAIhAMst%2F5iQkOPJ%2BNfflPiwD4GQchajTfvbNvVeGlz%2BdFi%2FKokECPD%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEQAxoMNjgwNjg2NTU5NDM0IgwPQDJYINU9W7Csw4sq3QO52WKm5PvlVEeLrwstuDqPPKxhdK57A6z2foEF0Bp%2Bz%2Fp%2Flei2DzbpqjPDluzljZmzh3kP8QKPwq25Yk59%2BfXnxlSkHYe3GXO6W6VLBkPk81T0C9keVwdMijW1ZV94KN8qBB17kERR3sFIhBWXJRLhXSAdLREAfNLaE%2FgnP1eC1b5MZCBW46lbjmYHhHshgZJEUD2fy%2BRuOB4HijldLkpHKgZfwiD0ICXkvxF5NQT6tUhlQPNN%2BCrC2RQ0NSkmjXiaL2BXaDxaQVhZwMTGzBEyLAonA9bSisObWrVEjJcC4%2Bqz9ce25l2yYf77lEXWymEp9NvFFcUNAt6tt%2FAm2qMixcLxV0Y2NuBUBjIvPnNnTvBop%2FvAC1Rh6033AmWpmkK0tD65wEsTS4XAEtnD%2B%2Bku4r6kzatRJ88Lq9YOTbjs%2BMEccy9YIFp7Rwf2%2Bdw3EKHSqz4aB0R9KYa07NooZ%2Bym1VZWfGLfhFRJwKRLk3qKkY%2Bj4laizIE%2BBgqC7f7%2FYXcFk8RGX8vlX5y%2BMKWhBXoMPqAPG7ruoG1RbjQX8TEJvuG0G8c5x76fRjB2VRlykY78wa7%2B83a8oBqMfojq7hQWByNv%2B13KHVIIqrG87tL%2BtrmS7GAoils0vXf0Mvowqt6RkgY6pAGKzTtWpXiIhFLe5n2CNNDMuT9xCSCpQIWf2M9GcNabj%2FAUHIa81gvZwuHzB6DYpEj2cZ7wO22Ve%2FRLIrzdkBROoRYnT0GFevXUJAoO2WolWU13JS7owlBPTW7aET6o7fHJUhwAxPZPCp1cSaFMO5cDN%2BTOVm7V6P4es6m87S1yozp5SzHx3KblhJJF6krPHX6YCWC%2B%2FAu9tu7PqgiZ3RQTZ26f4A%3D%3D&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20220330T153702Z&X-Amz-SignedHeaders=host&X-Amz-Expires=600&X-Amz-Credential=ASIAZ47AUUDFFU2TD45R%2F20220330%2Feu-central-1%2Fs3%2Faws4_request&X-Amz-Signature=4f9187001f127561afee310d9a127acacb5064c51688f7cd65f98ccb0a7aaa10",
-        "RepositoryType": "S3"
-    },
-    "Configuration": {
-        "Architectures": ["x86_64"],
-        "CodeSha256": "KNNSfx0YOrZ+pG3fK0qbGBJv/b8V0/gWFFkFw581i4o=",
-        "CodeSize": 39577174,
-        "DeadLetterConfig": {
-            "TargetArn": "arn:aws:sqs:eu-central-1:123456789012:devlocaleuDeadLetterQ-89016d3"
-        },
-        "Description": "",
-        "Environment": {
-            "Variables": {
-                "EVENTS_BUCKET": "devlocaleu-cn-events-4h6eig-eu-central-1-1676820",
-                "AGENTS_TABLE": "devlocaleu.agent.agents"
-            }
-        },
-        "EphemeralStorage": { "Size": 512 },
-        "FunctionArn": "arn:aws:lambda:eu-central-1:123456789012:function:FunctionLambda-90e7680",
-        "FunctionName": "FunctionLambda-90e7680",
-        "Handler": "com.contrastsecurity.scan.ScanHandler::handleEventDataWithContext",
-        "LastModified": "2022-03-28T11:14:56.000+0000",
-        "LastUpdateStatus": "Successful",
-        "MemorySize": 1024,
-        "PackageType": "Zip",
-        "RevisionId": "d174710a-23ff-499b-a7ba-61036beabd7a",
-        "Role": "arn:aws:iam::123456789012:role/Function_Role",
-        "Runtime": "java11",
-        "State": "Active",
-        "Timeout": 900,
-        "TracingConfig": { "Mode": "PassThrough" },
-        "Version": "$LATEST"
-    }
-}

package/src/audit/catalogueApplication/catalogueApplication.js

@@ -1,51 +0,0 @@
-const { getHttpClient, handleResponseErrors } = require('../../utils/commonApi')
-
-const catalogueApplication = async config => {
-  const client = getHttpClient(config)
-  let appId
-  await client
-    .catalogueCommand(config)
-    .then(res => {
-      if (res.statusCode === 201) {
-        //displaySuccessMessage(config, res.body.application.app_id)
-        appId = res.body.application.app_id
-      } else if (doesMessagesContainAppId(res)) {
-        appId = tryRetrieveAppIdFromMessages(res.body.messages)
-      } else {
-        handleResponseErrors(res, 'catalogue')
-      }
-    })
-    .catch(err => {
-      console.log(err)
-    })
-  return appId
-}
-
-const doesMessagesContainAppId = res => {
-  const regex = /(Application ID =)/
-  if (
-    res.statusCode === 400 &&
-    res.body.messages.filter(message => regex.exec(message))[0]
-  ) {
-    return true
-  }
-
-  return false
-}
-
-const tryRetrieveAppIdFromMessages = messages => {
-  let appId
-  messages.forEach(message => {
-    if (message.includes('Application ID')) {
-      appId = message.split('=')[1].replace(/\s+/g, '')
-    }
-  })
-
-  return appId
-}
-
-module.exports = {
-  catalogueApplication,
-  doesMessagesContainAppId,
-  tryRetrieveAppIdFromMessages
-}

package/src/audit/languageAnalysisEngine/commonApi.js

@@ -1,20 +0,0 @@
-const { getHttpClient } = require('../../utils/commonApi')
-
-const returnAppId = async config => {
-  const client = getHttpClient(config)
-  let appId
-
-  await client.getAppId(config).then(res => {
-    if (res.body) {
-      let obj = res.body['applications']
-      if (obj) {
-        appId = obj.length === 0 ? '' : obj[0].app_id
-      }
-    }
-  })
-  return appId
-}
-
-module.exports = {
-  returnAppId: returnAppId
-}

package/src/audit/languageAnalysisEngine/filterProjectPath.js

@@ -1,21 +0,0 @@
-const path = require('path')
-
-function resolveFilePath(filepath) {
-  if (filepath[0] === '~') {
-    return path.join(process.env.HOME, filepath.slice(1))
-  }
-  return filepath
-}
-
-const returnProjectPath = () => {
-  if (process.env.PWD !== (undefined || null || 'undefined')) {
-    return process.env.PWD
-  } else {
-    return process.argv[process.argv.indexOf('--project_path') + 1]
-  }
-}
-
-module.exports = {
-  returnProjectPath: returnProjectPath,
-  resolveFilePath: resolveFilePath
-}

package/src/audit/languageAnalysisEngine/getProjectRootFilenames.js

@@ -1,36 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const i18n = require('i18n')
-
-const getDirectoryFromPathGiven = file => {
-  let projectStats = getProjectStats(file)
-
-  if (projectStats.isFile()) {
-    let newPath = path.resolve(file)
-    return path.dirname(newPath)
-  }
-
-  if (projectStats.isDirectory()) {
-    return file
-  }
-}
-
-const getProjectStats = file => {
-  try {
-    //might not need this
-    if (file.endsWith('/')) {
-      file = file.slice(0, -1)
-    }
-    return fs.statSync(file)
-  } catch (err) {
-    throw new Error(
-      i18n.__('languageAnalysisProjectRootFileNameFailure', file) +
-        `${err.message}`
-    )
-  }
-}
-
-module.exports = {
-  getProjectStats,
-  getDirectoryFromPathGiven: getDirectoryFromPathGiven
-}

package/src/audit/languageAnalysisEngine/sendSnapshot.js

@@ -1,57 +0,0 @@
-const commonApi = require('../../utils/commonApi')
-const _ = require('lodash')
-const oraFunctions = require('../../utils/oraWrapper')
-const i18n = require('i18n')
-const oraWrapper = require('../../utils/oraWrapper')
-const requestUtils = require('../../utils/requestUtils')
-const { performance } = require('perf_hooks')
-
-const pollSnapshotResults = async (config, snapshotId, client) => {
-  await requestUtils.sleep(5000)
-  return client
-    .getReportStatusById(config, snapshotId)
-    .then(res => {
-      return res
-    })
-    .catch(err => {
-      console.log(err)
-    })
-}
-
-const pollForSnapshotCompletion = async (config, snapshotId, reportSpinner) => {
-  const client = commonApi.getHttpClient(config)
-  const startTime = performance.now()
-  const timeout = commonApi.getTimeout(config)
-
-  let complete = false
-  if (!_.isNil(snapshotId)) {
-    while (!complete) {
-      let result = await pollSnapshotResults(config, snapshotId, client)
-      if (result.statusCode === 200) {
-        if (result.body.status === 'PROCESSED') {
-          complete = true
-          return result.body
-        }
-        if (result.body.status === 'FAILED') {
-          complete = true
-          if (config.debug) {
-            oraFunctions.failSpinner(
-              reportSpinner,
-              i18n.__('auditNotCompleted')
-            )
-          }
-          console.log(result.body.errorMessage)
-          oraWrapper.stopSpinner(reportSpinner)
-          console.log('Contrast audit finished')
-          process.exit(1)
-        }
-      }
-
-      commonApi.handleTimeout(startTime, timeout, reportSpinner)
-    }
-  }
-}
-
-module.exports = {
-  pollForSnapshotCompletion
-}

package/src/audit/languageAnalysisEngine/util/requestUtils.js

@@ -1,17 +0,0 @@
-const request = require('request')
-const Promise = require('bluebird')
-
-Promise.promisifyAll(request)
-
-function sendRequest({ options, method = 'put' }) {
-  return request[`${method}Async`](options.url, options)
-}
-
-const sleep = ms => {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
-
-module.exports = {
-  sendRequest: sendRequest,
-  sleep: sleep
-}

package/src/audit/nodeAnalysisEngine/parseYarn2LockFileContents.js

@@ -1,63 +0,0 @@
-const i18n = require('i18n')
-module.exports = exports = ({ language: { lockFilename }, node }, next) => {
-  // If we never read the lock file or its an earlier version then pass priority
-  if (node.rawYarnLockFileContents == undefined || node.yarnVersion == 1) {
-    next()
-  } else {
-    try {
-      node.yarnLockFile = {}
-      node.yarnLockFile['object'] = node.rawYarnLockFileContents
-      delete node.yarnLockFile['object'].__metadata
-      node.yarnLockFile['type'] = 'success'
-
-      Object.entries(node.rawYarnLockFileContents).forEach(([key, value]) => {
-        const rawKeyNames = key.split(',')
-        const keyNames = formatKey(rawKeyNames)
-
-        keyNames.forEach(name => {
-          node.yarnLockFile.object[name] = value
-        })
-      })
-    } catch (err) {
-      next(
-        new Error(
-          i18n.__('NodeParseYarn2', lockFilename.lockFilePath) +
-            `${err.message}`
-        )
-      )
-
-      return
-    }
-
-    next()
-  }
-}
-
-function formatKey(keyNames) {
-  let name = ''
-  let formattedNames = []
-  keyNames.forEach(dummyString => {
-    let nameArr = dummyString.split('@')
-    if (nameArr.length > 1) {
-      if (nameArr.length == 2) {
-        name = nameArr[0]
-      }
-
-      if (nameArr.length == 3) {
-        name = '@' + nameArr[1]
-      }
-
-      let version = dummyString.split(':').pop('')
-
-      if (version.length == 1 && version != '*') {
-        version = version + '.0'
-      }
-      let reformattedKey = name.trim() + '@' + version
-
-      formattedNames.push(reformattedKey)
-    }
-  })
-  return formattedNames
-}
-
-exports.formatKey = formatKey