@contrast/contrast 1.0.17 → 1.0.19

package/dist/cliConstants.js

@@ -10,7 +10,7 @@ i18n.configure({
     },
     defaultLocale: 'en'
 });
-const sharedOptionDefinitions = [
+const sharedCertOptionDefinitions = [
     {
         name: 'proxy',
         description: '{bold ' +
@@ -40,40 +40,48 @@ const sharedOptionDefinitions = [
             i18n.__('constantsProxyCert')
     },
     {
-        name: 'ignore-cert-errors',
+        name: 'cert-self-signed',
         type: Boolean,
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}:' +
-            i18n.__('constantsIgnoreCertErrors')
+            i18n.__('constantsCertSelfSigned')
     }
 ];
-const scanOptionDefinitions = [
-    ...sharedOptionDefinitions,
+const sharedConnectionOptionDefinitions = [
     {
-        name: 'name',
-        alias: 'n',
+        name: 'organization-id',
+        alias: 'o',
         description: '{bold ' +
-            i18n.__('constantsOptional') +
+            i18n.__('constantsRequiredEnterprise') +
             '}: ' +
-            i18n.__('constantsProjectName')
+            i18n.__('constantsOrganizationId')
     },
     {
-        name: 'language',
-        alias: 'l',
+        name: 'api-key',
         description: '{bold ' +
-            i18n.__('constantsOptional') +
+            i18n.__('constantsRequiredEnterprise') +
             '}: ' +
-            i18n.__('scanOptionsLanguageSummary')
+            i18n.__('constantsApiKey')
     },
     {
-        name: 'file',
-        alias: 'f',
+        name: 'authorization',
         description: '{bold ' +
-            i18n.__('constantsOptional') +
+            i18n.__('constantsRequiredEnterprise') +
             '}: ' +
-            i18n.__('scanOptionsFileNameSummary')
+            i18n.__('constantsAuthorization')
     },
+    {
+        name: 'host',
+        description: '{bold ' +
+            i18n.__('constantsRequiredEnterprise') +
+            '}: ' +
+            i18n.__('constantsHostId')
+    }
+];
+const scanAdvancedOptionDefinitionsForHelp = [
+    ...sharedConnectionOptionDefinitions,
+    ...sharedCertOptionDefinitions,
     {
         name: 'project-id',
         alias: 'p',
@@ -83,49 +91,52 @@ const scanOptionDefinitions = [
             i18n.__('constantsProjectId')
     },
     {
-        name: 'project-path',
+        name: 'language',
+        alias: 'l',
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsProjectPath')
+            i18n.__('scanOptionsLanguageSummary')
     },
     {
-        name: 'timeout',
-        alias: 't',
-        type: Number,
+        name: 'ff',
+        type: Boolean,
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('scanOptionsTimeoutSummary')
+            i18n.__('constantsDoNotWaitForScan')
     },
     {
-        name: 'organization-id',
-        alias: 'o',
-        description: '{bold ' +
-            i18n.__('constantsRequired') +
-            '}: ' +
-            i18n.__('constantsOrganizationId')
-    },
+        name: 'label',
+        description: '{bold ' + i18n.__('constantsOptional') + '}:' + i18n.__('scanLabel')
+    }
+];
+const scanOptionDefinitions = [
+    ...scanAdvancedOptionDefinitionsForHelp,
     {
-        name: 'api-key',
+        name: 'name',
+        alias: 'n',
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsApiKey')
+            i18n.__('constantsProjectName')
     },
     {
-        name: 'authorization',
+        name: 'file',
+        alias: 'f',
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsAuthorization')
+            i18n.__('scanOptionsFileNameSummary')
     },
     {
-        name: 'host',
+        name: 'timeout',
+        alias: 't',
+        type: Number,
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsHostId')
+            i18n.__('scanOptionsTimeoutSummary')
     },
     {
         name: 'fail',
@@ -143,14 +154,6 @@ const scanOptionDefinitions = [
             '}: ' +
             i18n.__('constantsSeverity')
     },
-    {
-        name: 'ff',
-        type: Boolean,
-        description: '{bold ' +
-            i18n.__('constantsOptional') +
-            '}: ' +
-            i18n.__('constantsDoNotWaitForScan')
-    },
     {
         name: 'verbose',
         alias: 'v',
@@ -165,10 +168,6 @@ const scanOptionDefinitions = [
         alias: 's',
         description: '{bold ' + i18n.__('constantsOptional') + '}:' + i18n.__('constantsSave')
     },
-    {
-        name: 'label',
-        description: '{bold ' + i18n.__('constantsOptional') + '}:' + i18n.__('scanLabel')
-    },
     {
         name: 'help',
         alias: 'h',
@@ -183,16 +182,10 @@ const scanOptionDefinitions = [
         name: 'experimental',
         alias: 'e',
         type: Boolean
-    },
-    {
-        name: 'application-name',
-        description: '{bold ' +
-            i18n.__('constantsOptional') +
-            '}: ' +
-            i18n.__('constantsApplicationName')
     }
 ];
 const authOptionDefinitions = [
+    ...sharedConnectionOptionDefinitions,
     {
         name: 'help',
         alias: 'h',
@@ -213,8 +206,9 @@ const configOptionDefinitions = [
         description: 'Clear the currently stored config'
     }
 ];
-const auditOptionDefinitions = [
-    ...sharedOptionDefinitions,
+const auditAdvancedOptionDefinitionsForHelp = [
+    ...sharedConnectionOptionDefinitions,
+    ...sharedCertOptionDefinitions,
     {
         name: 'application-id',
         description: '{bold ' +
@@ -229,35 +223,10 @@ const auditOptionDefinitions = [
             '}: ' +
             i18n.__('constantsApplicationName')
     },
-    {
-        name: 'file',
-        alias: 'f',
-        defaultValue: process.cwd().concat('/'),
-        description: '{bold ' +
-            i18n.__('constantsOptional') +
-            '}: ' +
-            i18n.__('constantsFilePath')
-    },
-    {
-        name: 'fail',
-        type: Boolean,
-        description: '{bold ' +
-            i18n.__('constantsOptional') +
-            '}: ' +
-            i18n.__('failOptionMessage')
-    },
-    {
-        name: 'severity',
-        type: severity => parseSeverity(severity),
-        description: '{bold ' +
-            i18n.__('constantsOptional') +
-            '}: ' +
-            i18n.__('constantsSeverity')
-    },
     {
         name: 'app-groups',
         description: '{bold ' +
-            i18n.__('constantsOptionalForCatalogue') +
+            i18n.__('constantsOptional') +
             '}: ' +
             i18n.__('constantsAppGroups')
     },
@@ -284,49 +253,52 @@ const auditOptionDefinitions = [
         description: '{bold ' + i18n.__('constantsOptional') + '}: ' + i18n.__('constantsCode')
     },
     {
-        name: 'ignore-dev',
-        type: Boolean,
-        alias: 'i',
+        name: 'maven-settings-path',
         description: '{bold ' +
             i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsIgnoreDev')
-    },
-    {
-        name: 'maven-settings-path'
-    },
-    {
-        name: 'fingerprint',
-        type: Boolean
-    },
+            i18n.__('constantsMavenSettingsPath')
+    }
+];
+const auditOptionDefinitions = [
+    ...auditAdvancedOptionDefinitionsForHelp,
     {
-        name: 'organization-id',
-        alias: 'o',
+        name: 'file',
+        alias: 'f',
+        defaultValue: process.cwd().concat('/'),
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsOrganizationId')
+            i18n.__('constantsFilePath')
     },
     {
-        name: 'api-key',
+        name: 'fail',
+        type: Boolean,
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsApiKey')
+            i18n.__('failOptionMessage')
     },
     {
-        name: 'authorization',
+        name: 'severity',
+        type: severity => parseSeverity(severity),
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsAuthorization')
+            i18n.__('constantsSeverity')
     },
     {
-        name: 'host',
+        name: 'ignore-dev',
+        type: Boolean,
+        alias: 'i',
         description: '{bold ' +
-            i18n.__('constantsRequired') +
+            i18n.__('constantsOptional') +
             '}: ' +
-            i18n.__('constantsHostId')
+            i18n.__('constantsIgnoreDev')
+    },
+    {
+        name: 'fingerprint',
+        type: Boolean
     },
     {
         name: 'save',
@@ -410,6 +382,10 @@ const mainUsageGuide = commandLineUsage([
             { name: i18n.__('helpName'), summary: i18n.__('helpSummary') }
         ]
     },
+    {
+        header: i18n.__('constantsAdvancedOptions'),
+        optionList: sharedCertOptionDefinitions
+    },
     {
         header: i18n.__('configHeader2'),
         content: [
@@ -427,6 +403,8 @@ module.exports = {
         scanOptionDefinitions,
         auditOptionDefinitions,
         authOptionDefinitions,
-        configOptionDefinitions
+        configOptionDefinitions,
+        scanAdvancedOptionDefinitionsForHelp,
+        auditAdvancedOptionDefinitionsForHelp
     }
 };

package/dist/commands/audit/help.js

@@ -34,9 +34,12 @@ const auditUsageGuide = commandLineUsage([
             'authorization',
             'host',
             'proxy',
+            'cert',
+            'cacert',
+            'key',
             'help',
             'ff',
-            'ignore-cert-errors',
+            'cert-self-signed',
             'verbose',
             'debug',
             'experimental',
@@ -49,9 +52,14 @@ const auditUsageGuide = commandLineUsage([
             'app-groups',
             'metadata',
             'track',
-            'fingerprint'
+            'fingerprint',
+            'branch'
         ]
     },
+    {
+        header: i18n.__('constantsAdvancedOptions'),
+        optionList: constants.commandLineDefinitions.auditAdvancedOptionDefinitionsForHelp
+    },
     commonHelpLinks()[0],
     commonHelpLinks()[1]
 ]);

package/dist/commands/auth/auth.js

@@ -1,21 +1,31 @@
 "use strict";
 const { v4: uuidv4 } = require('uuid');
-const { setConfigValues } = require('../../utils/getConfig');
-const open = require('open');
+const configFunctions = require('../../utils/getConfig');
 const commonApi = require('../../utils/commonApi');
-const { sleep } = require('../../utils/requestUtils');
+const requestUtils = require('../../utils/requestUtils');
 const i18n = require('i18n');
 const { returnOra, startSpinner, failSpinner, succeedSpinner } = require('../../utils/oraWrapper');
 const { TIMEOUT, AUTH_UI_URL } = require('../../constants/constants');
 const parsedCLIOptions = require('../../utils/parsedCLIOptions');
 const constants = require('../../cliConstants');
 const commandLineUsage = require('command-line-usage');
+const { commonMessageFormatter } = require('../../common/errorHandling');
+const open = require('open');
+const messages = require('../../constants/locales').en_locales();
 const processAuth = async (argv, config) => {
     let authParams = await parsedCLIOptions.getCommandLineArgsCustom(config, 'auth', argv, constants.commandLineDefinitions.authOptionDefinitions);
     if (authParams.help) {
         console.log(authUsageGuide);
         process.exit(0);
     }
+    if (checkForCustomCredentials(authParams)) {
+        processCustomCredentials(authParams, config);
+    }
+    else {
+        await startAuthProcess(config);
+    }
+};
+const startAuthProcess = async (config) => {
     const token = uuidv4();
     const url = `${AUTH_UI_URL}/?token=${token}`;
     console.log(i18n.__('redirectAuth', url));
@@ -25,9 +35,8 @@ const processAuth = async (argv, config) => {
         }, 0);
         const result = await isAuthComplete(token, TIMEOUT, config);
         if (result) {
-            setConfigValues(config, result);
+            configFunctions.setConfigValues(config, result);
         }
-        return;
     }
     finally {
     }
@@ -54,7 +63,7 @@ const isAuthComplete = async (token, timeout, config) => {
     }
 };
 const pollAuthResult = async (token, client) => {
-    await sleep(5000);
+    await requestUtils.sleep(5000);
     return client
         .pollForAuth(token)
         .then(res => {
@@ -74,6 +83,33 @@ const authUsageGuide = commandLineUsage([
         content: [i18n.__('constantsAuthUsageContents')]
     }
 ]);
+const checkForCustomCredentials = authParams => {
+    const hasSomeKeys = authParams.apiKey ||
+        authParams.organizationId ||
+        authParams.host ||
+        authParams.authorization;
+    const hasAllKeys = authParams.apiKey &&
+        authParams.organizationId &&
+        authParams.host &&
+        authParams.authorization;
+    if (hasAllKeys) {
+        return true;
+    }
+    if (hasSomeKeys) {
+        commonMessageFormatter(messages.authCommand.credentialsMissing, true);
+    }
+    return false;
+};
+const processCustomCredentials = (authParams, config) => {
+    const valuesToSet = {
+        apiKey: authParams.apiKey,
+        orgId: authParams.organizationId,
+        authHeader: authParams.authorization,
+        host: authParams.host
+    };
+    configFunctions.setConfigValues(config, valuesToSet);
+    commonMessageFormatter(messages.authCommand.credentialsAccepted, false);
+};
 module.exports = {
-    processAuth: processAuth
+    processAuth
 };

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

@@ -46,6 +46,7 @@ const processSca = async (config) => {
     }
     else {
         filesFound = await autoDetection.autoDetectAuditFilesAndLanguages(config.file);
+        autoDetection.dealWithMultiJava(filesFound);
         if (filesFound.length > 1 && pathWithFile) {
             filesFound = filesFound.filter(i => Object.values(i)[0].includes(path.basename(config.fileName)));
         }

package/dist/common/HTTPClient.js

@@ -6,7 +6,7 @@ const { AUTH_CALLBACK_URL } = require('../constants/constants');
 function HTTPClient(config) {
     const apiKey = config.apiKey;
     const authToken = config.authorization;
-    this.rejectUnauthorized = !config.ignoreCertErrors;
+    this.rejectUnauthorized = !config.certSelfSigned;
     const superApiKey = config.superApiKey;
     const superAuthToken = config.superAuthorization;
     this.requestOptions = {
@@ -332,18 +332,18 @@ function createSnapshotURL(config) {
     return `${config.host}/Contrast/api/ng/sca/organizations/${config.organizationId}/applications/${config.applicationId}/snapshots`;
 }
 function createScaServiceReportURL(config, reportId) {
-    let baseUrl = `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/libraries/applications/${config.applicationId}/reports/${reportId}`;
+    let baseUrl = `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/applications/${config.applicationId}/libraries/reports/${reportId}`;
     baseUrl = config.ignoreDev ? baseUrl.concat('?nodesToInclude=PROD') : baseUrl;
     return baseUrl;
 }
 function createScaServiceReportStatusURL(config, reportId) {
-    return `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/libraries/ingests/${reportId}/status`;
+    return `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/applications/${config.applicationId}/libraries/ingests/${reportId}/status`;
 }
 function createScaServiceIngestsURL(config) {
-    return `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/libraries/ingests`;
+    return `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/applications/${config.applicationId}/libraries/ingests`;
 }
 function createScaServiceIngestURL(config) {
-    let baseUrl = `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/libraries/ingests/tree`;
+    let baseUrl = `${config.host}/Contrast/api/sca/organizations/${config.organizationId}/applications/${config.applicationId}/libraries/ingests/tree`;
     baseUrl = config.track ? baseUrl.concat('?persist=true') : baseUrl;
     return baseUrl;
 }

package/dist/common/errorHandling.js

@@ -1,5 +1,6 @@
 "use strict";
 const i18n = require('i18n');
+const chalk = require('chalk');
 const libraryAnalysisError = () => {
     console.log(i18n.__('libraryAnalysisError'));
 };
@@ -35,6 +36,14 @@ const maxAppError = () => {
     generalError('No applications remaining', 'You have reached the maximum number of application you can create.');
     process.exit(1);
 };
+const parametersError = () => {
+    generalError(`Values not recognised`, 'Check your command & keys again for hidden characters.\nFor more information use contrast help.');
+    process.exit(1);
+};
+const invalidHostNameError = () => {
+    generalError(`Invalid host`, 'Check that the host parameter does not include a trailing "/".');
+    process.exit(1);
+};
 const failOptionError = () => {
     console.log('\n ******************************** ' +
         i18n.__('snapshotFailureHeader') +
@@ -71,6 +80,16 @@ const findCommandOnError = unknownOptions => {
         return foundCommands[0];
     }
 };
+const commonMessageFormatter = (message, fail) => {
+    console.log(chalk.bold(i18n.__(message.title)));
+    console.log(i18n.__(message.body));
+    if (message.extra) {
+        console.log(i18n.__(message.extra));
+    }
+    if (fail) {
+        process.exit(1);
+    }
+};
 module.exports = {
     genericError,
     unauthenticatedError,
@@ -85,5 +104,8 @@ module.exports = {
     snapshotFailureError,
     vulnerabilitiesFailureError,
     reportFailureError,
-    maxAppError
+    maxAppError,
+    parametersError,
+    invalidHostNameError,
+    commonMessageFormatter
 };

package/dist/constants/constants.js

@@ -12,7 +12,7 @@ const MEDIUM = 'MEDIUM';
 const HIGH = 'HIGH';
 const CRITICAL = 'CRITICAL';
 const APP_NAME = 'contrast';
-const APP_VERSION = '1.0.17';
+const APP_VERSION = '1.0.19';
 const TIMEOUT = 120000;
 const HIGH_COLOUR = '#ff9900';
 const CRITICAL_COLOUR = '#e35858';