@contrast/contrast 1.0.10 → 1.0.13

package/src/{audit/languageAnalysisEngine/util → utils}/generalAPI.js

@@ -1,13 +1,13 @@
 const { featuresTeamServer } = require('./capabilities')
 const semver = require('semver')
-const { handleResponseErrors } = require('../../../common/errorHandling')
-const { getHttpClient } = require('../../../utils/commonApi')
+const { handleResponseErrors } = require('../common/errorHandling')
+const commonApi = require('./commonApi')
+const { isNil } = require('lodash')
 
 const getGlobalProperties = async config => {
-  const client = getHttpClient(config)
-
+  const client = commonApi.getHttpClient(config)
   return client
-    .getGlobalProperties(config)
+    .getGlobalProperties(config.host)
     .then(res => {
       if (res.statusCode === 200) {
         return res.body
@@ -20,6 +20,15 @@ const getGlobalProperties = async config => {
     })
 }
 
+const getMode = async config => {
+  const features = await getGlobalProperties(config)
+
+  if (!isNil(features?.mode)) {
+    return features.mode
+  }
+  return ''
+}
+
 const getFeatures = version => {
   const featuresEnabled = []
 
@@ -39,5 +48,6 @@ const isFeatureEnabled = (features, featureName) => {
 module.exports = {
   getGlobalProperties,
   getFeatures,
-  isFeatureEnabled
+  isFeatureEnabled,
+  getMode
 }

package/src/utils/getConfig.ts

@@ -1,4 +1,5 @@
 import Conf from 'conf'
+import { CE_URL } from '../constants/constants'
 
 type ContrastConfOptions = Partial<{
   version: string
@@ -7,7 +8,6 @@ type ContrastConfOptions = Partial<{
   orgId: string
   authHeader: string
   numOfRuns: number
-  updateMessageHidden: boolean
 }>
 
 type ContrastConf = Conf<ContrastConfOptions>
@@ -18,17 +18,8 @@ const localConfig = (name: string, version: string) => {
   })
   config.set('version', version)
 
-  if (process.env.CONTRAST_CODSEC_DISABLE_UPDATE_MESSAGE) {
-    config.set(
-      'updateMessageHidden',
-      JSON.parse(
-        process.env.CONTRAST_CODSEC_DISABLE_UPDATE_MESSAGE.toLowerCase()
-      )
-    )
-  }
-
   if (!config.has('host')) {
-    config.set('host', 'https://ce.contrastsecurity.com/')
+    config.set('host', CE_URL)
   }
   return config
 }

package/src/utils/parsedCLIOptions.js

@@ -1,6 +1,12 @@
 const commandLineArgs = require('command-line-args')
+const { sendTelemetryConfigAsConfObj } = require('../telemetry/telemetry')
 
-const getCommandLineArgsCustom = (parameterList, optionDefinitions) => {
+const getCommandLineArgsCustom = async (
+  contrastConf,
+  command,
+  parameterList,
+  optionDefinitions
+) => {
   try {
     return commandLineArgs(optionDefinitions, {
       argv: parameterList,
@@ -9,6 +15,13 @@ const getCommandLineArgsCustom = (parameterList, optionDefinitions) => {
       caseInsensitive: true
     })
   } catch (e) {
+    await sendTelemetryConfigAsConfObj(
+      contrastConf,
+      command,
+      parameterList,
+      'FAILURE',
+      'undefined'
+    )
     console.log(e.message.toString())
     process.exit(1)
   }

package/src/utils/requestUtils.js

@@ -15,8 +15,15 @@ const sleep = ms => {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
+const timeOutError = (ms, reject) => {
+  return setTimeout(() => {
+    reject(new Error(`No input detected after 30s`))
+  }, ms)
+}
+
 module.exports = {
   sendRequest: sendRequest,
   sleep: sleep,
-  millisToSeconds: millisToSeconds
+  millisToSeconds: millisToSeconds,
+  timeOutError: timeOutError
 }