@contrast/contrast 1.0.7 → 1.0.10

package/dist/constants/locales.js

@@ -12,11 +12,11 @@ const en_locales = () => {
         vulnerabilitiesFailureMessage: 'Unable to retrieve library vulnerabilities',
         catchErrorMessage: 'Contrast UI error: ',
         dependenciesNote: 'Please Note: We currently only support projects with one .csproj AND *.package.lock.json',
-        languageAnalysisFailureMessage: 'SCA Analysis Failure',
+        languageAnalysisFailureMessage: 'SCA audit Failure',
         languageAnalysisFactoryFailureHeader: 'FAIL',
         libraryAnalysisError: 'Please ensure the language parameter is set in accordance to the language specified on the project path.\nContrast CLI must be run in the same directory as the project manifest file OR the project_path parameter must be used to identify the directory containing the project manifest file.\n\nFor further information please read our usage guide, which can be accessed with the following command:\n\ncontrast-cli --help',
         yamlMissingParametersHeader: 'Missing Parameters',
-        yamlMissingParametersMessage: 'The following parameters are required: \n \norganization-id \napi-key \nauthorization \nhost \nlanguage \n \nThey must be specified as a command line argument. \nFor further information please read our usage guide, which can be accessed with the following command:\ncontrast audit --help',
+        genericErrorMessage: 'An error has occur please check your command again. For more information use the --help commands.',
         unauthenticatedErrorHeader: '401 error - Unauthenticated',
         unauthenticatedErrorMessage: 'Please check the following keys are correct:\n--organization-id, --api-key or --authorization',
         badRequestErrorHeader: '400 error - Bad Request',
@@ -38,20 +38,22 @@ const en_locales = () => {
         languageAnalysisMultipleLanguages2: 'Please specify which project file you would like analyzed with the %s CLI option.',
         languageAnalysisProjectFiles: "Identified project language as '%s' but found multiple project files: %s. Please specify which project file you would like analyzed with the %s CLI option.",
         languageAnalysisHasNoLockFile: "Identified project language as '%s' but no project lock file was found.",
-        languageAnalysisHasMultipleLockFiles: "Identified project language as '%s' but multiple project lock files were found: %s \n",
+        languageAnalysisHasNoPackageJsonFile: 'Identified project language as javascript but no package.json file was found.',
+        languageAnalysisHasMultipleLockFiles: "Identified project language as '%s' but multiple project lock files were found.",
         languageAnalysisProjectFileError: "Identified project language as '%s' but no project file was found.",
         languageAnalysisProjectRootFileNameReadError: 'Failed to read the contents of the directory @ %s because: ',
         languageAnalysisProjectRootFileNameMissingError: "%s isn't a file or directory",
         languageAnalysisProjectRootFileNameFailure: 'Failed to get information about the file or directory @ %s because: ',
         languageAnalysisFailure: ' analysis failed because: ',
-        languageAnalysisNoLanguage: 'No language detected in project path @ %s',
+        languageAnalysisNoLanguage: 'We cannot detect a project, use -f <path> to specify a file or folder to analyze.',
+        languageAnalysisNoLanguageHelpLine: `${chalk.bold('contrast audit --help')} for more information.`,
         NodeAnalysisFailure: 'NODE analysis failed because: ',
         phpAnalysisFailure: 'PHP analysis failed because: ',
-        NodeParseNPM: "Failed to parse NODE package-lock.json file @ '%s' because: ",
+        NodeParseNPM: 'Failed to parse NODE package-lock.json file because: ',
         phpParseComposerLock: "Failed to parse PHP composer.lock file @ '%s' because: ",
         NodeReadNpmError: 'Failed to read the package-lock.json file @ "%s" because: ',
         phpReadError: 'Failed to read the composer.lock file @ "%s" because: ',
-        NodeParseYarn: "Failed to parse Node yarn.lock version 1 @ '%s' because: ",
+        NodeParseYarn: 'Failed to parse yarn.lock version %s because: ',
         NodeParseYarn2: "Failed to parse Node yarn.lock version 2 @ '%s' because: ",
         nodeReadProjectFileError: 'Failed to read the NODE project file @ "%s" because: ',
         phpReadProjectFileError: 'Failed to read the PHP project file @ "%s" because: ',
@@ -78,7 +80,7 @@ const en_locales = () => {
         constantsApplicationName: 'The name of the application cataloged by Contrast UI',
         constantsCatalogueApplication: 'Provide this if you want to catalogue an application',
         constantsLanguage: 'Valid values are JAVA, DOTNET, NODE, PYTHON and RUBY. If there are multiple project configuration files in the project_path, language is also required.  Also, provide this when cataloguing an application',
-        constantsProjectPath: 'The directory root of a project/application that you would like analyzed. Defaults to current directory.',
+        constantsFilePath: `Path of the file you want to perform an SCA audit on. If no folder is specified, Contrast searches for dependency files in the working directory.`,
         constantsSilent: 'Silences JSON output.',
         constantsAppGroups: 'Assign your application to one or more pre-existing groups when using the catalogue command. Group lists should be comma separated.',
         constantsVersion: 'Displays CLI Version you are currently on.',
@@ -90,13 +92,17 @@ const en_locales = () => {
         constantsProjectName: 'Contrast project name. If not specified, Contrast uses contrast.settings to identify the project or creates a project.',
         constantsProjectId: 'The ID associated with a scan project. Replace <ProjectID> with the ID for the scan project. To find the ID, select a scan project in Contrast and locate the last number in the URL.',
         constantsReport: 'Display vulnerability information for this application',
-        constantsFail: 'Set the process to fail if this option is set in combination with the --report and --cve_severity.',
-        failOptionErrorMessage: " FAIL - CVE's have been detected that match at least the cve_severity or cve_threshold option specified.",
-        constantsSeverity: 'Combined with the --report command, allows the user to report libraries with vulnerabilities above a chosen severity level. For example, cve_severity medium only reports libraries with vulnerabilities at medium or higher severity. Values for level are high, medium or low.',
-        constantsCount: "The number of CVE's that must be exceeded to fail a build",
+        constantsFail: 'Set the process to fail if this option is set in combination with --cve_severity.',
+        failOptionErrorMessage: ' FAIL - CVEs have been detected that match at least the cve_severity or cve_threshold option specified.',
+        constantsSeverity: 'Allows the user to report libraries with vulnerabilities above a chosen severity level. For example, cve_severity medium only reports libraries with vulnerabilities at medium or higher severity. Values for level are high, medium or low.',
+        constantsCount: 'The number of CVEs that must be exceeded to fail a build',
         constantsHeader: 'CodeSec by Contrast Security',
-        constantsPrerequisitesContentScanLanguages: 'Java & JavaScript supported',
-        constantsContrastContent: "Use the 'contrast' command for fast and accurate security analysis of your applications and APIs (Java, JavaScript and .NET ) as well as serverless functions (AWS lambda, Java and Python).",
+        configHeader2: 'Config options',
+        clearHeader: '-c, --clear',
+        clearContent: 'Removes stored credentials',
+        constantsPrerequisitesContentScanLanguages: 'Java, Javascript and .NET supported',
+        constantsContrastContent: 'Use the ‘contrast’ command for fast and accurate security analysis of your applications, APIs, serverless functions, and libraries.',
+        constantsContrastCategories: '\n Code: Java, .NET, .NET Core, JavaScript\n Serverless: AWS Lambda - Java, Python\n Libraries: Java, .NET, Node, Ruby, Python, Go, PHP\n',
         constantsUsageGuideContentRecommendation: 'Our recommendation is that this is invoked as part of a CI pipeline so that running the cli is automated as part of your build process.',
         constantsPrerequisitesHeader: 'Pre-requisites',
         constantsAuthUsageHeader: 'Usage',
@@ -162,7 +168,7 @@ const en_locales = () => {
         constantsIgnoreCertErrors: 'For EOP users with a local Teamserver install, this will bypass the SSL certificate and recognise a self signed certificate.',
         constantsSave: 'Saves the Scan Results SARIF to file.',
         scanLabel: "adds a label to the scan - defaults to 'Started by CLI tool at current date'",
-        constantsIgnoreDev: 'Combined with the --report command excludes developer dependencies from the vulnerabilities report. By default all dependencies are included in a report.',
+        constantsIgnoreDev: 'Excludes developer dependencies from the results. All dependencies are included by default.',
         constantsCommands: 'Commands',
         constantsScanOptions: 'Scan Options',
         sbomError: 'All required parameters are not present.',
@@ -185,12 +191,14 @@ const en_locales = () => {
         permissionsError: 'You do not have the correct permissions here. \n Contact support@contrastsecurity.com to get this fixed.',
         scanErrorFileMessage: 'We only accept the following file types: \nJava - .jar, .war \nJavaScript - .js or .zip files',
         helpAuthSummary: 'Authenticate Contrast using your Github or Google account',
-        helpScanSummary: 'Perform static analysis on binaries / code artifacts',
-        helpLambdaSummary: 'Perform scan on AWS Lambda functions',
+        helpAuditSummary: 'Searches for a suitable file in the working directory to perform a security audit of dependencies and returns the results. [Contrast audit --help (for options).]',
+        helpScanSummary: 'Searches for a .jar, .war, .js, or .zip file in the working directory, uploads files for analysis, and returns the results. [For further help/options, enter scan --help]',
+        helpLambdaSummary: 'Performs a static security scan on an AWS lambda function. lambda --help (for options)',
         helpVersionSummary: 'Displays version of Contrast CLI',
         helpConfigSummary: 'Displays stored credentials',
         helpSummary: 'Displays usage guide',
         authName: 'auth',
+        auditName: 'audit',
         scanName: 'scan',
         lambdaName: 'lambda',
         versionName: 'version',
@@ -203,8 +211,7 @@ const en_locales = () => {
         scanOptionsFileNameSummary: 'Path of the file you want to scan. If no file is specified, Contrast searches for a .jar, .war, .exe or .zip file in the working directory.',
         scanOptionsVerboseSummary: ' Returns extended information to the terminal.',
         authSuccessMessage: 'Authentication successful',
-        runAuthSuccessMessage: "Now you can use Contrast CLI \nRun 'contrast scan' on your file \n" +
-            "or 'contrast help' to learn more about the capabilities.",
+        runAuthSuccessMessage: "Now you can use CodeSec by Contrast \nRun: \n'contrast scan' on your file \n'contrast audit' on a file or directory,\n'contrast lambda' on an AWS function.\nor 'contrast help' to learn more about the capabilities.",
         authWaitingMessage: 'Waiting for auth...',
         authTimedOutMessage: 'Auth Timed out, try again',
         zipErrorScan: 'We only support zip files for JAVASCRIPT language, please set the flag --language JAVASCRIPT',
@@ -226,7 +233,7 @@ const en_locales = () => {
         lambdaPrerequisitesContent: '',
         lambdaPrerequisitesContentLambdaLanguages: 'Supported runtimes: Java & Python',
         lambdaPrerequisitesContentLambdaDescriptionTitle: 'AWS Requirements\n',
-        lambdaPrerequisitesContentLambdaDescription: 'Make sure you have the AWS credentials configured on your local environment. \nYou need the following AWS permissions configured on your IAM user:\n   - Lambda: GetFunction, GetLayerVersionֿ\n   - IAM: GetRolePolicy, GetPolicy, GetPolicyVersion, ListRolePolicies, ListAttachedRolePolicies',
+        lambdaPrerequisitesContentLambdaDescription: 'Make sure you have the AWS credentials configured on your local environment. \nYou need the following AWS permissions configured on your IAM user:\n   - Lambda: GetFunction, GetLayerVersion, ListFunctions\n   - IAM: GetRolePolicy, GetPolicy, GetPolicyVersion, ListRolePolicies, ListAttachedRolePolicies',
         scanFileNameOption: '-f, --file',
         lambdaFunctionNameOption: '-f, --function-name',
         lambdaListFunctionsOption: '-l, --list-functions',
@@ -253,36 +260,28 @@ const en_locales = () => {
         connectionError: 'An error has occurred when trying to get the Project Id please check your internet connection or provide the Project Id manually',
         internalServerErrorHeader: '500 error - Internal server error',
         resourceLockedErrorHeader: '423 error - Resource is locked',
-        auditHeader: 'Contrast Audit',
-        auditHeaderMessage: `
-    Performs software composition analysis (SCA) on your application/code time to show you the dependencies between open source libraries, including where vulnerabilities were introduced.\n
-    Our recommendation is that this is invoked as part of a CI pipeline so that running the cli is automated as part of your build process.`,
+        auditHeader: 'Contrast audit help',
+        auditHeaderMessage: "Use 'contrast audit' to analyze a project’s dependencies for vulnerabilities.",
         constantsAuditPrerequisitesContentSupportedLanguages: 'Supported languages and their requirements are:',
-        constantsAuditPrerequisitesContentJava: 'Java: ',
-        constantsAuditPrerequisitesContentMessage: `
-       pom.xml AND Maven build platform, including the dependency plugin. 
-       For a Gradle project (v4.8+) use build.gradle. A gradle-wrapper.properties file is also required.
-       Kotlin is also supported requiring a build.gradle.kts file.`,
-        constantsAuditPrerequisitesContentDotNet: '.NET framework and .NET core: ',
+        constantsAuditPrerequisitesJavaContentMessage: `
+    ${chalk.bold('Java:')} pom.xml ${chalk.bold('and')} Maven build platform including the dependency plugin. 
+    ${chalk.bold('Or')} build.gradle ${chalk.bold('and')} gradle dependencies or ./gradlew dependencies must be supported`,
         constantsAuditPrerequisitesContentDotNetMessage: `
-       MSBuild 15.0 or greater and have a packages.lock.json file are supported.\n
-       Note: If the packages.lock.json file is unavailable it can be generated by setting RestorePackagesWithLockFile to true within each *.csproj file and running dotnet build.\n`,
-        constantsAuditPrerequisitesContentLanguageNode: 'Node: ',
-        constantsAuditPrerequisitesContentLanguageRuby: 'Ruby: ',
-        constantsAuditPrerequisitesContentLanguagePython: 'Python: ',
-        constantsAuditPrerequisitesContentLanguageNodeMessage: '*.package.json AND a lock file either *.package-lock.json or *.yarn.lock',
-        constantsAuditPrerequisitesContentLanguageRubyMessage: 'gemfile AND gemfile.lock',
-        constantsAuditPrerequisitesContentLanguagePythonMessage: 'pipfile AND pipfile.lock',
+    ${chalk.bold('.NET framework and .NET core:')} MSBuild 15.0 or greater and a packages.lock.json file.
+    Note: If the packages.lock.json file is unavailable it can be generated by setting RestorePackagesWithLockFile to true within each *.csproj file and running dotnet build.\n`,
+        constantsAuditPrerequisitesContentNodeMessage: `${chalk.bold('Node:')} package.json and a lock file (either .package-lock.json or .yarn.lock.)\n`,
+        constantsAuditPrerequisitesContentRubyMessage: `${chalk.bold('Ruby:')} gemfile and gemfile.lock\n`,
+        constantsAuditPrerequisitesContentPythonMessage: `${chalk.bold('Python:')} pipfile and pipfile.lock\n`,
+        constantsAuditPrerequisitesContentGoMessage: `${chalk.bold('Go:')} go.mod\n`,
+        constantsAuditPrerequisitesContentPHPMessage: `${chalk.bold('PHP:')} composer.json and composer.lock\n`,
         constantsAuditOptions: 'Audit Options',
-        auditOptionsIgnoreDevDependencies: '-igd, --ignore-dev',
-        auditOptionsIgnoreDevDependenciesDescription: 'ignores DevDependencies',
-        auditOptionsSave: '-s, --save',
-        auditOptionsSaveDescription: 'saves the output in specified format Txt text, sbom',
+        auditOptionsSaveDescription: 'Generate and save an SBOM (Software Bill of Materials)\n',
+        auditOptionsSaveOptionsDescription: 'Valid options are: spdx, cyclonedx (cycloneDX is the default format)',
         scanNotCompleted: 'Scan not completed. Check for framework and language support here: %s',
         auditNotCompleted: 'audit not completed.  Please try again',
-        scanNoVulnerabilitiesFound: '👏 No vulnerabilities found',
+        scanNoVulnerabilitiesFound: '🎉 No vulnerabilities found.',
         scanNoVulnerabilitiesFoundSecureCode: '👍 Your code looks secure.',
-        scanNoVulnerabilitiesFoundGoodWork: '👏 Keep up the good work.',
+        scanNoVulnerabilitiesFoundGoodWork: '   Keep up the good work.',
         scanNoFiletypeSpecifiedForSave: 'Please specify file type to save results to, accepted value is SARIF',
         auditSBOMSaveSuccess: '\n Software Bill of Materials (SBOM) saved successfully',
         auditNoFiletypeSpecifiedForSave: `\n ${chalk.yellow.bold('No file type specified for --save option to save audit results to. Use audit --help to see valid --save options.')}`,
@@ -291,7 +290,8 @@ const en_locales = () => {
         auditReportFail: 'Report Retrieval Failed, please try again',
         auditReportSuccessMessage: 'Report successfully retrieved',
         auditReportFailureMessage: 'Unable to generate library report',
-        auditSCAAnalysisBegins: 'Contrast SCA analysis begins',
+        auditSCAAnalysisBegins: 'Contrast SCA audit started',
+        auditSCAAnalysisComplete: 'Contrast audit complete',
         ...lambda
     };
 };

package/dist/constants.js

@@ -43,7 +43,6 @@ const scanOptionDefinitions = [
     },
     {
         name: 'project-path',
-        alias: 'i',
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
@@ -188,12 +187,13 @@ const auditOptionDefinitions = [
             i18n.__('constantsApplicationName')
     },
     {
-        name: 'project-path',
-        defaultValue: process.env.PWD,
+        name: 'file',
+        alias: 'f',
+        defaultValue: process.cwd().concat('/'),
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsProjectPath')
+            i18n.__('constantsFilePath')
     },
     {
         name: 'app-groups',
@@ -235,14 +235,6 @@ const auditOptionDefinitions = [
     {
         name: 'maven-settings-path'
     },
-    {
-        name: 'language',
-        alias: 'l',
-        description: '{bold ' +
-            i18n.__('constantsRequiredCatalogue') +
-            '}: ' +
-            i18n.__('constantsLanguage')
-    },
     {
         name: 'organization-id',
         alias: 'o',
@@ -294,13 +286,31 @@ const auditOptionDefinitions = [
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('auditOptionsSaveDescription')
+            i18n.__('auditOptionsSaveDescription') +
+            i18n.__('auditOptionsSaveOptionsDescription')
+    },
+    {
+        name: 'experimental',
+        alias: 'e',
+        type: Boolean
+    },
+    {
+        name: 'timeout',
+        alias: 't',
+        type: Number,
+        description: '{bold ' +
+            i18n.__('constantsOptional') +
+            '}: ' +
+            i18n.__('scanOptionsTimeoutSummary')
     }
 ];
 const mainUsageGuide = commandLineUsage([
     {
         header: i18n.__('constantsHeader'),
-        content: [i18n.__('constantsContrastContent')]
+        content: [
+            i18n.__('constantsContrastContent'),
+            i18n.__('constantsContrastCategories')
+        ]
     },
     {
         header: i18n.__('constantsUsage'),
@@ -312,6 +322,7 @@ const mainUsageGuide = commandLineUsage([
             { name: i18n.__('authName'), summary: i18n.__('helpAuthSummary') },
             { name: i18n.__('scanName'), summary: i18n.__('helpScanSummary') },
             { name: i18n.__('lambdaName'), summary: i18n.__('helpLambdaSummary') },
+            { name: i18n.__('auditName'), summary: i18n.__('helpAuditSummary') },
             { name: i18n.__('versionName'), summary: i18n.__('helpVersionSummary') },
             { name: i18n.__('configName'), summary: i18n.__('helpConfigSummary') },
             { name: i18n.__('helpName'), summary: i18n.__('helpSummary') }
@@ -319,6 +330,12 @@ const mainUsageGuide = commandLineUsage([
     },
     {
         content: '{underline https://developer.contrastsecurity.com/} \n For technical support head to {underline https://support.contrastsecurity.com}'
+    },
+    {
+        header: i18n.__('configHeader2'),
+        content: [
+            { name: i18n.__('clearHeader'), summary: i18n.__('clearContent') }
+        ]
     }
 ]);
 const mainDefinition = [{ name: 'command', defaultOption: true }];

package/dist/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -29,55 +30,64 @@ const getMainOption = () => {
     };
 };
 const start = async () => {
-    if (await (0, versionChecker_1.isCorrectNodeVersion)(process.version)) {
-        const { mainOptions, argv: argvMain } = getMainOption();
-        const command = mainOptions.command != undefined ? mainOptions.command.toLowerCase() : '';
-        if (command === 'version' ||
-            argvMain.includes('--v') ||
-            argvMain.includes('--version')) {
-            console.log(constants_2.APP_VERSION);
-            await (0, versionChecker_1.findLatestCLIVersion)(config.get('updateMessageHidden'));
-            return;
-        }
-        config.set('numOfRuns', config.get('numOfRuns') + 1);
-        if (config.get('numOfRuns') >= 5) {
-            await (0, versionChecker_1.findLatestCLIVersion)(config.get('updateMessageHidden'));
-            config.set('numOfRuns', 0);
-        }
-        if (command === 'config') {
-            return (0, config_1.processConfig)(argvMain, config);
-        }
-        if (command === 'auth') {
-            return await (0, auth_1.processAuth)(argvMain, config);
-        }
-        if (command === 'lambda') {
-            return await (0, lambda_1.processLambda)(argvMain);
-        }
-        if (command === 'scan') {
-            return await (0, processScan_1.processScan)(argvMain);
-        }
-        if (command === 'audit') {
-            return await (0, processAudit_1.processAudit)(argvMain);
-        }
-        if (command === 'help' ||
-            argvMain.includes('--help') ||
-            Object.keys(mainOptions).length === 0) {
-            console.log(mainUsageGuide);
-        }
-        else if (mainOptions._unknown !== undefined) {
-            const foundCommand = (0, errorHandling_1.findCommandOnError)(mainOptions._unknown);
-            foundCommand
-                ? console.log(`Unknown Command: Did you mean "${foundCommand}"? \nUse "${foundCommand} --help" for the full list of options`)
-                : console.log(`Unknown Command: ${command} \nUse --help for the full list`);
+    try {
+        if (await (0, versionChecker_1.isCorrectNodeVersion)(process.version)) {
+            const { mainOptions, argv: argvMain } = getMainOption();
+            const command = mainOptions.command != undefined
+                ? mainOptions.command.toLowerCase()
+                : '';
+            if (command === 'version' ||
+                argvMain.includes('--v') ||
+                argvMain.includes('--version')) {
+                console.log(constants_2.APP_VERSION);
+                await (0, versionChecker_1.findLatestCLIVersion)(config);
+                return;
+            }
+            config.set('numOfRuns', config.get('numOfRuns') + 1);
+            if (config.get('numOfRuns') >= 1) {
+                await (0, versionChecker_1.findLatestCLIVersion)(config);
+                config.set('numOfRuns', 0);
+            }
+            if (command === 'config') {
+                return (0, config_1.processConfig)(argvMain, config);
+            }
+            if (command === 'auth') {
+                return await (0, auth_1.processAuth)(argvMain, config);
+            }
+            if (command === 'lambda') {
+                return await (0, lambda_1.processLambda)(argvMain);
+            }
+            if (command === 'scan') {
+                return await (0, processScan_1.processScan)(argvMain);
+            }
+            if (command === 'audit') {
+                return await (0, processAudit_1.processAudit)(argvMain);
+            }
+            if (command === 'help' ||
+                argvMain.includes('--help') ||
+                Object.keys(mainOptions).length === 0) {
+                console.log(mainUsageGuide);
+            }
+            else if (mainOptions._unknown !== undefined) {
+                const foundCommand = (0, errorHandling_1.findCommandOnError)(mainOptions._unknown);
+                foundCommand
+                    ? console.log(`Unknown Command: Did you mean "${foundCommand}"? \nUse "${foundCommand} --help" for the full list of options`)
+                    : console.log(`Unknown Command: ${command} \nUse --help for the full list`);
+            }
+            else {
+                console.log(`Unknown Command: ${command} \nUse --help for the full list`);
+            }
+            process.exit(9);
         }
         else {
-            console.log(`Unknown Command: ${command} \nUse --help for the full list`);
+            console.log('Contrast supports Node versions >=16.13.2 <17. Please use one of those versions.');
+            process.exit(9);
         }
-        process.exit(9);
     }
-    else {
-        console.log('Contrast supports Node versions >=16.13.2 <17. Please use one of those versions.');
-        process.exit(9);
+    catch (err) {
+        console.log();
+        console.log(err.message.toString());
+        process.exit(1);
     }
 };
 start();

package/dist/lambda/lambda.js

@@ -22,6 +22,7 @@ const requestUtils_1 = require("../utils/requestUtils");
 const oraWrapper_1 = __importDefault(require("../utils/oraWrapper"));
 const analytics_1 = require("./analytics");
 const types_1 = require("./types");
+const constants_2 = require("../constants/constants");
 const failedStates = [
     'UNSUPPORTED',
     'EXCLUDED',
@@ -68,7 +69,8 @@ const processLambda = async (argv) => {
         const startCommandAnalytics = {
             arguments: lambdaOptions,
             sessionId: commandSessionId,
-            eventType: types_1.EventType.START
+            eventType: types_1.EventType.START,
+            packageVersion: constants_2.APP_VERSION
         };
         (0, analytics_1.postAnalytics)(startCommandAnalytics).catch((error) => {
         });
@@ -95,7 +97,8 @@ const processLambda = async (argv) => {
         const endCommandAnalytics = {
             sessionId: commandSessionId,
             eventType: types_1.EventType.END,
-            status: errorMsg ? types_1.StatusType.FAILED : types_1.StatusType.SUCCESS
+            status: errorMsg ? types_1.StatusType.FAILED : types_1.StatusType.SUCCESS,
+            packageVersion: constants_2.APP_VERSION
         };
         if (errorMsg) {
             endCommandAnalytics.errorMsg = errorMsg;

package/dist/sbom/generateSbom.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSbom = void 0;
 const commonApi_1 = require("../utils/commonApi");
-function generateSbom(config) {
+const generateSbom = (config, type) => {
     const client = (0, commonApi_1.getHttpClient)(config);
     return client
-        .getSbom(config)
+        .getSbom(config, type)
         .then((res) => {
         if (res.statusCode === 200) {
             return res.body;
@@ -16,5 +17,5 @@ function generateSbom(config) {
         .catch((err) => {
         console.log(err);
     });
-}
-exports.default = generateSbom;
+};
+exports.generateSbom = generateSbom;

package/dist/scaAnalysis/common/formatMessage.js

@@ -6,6 +6,21 @@ const createJavaTSMessage = javaTree => {
         }
     };
 };
+const createJavaScriptTSMessage = js => {
+    let message = {
+        node: {
+            packageJSON: js.packageJSON
+        }
+    };
+    if (js.yarn !== undefined) {
+        message.node.yarnLockFile = js.yarn.yarnLockFile;
+        message.node.yarnVersion = js.yarn.yarnVersion;
+    }
+    else {
+        message.node.npmLockFile = js.npmLockFile;
+    }
+    return message;
+};
 const createGoTSMessage = goTree => {
     return {
         go: {
@@ -15,21 +30,33 @@ const createGoTSMessage = goTree => {
 };
 const createRubyTSMessage = rubyTree => {
     return {
-        ruby: {
-            rubyDependencyTrees: rubyTree
-        }
+        ruby: rubyTree
     };
 };
 const createPythonTSMessage = pythonTree => {
     return {
-        python: {
-            pythonDependencyTrees: pythonTree
+        python: pythonTree
+    };
+};
+const createPhpTSMessage = phpTree => {
+    return {
+        php: {
+            composerJSON: phpTree.composerJSON,
+            lockFile: phpTree.lockFile
         }
     };
 };
+const createDotNetTSMessage = dotnetTree => {
+    return {
+        dotnet: dotnetTree
+    };
+};
 module.exports = {
+    createJavaScriptTSMessage,
     createJavaTSMessage,
     createGoTSMessage,
+    createPhpTSMessage,
     createRubyTSMessage,
-    createPythonTSMessage
+    createPythonTSMessage,
+    createDotNetTSMessage
 };

package/dist/scaAnalysis/common/treeUpload.js

@@ -1,5 +1,5 @@
 "use strict";
-const { getHttpClient } = require('../../utils/commonApi');
+const commonApi = require('../../utils/commonApi');
 const { APP_VERSION } = require('../../constants/constants');
 const commonSendSnapShot = async (analysis, config) => {
     const requestBody = {
@@ -7,21 +7,19 @@ const commonSendSnapShot = async (analysis, config) => {
         cliVersion: APP_VERSION,
         snapshot: analysis
     };
-    const client = getHttpClient(config);
+    const client = commonApi.getHttpClient(config);
     return client
         .sendSnapshot(requestBody, config)
         .then(res => {
         if (res.statusCode === 201) {
-            console.log('dependencies processed successfully');
             return res.body;
         }
         else {
-            console.log(res.statusCode);
-            console.log('error processing dependencies');
+            throw new Error(res.statusCode + ` error processing dependencies`);
         }
     })
         .catch(err => {
-        console.log(err);
+        throw err;
     });
 };
 module.exports = {

package/dist/scaAnalysis/dotnet/analysis.js

@@ -0,0 +1,43 @@
+"use strict";
+const fs = require('fs');
+const xml2js = require('xml2js');
+const i18n = require('i18n');
+const readAndParseProjectFile = projectFilePath => {
+    const projectFile = fs.readFileSync(projectFilePath);
+    return new xml2js.Parser({
+        explicitArray: false,
+        mergeAttrs: true
+    }).parseString(projectFile);
+};
+const readAndParseLockFile = lockFilePath => {
+    const lockFile = JSON.parse(fs.readFileSync(lockFilePath).toString());
+    let count = 0;
+    for (const dependenciesNode in lockFile.dependencies) {
+        for (const innerNode in lockFile.dependencies[dependenciesNode]) {
+            const nodeValidation = JSON.stringify(lockFile.dependencies[dependenciesNode][innerNode]);
+            if (nodeValidation.includes('"type":"Project"')) {
+                count += 1;
+                delete lockFile.dependencies[dependenciesNode][innerNode];
+                lockFile.additionalInfo = 'dependenciesNote';
+            }
+        }
+    }
+    if (count > 0) {
+        const multiLevelProjectWarning = () => {
+            console.log('');
+            console.log(i18n.__('dependenciesNote'));
+        };
+        setTimeout(multiLevelProjectWarning, 7000);
+    }
+    return lockFile;
+};
+const getDotNetDeps = (filePath, languageFiles) => {
+    const projectFile = readAndParseProjectFile(filePath + `/${languageFiles[0]}`);
+    const lockFile = readAndParseLockFile(filePath + `/${languageFiles[1]}`);
+    return { projectFile, lockFile };
+};
+module.exports = {
+    getDotNetDeps,
+    readAndParseProjectFile,
+    readAndParseLockFile
+};

package/dist/scaAnalysis/dotnet/index.js

@@ -0,0 +1,10 @@
+"use strict";
+const { getDotNetDeps } = require('./analysis');
+const { createDotNetTSMessage } = require('../common/formatMessage');
+const dotNetAnalysis = (config, languageFiles) => {
+    const dotNetDeps = getDotNetDeps(config.file, languageFiles.DOTNET);
+    return createDotNetTSMessage(dotNetDeps);
+};
+module.exports = {
+    dotNetAnalysis
+};

package/dist/scaAnalysis/go/goReadDepFile.js

@@ -3,9 +3,7 @@ const child_process = require('child_process');
 const i18n = require('i18n');
 const getGoDependencies = config => {
     let cmdStdout;
-    let cwd = config.projectPath
-        ? config.projectPath.replace('go.mod', '')
-        : process.cwd();
+    let cwd = config.file ? config.file.replace('go.mod', '') : process.cwd();
     try {
         cmdStdout = child_process.execSync('go mod graph', { cwd });
         return cmdStdout.toString();