@contrast/contrast 1.0.4 → 1.0.5

package/.prettierignore

@@ -2,3 +2,5 @@ test/commands/**
 dist/**
 test/errorHandling.spec.ts
 **/models
+**/audit/autodetection/autoDetectLanguage.ts
+**/commands/audit/auditConfig.ts

package/dist/audit/autodetection/autoDetectLanguage.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineProjectLanguage = exports.identifyLanguages = void 0;
+const i18n_1 = __importDefault(require("i18n"));
+const reduceIdentifiedLanguages_1 = require("../languageAnalysisEngine/reduceIdentifiedLanguages");
+const getProjectRootFilenames_1 = require("../languageAnalysisEngine/getProjectRootFilenames");
+function identifyLanguages(config) {
+    const { projectPath } = config;
+    const projectRootFilenames = (0, getProjectRootFilenames_1.getProjectRootFilenames)(projectPath);
+    const identifiedLanguages = projectRootFilenames.reduce((accumulator, filename) => {
+        const deducedLanguages = (0, reduceIdentifiedLanguages_1.deduceLanguage)(filename);
+        return [...accumulator, ...deducedLanguages];
+    }, []);
+    if (Object.keys(identifiedLanguages).length === 0) {
+        throw new Error(i18n_1.default.__('languageAnalysisNoLanguage', projectPath));
+    }
+    return (0, reduceIdentifiedLanguages_1.reduceIdentifiedLanguages)(identifiedLanguages);
+}
+exports.identifyLanguages = identifyLanguages;
+function determineProjectLanguage(reducedLanguages) {
+    const reducedLanguagesKeys = Object.keys(reducedLanguages);
+    if (reducedLanguagesKeys.length === 1) {
+        return reducedLanguagesKeys[0];
+    }
+    else {
+        throw new Error('Detected multiple languages. Please specify a single language using --language');
+    }
+}
+exports.determineProjectLanguage = determineProjectLanguage;

package/dist/audit/catalogueApplication/catalogueApplication.js

@@ -1,16 +1,8 @@
 "use strict";
 const i18n = require('i18n');
 const { getHttpClient, handleResponseErrors } = require('../../utils/commonApi');
-const locationOfApp = (config, appId) => {
-    return `${config.host}/Contrast/static/ng/index.html#/${config.organizationId}/applications/${appId}`;
-};
-const displaySuccessMessage = (config, appId) => {
-    console.log('\n **************************' +
-        i18n.__('successHeader') +
-        '************************** \n');
-    console.log('\n' + i18n.__('catalogueSuccessCommand') + appId + '\n');
-    console.log(locationOfApp(config, appId));
-    console.log('\n *********************************************************** \n');
+const displaySuccessMessage = () => {
+    console.log(i18n.__('catalogueSuccessCommand'));
 };
 const catalogueApplication = async (config) => {
     const client = getHttpClient(config);
@@ -19,7 +11,6 @@ const catalogueApplication = async (config) => {
         .catalogueCommand(config)
         .then(res => {
         if (res.statusCode === 201) {
-            displaySuccessMessage(config, res.body.application.app_id);
             appId = res.body.application.app_id;
         }
         else {

package/dist/audit/languageAnalysisEngine/languageAnalysisFactory.js

@@ -14,6 +14,7 @@ const fs = require('fs');
 const chalk = require('chalk');
 const saveFile = require('../../commands/audit/saveFile').default;
 const generateSbom = require('../../sbom/generateSbom').default;
+const { failSpinner, returnOra, startSpinner, succeedSpinner } = require('../../utils/oraWrapper');
 module.exports = exports = (err, analysis) => {
     const { identifiedLanguageInfo } = analysis.languageAnalysis;
     const catalogueAppId = analysis.languageAnalysis.appId;
@@ -35,11 +36,12 @@ module.exports = exports = (err, analysis) => {
                 err);
             return process.exit(5);
         }
-        console.log('\n **************CONTRAST OSS ANALYSIS BEGINS**************');
+        const reportSpinner = returnOra(i18n.__('auditSCAAnalysisBegins'));
+        startSpinner(reportSpinner);
         const snapshotResponse = await newSendSnapShot(analysis, catalogueAppId);
+        succeedSpinner(reportSpinner, 'Contrast SCA analysis complete');
         await vulnerabilityReport(analysis, catalogueAppId, snapshotResponse.id);
         await auditSave(config);
-        console.log('\n ***************CONTRAST OSS ANALYSIS COMPLETE************** \n');
     };
     if (identifiedLanguageInfo.language === DOTNET) {
         dotnetAE(identifiedLanguageInfo, analysis.config, langCallback);

package/dist/audit/languageAnalysisEngine/reduceIdentifiedLanguages.js

@@ -22,6 +22,30 @@ function isNodeLockFilename(filename) {
 const isRubyLockFilename = filename => filename === 'Gemfile.lock';
 const isPipfileLockLockFilename = filename => filename === 'Pipfile.lock';
 const isGoProjectFilename = filename => filename === 'go.mod';
+const deduceLanguageScaAnalysis = filenames => {
+    const deducedLanguages = [];
+    let language = '';
+    filenames.forEach(filename => {
+        if (isJavaMavenProjectFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = JAVA;
+        }
+        if (isJavaGradleProjectFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = JAVA;
+        }
+        if (isNodeProjectFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = NODE;
+        }
+        if (isNodeLockFilename(filename)) {
+            deducedLanguages.push(filename);
+            language = node;
+        }
+    });
+    let identifiedLanguages = { [language]: deducedLanguages };
+    return identifiedLanguages;
+};
 const deduceLanguage = filename => {
     const deducedLanguages = [];
     if (isJavaMavenProjectFilename(filename)) {
@@ -119,3 +143,4 @@ exports.isPhpProjectFilename = isPhpProjectFilename;
 exports.isPhpLockFilename = isPhpLockFilename;
 exports.deduceLanguage = deduceLanguage;
 exports.reduceIdentifiedLanguages = reduceIdentifiedLanguages;
+exports.deduceLanguageScaAnalysis = deduceLanguageScaAnalysis;

package/dist/audit/languageAnalysisEngine/report/commonReportingFunctions.js

@@ -4,40 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printFormattedOutput = exports.printVulnerabilityResponse = exports.getReport = exports.createLibraryHeader = void 0;
-const i18n_1 = __importDefault(require("i18n"));
 const commonApi_1 = require("../../../utils/commonApi");
 const reportListModel_1 = require("./models/reportListModel");
 const lodash_1 = require("lodash");
 const chalk_1 = __importDefault(require("chalk"));
 const reportUtils_1 = require("./utils/reportUtils");
-const oraWrapper_1 = require("../../../utils/oraWrapper");
-const createLibraryHeader = (id, numberOfVulnerableLibraries, numberOfCves, name) => {
-    name
-        ? console.log(`\n Application Name: ${name} | Application ID: ${id}`)
-        : console.log(` Application ID: ${id}`);
+const createLibraryHeader = (id, numberOfVulnerableLibraries, numberOfCves) => {
     numberOfVulnerableLibraries === 1
-        ? console.log('\n **************************' +
-            ` Found 1 vulnerable library containing ${numberOfCves} CVE's` +
-            '************************** ')
-        : console.log('\n **************************' +
-            ` Found ${numberOfVulnerableLibraries} vulnerable libraries containing ${numberOfCves} CVE's ` +
-            '************************** ');
+        ? console.log(` Found 1 vulnerable library containing ${numberOfCves} CVE's`)
+        : console.log(` Found ${numberOfVulnerableLibraries} vulnerable libraries containing ${numberOfCves} CVE's `);
 };
 exports.createLibraryHeader = createLibraryHeader;
 const getReport = async (config, reportId) => {
     const client = (0, commonApi_1.getHttpClient)(config);
-    const reportSpinner = (0, oraWrapper_1.returnOra)(i18n_1.default.__('auditReportWaiting'));
-    reportSpinner.indent = 1;
-    (0, oraWrapper_1.startSpinner)(reportSpinner);
     return client
         .getReportById(config, reportId)
         .then((res) => {
         if (res.statusCode === 200) {
-            (0, oraWrapper_1.succeedSpinner)(reportSpinner, i18n_1.default.__('auditReportSuccessMessage'));
             return res.body;
         }
         else {
-            (0, oraWrapper_1.failSpinner)(reportSpinner, i18n_1.default.__('auditReportFail'));
             console.log('config-------------------');
             console.log(config);
             console.log('reportId----------------');

package/dist/audit/languageAnalysisEngine/report/reportingFeature.js

@@ -17,7 +17,7 @@ function formatVulnerabilityOutput(libraryVulnerabilityResponse, id, name, confi
     const numberOfVulnerableLibraries = vulnerableLibraries.length;
     let numberOfCves = 0;
     vulnerableLibraries.forEach(lib => (numberOfCves += lib.cveArray.length));
-    (0, commonReportingFunctions_1.createLibraryHeader)(id, numberOfVulnerableLibraries, numberOfCves, name);
+    (0, commonReportingFunctions_1.createLibraryHeader)(id, numberOfVulnerableLibraries, numberOfCves);
     const hasSomeVulnerabilitiesReported = (0, commonReportingFunctions_1.printVulnerabilityResponse)(vulnerableLibraries, config);
     return [
         hasSomeVulnerabilitiesReported,

package/dist/audit/languageAnalysisEngine/sendSnapshot.js

@@ -1,18 +1,8 @@
 "use strict";
-const prettyjson = require('prettyjson');
-const i18n = require('i18n');
 const { getHttpClient } = require('../../utils/commonApi');
 const { handleResponseErrors } = require('../../common/errorHandling');
 const { APP_VERSION } = require('../../constants/constants');
-function displaySnapshotSuccessMessage(config) {
-    console.log('\n **************************' +
-        i18n.__('successHeader') +
-        '************************** ');
-    console.log('\n' + i18n.__('snapshotSuccessMessage') + '\n');
-    console.log(` ${config.host}/Contrast/static/ng/index.html#/${config.organizationId}/applications/${config.applicationId}/libs/dependency-tree`);
-    console.log('\n ***********************************************************');
-}
-const newSendSnapShot = async (analysis, applicationId) => {
+const newSendSnapShot = async (analysis) => {
     const analysisLanguage = analysis.config.language.toLowerCase();
     const requestBody = {
         appID: analysis.config.applicationId,
@@ -24,9 +14,6 @@ const newSendSnapShot = async (analysis, applicationId) => {
         .sendSnapshot(requestBody, analysis.config)
         .then(res => {
         if (res.statusCode === 201) {
-            if (analysis.config.host !== 'https://ce.contrastsecurity.com/') {
-                displaySnapshotSuccessMessage(analysis.config);
-            }
             return res.body;
         }
         else {
@@ -38,6 +25,5 @@ const newSendSnapShot = async (analysis, applicationId) => {
     });
 };
 module.exports = {
-    newSendSnapShot: newSendSnapShot,
-    displaySnapshotSuccessMessage: displaySnapshotSuccessMessage
+    newSendSnapShot: newSendSnapShot
 };

package/dist/commands/audit/auditConfig.js

@@ -8,14 +8,20 @@ const paramHandler_1 = __importDefault(require("../../utils/paramsUtil/paramHand
 const constants_1 = __importDefault(require("../../constants"));
 const parsedCLIOptions_1 = __importDefault(require("../../utils/parsedCLIOptions"));
 const constants_2 = __importDefault(require("../../audit/languageAnalysisEngine/constants"));
+const autoDetectLanguage_1 = require("../../audit/autodetection/autoDetectLanguage");
 const { supportedLanguages: { NODE, JAVASCRIPT } } = constants_2.default;
 const getAuditConfig = (argv) => {
     const auditParameters = parsedCLIOptions_1.default.getCommandLineArgsCustom(argv, constants_1.default.commandLineDefinitions.auditOptionDefinitions);
     const paramsAuth = paramHandler_1.default.getAuth(auditParameters);
     if (auditParameters.language === undefined ||
         auditParameters.language === null) {
-        console.log('error, --language parameter is required');
-        process.exit(1);
+        try {
+            auditParameters.language = (0, autoDetectLanguage_1.determineProjectLanguage)((0, autoDetectLanguage_1.identifyLanguages)(auditParameters));
+        }
+        catch (err) {
+            console.log(err.message);
+            process.exit(1);
+        }
     }
     else if (auditParameters.language.toUpperCase() === JAVASCRIPT) {
         auditParameters.language = NODE.toLowerCase();

package/dist/commands/audit/auditController.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startAudit = void 0;
+exports.startAudit = exports.dealWithNoAppId = void 0;
 const catalogueApplication_1 = require("../../audit/catalogueApplication/catalogueApplication");
 const commonApi_1 = __importDefault(require("../../audit/languageAnalysisEngine/commonApi"));
 const identifyLanguageAE = require('./../../audit/languageAnalysisEngine');
 const languageFactory = require('../../audit/languageAnalysisEngine/languageAnalysisFactory');
+const { v4: uuidv4 } = require('uuid');
 const dealWithNoAppId = async (config) => {
     let appID;
     try {
@@ -15,6 +16,10 @@ const dealWithNoAppId = async (config) => {
         if (!appID && config.applicationName) {
             return await (0, catalogueApplication_1.catalogueApplication)(config);
         }
+        if (!appID && !config.applicationName) {
+            config.applicationName = uuidv4();
+            return await (0, catalogueApplication_1.catalogueApplication)(config);
+        }
     }
     catch (e) {
         if (e.toString().includes('tunneling socket could not be established')) {
@@ -25,9 +30,10 @@ const dealWithNoAppId = async (config) => {
     }
     return appID;
 };
+exports.dealWithNoAppId = dealWithNoAppId;
 const startAudit = async (config) => {
     if (!config.applicationId) {
-        config.applicationId = await dealWithNoAppId(config);
+        config.applicationId = await (0, exports.dealWithNoAppId)(config);
     }
     identifyLanguageAE(config.projectPath, languageFactory, config.applicationId, config);
 };

package/dist/commands/scan/processScan.js

@@ -1,12 +1,15 @@
 "use strict";
-const { startScan } = require('../../scan/scanController');
-const { scanUsageGuide } = require('../../scan/help');
 const scanConfig = require('../../scan/scanConfig');
+const { startScan } = require('../../scan/scanController');
 const { saveScanFile } = require('../../utils/saveFile');
 const { ScanResultsModel } = require('../../scan/models/scanResultsModel');
-const { formatScanOutput } = require('../../scan/scan');
+const { formatScanOutput } = require('../../scan/formatScanOutput');
+const { processSca } = require('./sca/scaAnalysis');
 const processScan = async (argvMain) => {
     let config = scanConfig.getScanConfig(argvMain);
+    if (config.experimental) {
+        await processSca(config);
+    }
     let scanResults = new ScanResultsModel(await startScan(config));
     if (scanResults) {
         formatScanOutput(scanResults);

package/dist/commands/scan/sca/scaAnalysis.js

@@ -0,0 +1,44 @@
+"use strict";
+const autoDetection = require('../../../scan/autoDetection');
+const { javaAnalysis } = require('../../../scaAnalysis/java');
+const { commonSendSnapShot } = require('../../../scaAnalysis/common/treeUpload');
+const { manualDetectAuditFilesAndLanguages } = require('../../../scan/autoDetection');
+const { dealWithNoAppId } = require('../../audit/auditController');
+const { supportedLanguages: { JAVA } } = require('../../../audit/languageAnalysisEngine/constants');
+const processSca = async (config) => {
+    let filesFound;
+    if (config.projectPath) {
+        filesFound = await manualDetectAuditFilesAndLanguages(config.projectPath);
+    }
+    else {
+        filesFound = await autoDetection.autoDetectAuditFilesAndLanguages(config);
+    }
+    let messageToSend = undefined;
+    if (filesFound.length === 1) {
+        switch (Object.keys(filesFound[0])[0]) {
+            case JAVA:
+                messageToSend = await javaAnalysis(config, filesFound[0]);
+                config.language = JAVA;
+                break;
+            default:
+                console.log('language detected not supported');
+                return;
+        }
+        if (!config.applicationId) {
+            config.applicationId = await dealWithNoAppId(config);
+        }
+        console.log('processing dependencies');
+        const response = await commonSendSnapShot(messageToSend, config);
+    }
+    else {
+        if (filesFound.length === 0) {
+            console.log('no compatible dependency files detected. Continuing...');
+        }
+        else {
+            console.log('multiple language files detected, please use --project-path to specify a directory or the file where dependencies are declared');
+        }
+    }
+};
+module.exports = {
+    processSca
+};

package/dist/common/HTTPClient.js

@@ -146,7 +146,6 @@ HTTPClient.prototype.catalogueCommand = function catalogueCommand(config) {
 };
 HTTPClient.prototype.sendSnapshot = function sendSnapshot(requestBody, config) {
     if (config.language.toUpperCase() === 'RUBY') {
-        console.log('sendSnapshot requestBody', requestBody.snapshot.ruby);
     }
     const options = _.cloneDeep(this.requestOptions);
     let url = createSnapshotURL(config);

package/dist/common/errorHandling.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findCommandOnError = exports.libraryAnalysisError = exports.handleResponseErrors = exports.getErrorMessage = exports.generalError = exports.hostWarningError = exports.failOptionError = exports.proxyError = exports.forbiddenError = exports.badRequestError = exports.unauthenticatedError = exports.genericError = void 0;
+exports.reportFailureError = exports.vulnerabilitiesFailureError = exports.snapshotFailureError = exports.findCommandOnError = exports.libraryAnalysisError = exports.handleResponseErrors = exports.getErrorMessage = exports.generalError = exports.failOptionError = exports.proxyError = exports.forbiddenError = exports.badRequestError = exports.unauthenticatedError = exports.genericError = void 0;
 const i18n_1 = __importDefault(require("i18n"));
 const handleResponseErrors = (res, api) => {
     if (res.statusCode === 400) {
@@ -36,23 +36,17 @@ const libraryAnalysisError = () => {
 };
 exports.libraryAnalysisError = libraryAnalysisError;
 const snapshotFailureError = () => {
-    console.log('\n ******************************** ' +
-        i18n_1.default.__('snapshotFailureHeader') +
-        ' *********************************\n' +
-        i18n_1.default.__('snapshotFailureMessage'));
+    console.log(i18n_1.default.__('snapshotFailureMessage'));
 };
+exports.snapshotFailureError = snapshotFailureError;
 const vulnerabilitiesFailureError = () => {
-    console.log('\n ******************************** ' +
-        i18n_1.default.__('snapshotFailureHeader') +
-        ' *********************************\n' +
-        i18n_1.default.__('vulnerabilitiesFailureMessage'));
+    console.log(i18n_1.default.__('vulnerabilitiesFailureMessage'));
 };
+exports.vulnerabilitiesFailureError = vulnerabilitiesFailureError;
 const reportFailureError = () => {
-    console.log('\n ******************************** ' +
-        i18n_1.default.__('snapshotFailureHeader') +
-        ' *********************************\n' +
-        i18n_1.default.__('reportFailureMessage'));
+    console.log(i18n_1.default.__('auditReportFailureMessage'));
 };
+exports.reportFailureError = reportFailureError;
 const genericError = (missingCliOption) => {
     console.log(`*************************** ${i18n_1.default.__('yamlMissingParametersHeader')} ***************************\n${missingCliOption}`);
     console.error(i18n_1.default.__('yamlMissingParametersMessage'));
@@ -78,10 +72,6 @@ const proxyError = () => {
     generalError('proxyErrorHeader', 'proxyErrorMessage');
 };
 exports.proxyError = proxyError;
-const hostWarningError = () => {
-    console.log(i18n_1.default.__('snapshotHostMessage'));
-};
-exports.hostWarningError = hostWarningError;
 const failOptionError = () => {
     console.log('\n ******************************** ' +
         i18n_1.default.__('snapshotFailureHeader') +

package/dist/constants/constants.js

@@ -12,11 +12,17 @@ const MEDIUM = 'MEDIUM';
 const HIGH = 'HIGH';
 const CRITICAL = 'CRITICAL';
 const APP_NAME = 'contrast';
-const APP_VERSION = '1.0.4';
+const APP_VERSION = '1.0.5';
 const TIMEOUT = 120000;
+const HIGH_COLOUR = '#ff9900';
+const CRITICAL_COLOUR = '#e35858';
+const MEDIUM_COLOUR = '#f1c232';
+const LOW_COLOUR = '#ff9900';
+const NOTE_COLOUR = '#999999';
 const AUTH_UI_URL = 'https://cli-auth.contrastsecurity.com';
 const AUTH_CALLBACK_URL = 'https://cli-auth-api.contrastsecurity.com';
 const SARIF_FILE = 'SARIF';
+const CE_URL = 'https://ce.contrastsecurity.com/';
 module.exports = {
     supportedLanguages: { NODE, DOTNET, JAVA, RUBY, PYTHON, GO, PHP, JAVASCRIPT },
     LOW,
@@ -28,5 +34,11 @@ module.exports = {
     TIMEOUT,
     AUTH_UI_URL,
     AUTH_CALLBACK_URL,
-    SARIF_FILE
+    SARIF_FILE,
+    HIGH_COLOUR,
+    CRITICAL_COLOUR,
+    MEDIUM_COLOUR,
+    LOW_COLOUR,
+    NOTE_COLOUR,
+    CE_URL
 };

package/dist/constants/locales.js

@@ -4,41 +4,29 @@ const chalk = require('chalk');
 const en_locales = () => {
     return {
         successHeader: 'SUCCESS',
-        snapshotSuccessMessage: ' Please go to the Contrast UI to view your dependency tree.',
+        snapshotSuccessMessage: 'Please go to the Contrast UI to view your dependency tree.',
         snapshotFailureHeader: 'FAIL',
-        snapshotFailureMessage: ' Unable to send library analysis to your Contrast UI.',
-        snapshotHostMessage: " No host supplied. Using default host 'app.contrastsecurity.com'. Please ensure this is correct.",
-        vulnerabilitiesSuccessMessage: ' Vulnerability data successfully retrieved',
-        vulnerabilitiesFailureMessage: ' Unable to retrieve library vulnerabilities from Team Server.',
+        snapshotFailureMessage: 'Library analysis failed',
+        snapshotHostMessage: "No host supplied. Using default host 'app.contrastsecurity.com'. Please ensure this is correct.",
+        vulnerabilitiesSuccessMessage: 'Vulnerability data successfully retrieved',
+        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: 'LANGUAGE ANALYSIS FAILED',
+        languageAnalysisFailureMessage: 'SCA Analysis Failure',
         languageAnalysisFactoryFailureHeader: 'FAIL',
-        projectPathParameter: 'Please set the %s to locate the source code for the project',
-        apiKeyParameter: 'Please set the %s to connect to the Contrast UI',
-        applicationNameParameter: 'Please provide a value for %s, to appear in the Contrast UI',
-        languageParameter: 'Please set the %s to the language of the source project. Allowable values are JAVA, DOTNET, NODE, PYTHON and RUBY.',
-        hostParameter: 'Please set the %s to the hostname and (optionally) the port expressed as <host>:<port> of the Contrast UI',
-        organizationIdParameter: 'Please set the %s to correctly identify your organization within the Contrast UI',
-        authorizationParameter: 'Please set the %s to your authorization header, found in the Contrast UI',
-        applicationIdParameter: 'Please set the %s to the value provided within the Contrast UI for the target application',
-        libraryAnalysisError: 'Please ensure the language parameter is set in accordance to the language specified on the project path.\nThe Contrast-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',
+        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 \napplication_name or application_id \nlanguage \n \nThey must be specified as a command line argument or within the yaml file. \nFor further information please read our usage guide, which can be accessed with the following command:\ncontrast-cli --help',
+        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',
         unauthenticatedErrorHeader: '401 error - Unauthenticated',
-        unauthenticatedErrorMessage: 'Please check the following keys are correct:\n--organization_id, --api_key or --authorization',
+        unauthenticatedErrorMessage: 'Please check the following keys are correct:\n--organization-id, --api-key or --authorization',
         badRequestErrorHeader: '400 error - Bad Request',
-        badRequestErrorMessage: 'Please check the following key is correct: \n--application_id',
+        badRequestErrorMessage: 'Please check the following key is correct: \n--application-id',
         badRequestCatalogueErrorMessage: 'The application name already exists, please use a unique name',
         forbiddenRequestErrorHeader: '403 error - Forbidden',
         forbiddenRequestErrorMessage: 'You do not have permission to access this server.',
         proxyErrorHeader: '407 error - Proxy Authentication Required',
         proxyErrorMessage: 'Please provide valid authentication credentials for the proxy server.',
-        downgradeHttpsHttp: 'Connection to ContrastUI using https failed.  Attempting to connect using http...',
-        setSpecifiedParameter: 'Please set the %s ',
-        catalogueFailureCommand: 'Failed to catalogue a new application for reason: ',
-        catalogueFailureHostCommand: 'Failed to catalogue a new application, please ensure you have the correct host and authentication. Error: ',
-        catalogueSuccessCommand: 'This application ID can now be used to send dependency data to Contrast: ',
+        catalogueSuccessCommand: 'Application Created',
         dotnetAnalysisFailure: '.NET analysis failed because: ',
         dotnetReadLockfile: 'Failed to read the lock file @ %s because: ',
         dotnetParseLockfile: "Failed to parse .NET lock file @ '%s' because: ",
@@ -82,10 +70,9 @@ const en_locales = () => {
         constantsOptionalForCatalogue: '(optional for catalogue)',
         constantsRequired: '(required)',
         constantsRequiredCatalogue: '(required for catalogue)',
-        constantsYamlPath: 'If you want to read params from the yaml file then enter the path to the file',
         constantsApiKey: 'An agent API key as provided by Contrast UI',
-        constantsAuthorization: 'An agent Authorization credentials as provided by Contrast UI',
-        constantsOrganizationId: 'The ID of your organization in Contrast UI',
+        constantsAuthorization: 'Authorization credentials as provided by Contrast UI',
+        constantsOrganizationId: 'The ID of your organization',
         constantsApplicationId: 'The ID of the application cataloged by Contrast UI',
         constantsHostId: 'Provide the name of the host and optionally the port expressed as "<host>:<port>".',
         constantsApplicationName: 'The name of the application cataloged by Contrast UI',
@@ -163,17 +150,17 @@ const en_locales = () => {
         goReadProjectFile: 'Failed to read the project file @ "%s" because: "%s"',
         goAnalysisError: 'GO analysis failed because: ',
         goParseProjectFile: 'Failed to parse go mod graph output because: ',
-        mavenNotInstalledError: " 'mvn' is not available. Please ensure you have Maven installed and available on your path.",
+        mavenNotInstalledError: "'mvn' is not available. Please ensure you have Maven installed and available on your path.",
         mavenDependencyTreeNonZero: 'Building maven dependancy tree failed with a non 0 exit code',
-        gradleWrapperUnavailable: ' Gradle wrapper not found in root of project. Please ensure gradlew or gradlew.bat is in root of the project.',
+        gradleWrapperUnavailable: 'Gradle wrapper not found in root of project. Please ensure gradlew or gradlew.bat is in root of the project.',
         gradleDependencyTreeNonZero: "Building gradle dependancy tree failed with a non 0 exit code. \n Please check you have the correct version of Java installed to compile your project? \n If running against a muti module project ensure you are using the '--sub-project' flag",
-        yamlPathCamelCaseError: ' Warning: The "yamlPath" parameter will be deprecated in a future release. Please look at our documentation for further guidance.',
-        constantsSbom: ' Generate the Software Bill of Materials (SBOM) for the given application',
+        yamlPathCamelCaseError: 'Warning: The "yamlPath" parameter will be deprecated in a future release. Please look at our documentation for further guidance.',
+        constantsSbom: 'Generate the Software Bill of Materials (SBOM) for the given application',
         constantsMetadata: 'Define a set of key=value pairs (which conforms to RFC 2253) for specifying user-defined metadata associated with the application.',
         constantsTags: 'Apply labels to an application. Labels must be formatted as a comma-delimited list. Example - label1,label2,label3',
         constantsCode: 'Add the application code this application should use in the Contrast UI',
-        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.',
+        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.',
         constantsCommands: 'Commands',
@@ -189,8 +176,9 @@ const en_locales = () => {
         waitingTimedOut: 'Timed out.',
         responseMessage: 'Response: %s',
         searchingDirectoryScan: 'Searched 3 directory levels & found: ',
-        noFileFoundScan: "We could't find a suitable file in your directories (we go 3 deep)",
+        noFileFoundScan: "We couldn't find a suitable file in your directories (we go 3 deep)",
         specifyFileScanError: 'Java Scan requires a .war or .jar file. Javascript Scan requires a .js or .zip file.\nTo start a Scan enter "contrast scan -f <path-to-file>"',
+        specifyFileAuditNotFound: 'No files found for library analysis',
         populateProjectIdMessage: 'project ID is %s',
         genericServiceError: 'returned with status code %s',
         projectIdError: 'Your project ID is %s please check this is correct',
@@ -229,6 +217,7 @@ const en_locales = () => {
         requiredParams: 'All required parameters are not present.',
         timeoutScan: 'Timeout set to 5 minutes.',
         searchingScanFileDirectory: 'Searching for file to scan from %s...',
+        searchingAuditFileDirectory: 'Searching for package manager files from %s...',
         scanHeader: 'Contrast Scan CLI',
         authHeader: 'Auth',
         lambdaHeader: 'Contrast Lambda CLI',
@@ -288,15 +277,19 @@ const en_locales = () => {
         auditOptionsIgnoreDevDependenciesDescription: 'ignores DevDependencies',
         auditOptionsSave: '-s, --save',
         auditOptionsSaveDescription: 'saves the output in specified format Txt text, sbom',
+        scanNotCompleted: 'Scan not completed. Check for framework and language support here: %s',
         scanNoVulnerabilitiesFound: '👏 No vulnerabilities found',
+        scanNoVulnerabilitiesFoundSecureCode: '👍 Your code looks secure.',
+        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.')}`,
         auditBadFiletypeSpecifiedForSave: `\n ${chalk.yellow.bold('Bad file type specified for --save option. Use audit --help to see valid --save options.')}`,
         auditReportWaiting: 'Waiting for report...',
         auditReportFail: 'Report Retrieval Failed, please try again',
-        auditReportSuccessMessage: ' Report successfully retrieved',
-        auditReportFailureMessage: ' Unable to generate library report.',
+        auditReportSuccessMessage: 'Report successfully retrieved',
+        auditReportFailureMessage: 'Unable to generate library report',
+        auditSCAAnalysisBegins: 'Contrast SCA analysis begins',
         ...lambda
     };
 };

package/dist/constants.js

@@ -41,6 +41,14 @@ const scanOptionDefinitions = [
             '}: ' +
             i18n.__('constantsProjectId')
     },
+    {
+        name: 'project-path',
+        alias: 'i',
+        description: '{bold ' +
+            i18n.__('constantsOptional') +
+            '}: ' +
+            i18n.__('constantsProjectPath')
+    },
     {
         name: 'timeout',
         alias: 't',
@@ -129,6 +137,18 @@ const scanOptionDefinitions = [
         name: 'debug',
         alias: 'd',
         type: Boolean
+    },
+    {
+        name: 'experimental',
+        alias: 'e',
+        type: Boolean
+    },
+    {
+        name: 'application-name',
+        description: '{bold ' +
+            i18n.__('constantsOptional') +
+            '}: ' +
+            i18n.__('constantsApplicationName')
     }
 ];
 const authOptionDefinitions = [

package/dist/scaAnalysis/common/formatMessage.js

@@ -0,0 +1,11 @@
+"use strict";
+const createJavaTSMessage = javaTree => {
+    return {
+        java: {
+            mavenDependencyTrees: javaTree
+        }
+    };
+};
+module.exports = {
+    createJavaTSMessage
+};