@contrast/contrast 1.0.0 → 1.0.1

package/src/scan/scanConfig.js

@@ -0,0 +1,29 @@
+const paramHandler = require('../utils/paramsUtil/paramHandler')
+const constants = require('../../src/constants.js')
+const parsedCLIOptions = require('../../src/utils/parsedCLIOptions')
+const path = require('path')
+
+const getScanConfig = argv => {
+  let scanParams = parsedCLIOptions.getCommandLineArgsCustom(
+    argv,
+    constants.commandLineDefinitions.scanOptionDefinitions
+  )
+  const paramsAuth = paramHandler.getAuth(scanParams)
+
+  // if no name, take the full file path and use it as the project name
+  if (!scanParams.name && scanParams.file) {
+    scanParams.name = getFileName(scanParams.file)
+  }
+
+  return { ...paramsAuth, ...scanParams }
+}
+
+const getFileName = file => {
+  // from '/Users/x/y/spring-async.war' to 'spring-async.war'
+  return file.split(path.sep).pop()
+}
+
+module.exports = {
+  getScanConfig,
+  getFileName
+}

package/src/scan/scanController.js

@@ -8,7 +8,6 @@ const populateProjectIdAndProjectName = require('./populateProjectIdAndProjectNa
 const scan = require('./scan')
 const scanResults = require('./scanResults')
 const autoDetection = require('./autoDetection')
-const paramHandler = require('../utils/paramsUtil/paramHandler')
 const fileFunctions = require('./fileUtils')
 
 const getTimeout = config => {
@@ -22,21 +21,22 @@ const getTimeout = config => {
   }
 }
 
-const startScan = async () => {
-  let paramsAuth = paramHandler.getAuth()
-  let getScanSubCommands = paramHandler.getScanSubCommands()
-  const configToUse = { ...paramsAuth, ...getScanSubCommands }
-  if (configToUse.file === undefined || configToUse.file === null) {
-    await autoDetection.autoDetectFileAndLanguage(configToUse)
-  } else {
-    if (fileFunctions.fileExists(configToUse.file)) {
-      scan.zipValidator(configToUse)
-      autoDetection.assignLanguage([configToUse.file], configToUse)
-    } else {
+const fileAndLanguageLogic = async configToUse => {
+  if (configToUse.file) {
+    if (!fileFunctions.fileExists(configToUse.file)) {
       console.log(i18n.__('fileNotExist'))
       process.exit(0)
     }
+    return configToUse
+  } else {
+    if (configToUse.file === undefined || configToUse.file === null) {
+      await autoDetection.autoDetectFileAndLanguage(configToUse)
+    }
   }
+}
+
+const startScan = async configToUse => {
+  await fileAndLanguageLogic(configToUse)
 
   if (!configToUse.projectId) {
     configToUse.projectId = await populateProjectIdAndProjectName.populateProjectId(
@@ -60,7 +60,7 @@ const startScan = async () => {
     )
     succeedSpinner(startScanSpinner, 'Contrast Scan complete')
     const projectOverview = await scanResults.returnScanProjectById(configToUse)
-    return { projectOverview, scanResultsInstances }
+    return { projectOverview, scanDetail, scanResultsInstances }
   }
 }
 

package/src/scan/scanResults.js

@@ -1,7 +1,7 @@
 const commonApi = require('../utils/commonApi')
 const requestUtils = require('../../src/utils/requestUtils')
-const i18n = require('i18n')
 const oraFunctions = require('../utils/oraWrapper')
+const _ = require('lodash')
 
 const getScanId = async (config, codeArtifactId, client) => {
   return client
@@ -36,28 +36,30 @@ const returnScanResults = async (
   let scanId = await getScanId(config, codeArtifactId, client)
   let startTime = new Date()
   let complete = false
-  while (!complete) {
-    let result = await pollScanResults(config, scanId, client)
-    if (JSON.stringify(result.statusCode) == 200) {
-      if (result.body.status === 'COMPLETED') {
-        complete = true
-        return result.body
+  if (!_.isNil(scanId)) {
+    while (!complete) {
+      let result = await pollScanResults(config, scanId, client)
+      if (JSON.stringify(result.statusCode) == 200) {
+        if (result.body.status === 'COMPLETED') {
+          complete = true
+          return result.body
+        }
+        if (result.body.status === 'FAILED') {
+          complete = true
+          oraFunctions.failSpinner(startScanSpinner, 'Contrast Scan Failed.')
+          process.exit(1)
+        }
       }
-      if (result.body.status === 'FAILED') {
-        complete = true
-        oraFunctions.failSpinner(startScanSpinner, 'Contrast Scan Failed.')
+      let endTime = new Date() - startTime
+      if (requestUtils.millisToSeconds(endTime) > timeout) {
+        oraFunctions.failSpinner(
+          startScanSpinner,
+          'Contrast Scan timed out at the specified ' + timeout + ' seconds.'
+        )
+        console.log('Please try again, allowing more time.')
         process.exit(1)
       }
     }
-    let endTime = new Date() - startTime
-    if (requestUtils.millisToSeconds(endTime) > timeout) {
-      oraFunctions.failSpinner(
-        startScanSpinner,
-        'Contrast Scan timed out at the specified ' + timeout + ' seconds.'
-      )
-      console.log('Please try again, allowing more time.')
-      process.exit(1)
-    }
   }
 }
 

package/src/utils/commonApi.js

@@ -4,11 +4,10 @@ const {
   unauthenticatedError,
   forbiddenError,
   proxyError,
-  hostWarningError,
   genericError
 } = require('../common/errorHandling')
 
-const handleResponseErrors = (res, api, hostPresent) => {
+const handleResponseErrors = (res, api) => {
   if (res.statusCode === 400) {
     api === 'catalogue' ? badRequestError(true) : badRequestError(false)
   } else if (res.statusCode === 401) {
@@ -18,7 +17,7 @@ const handleResponseErrors = (res, api, hostPresent) => {
   } else if (res.statusCode === 407) {
     proxyError()
   } else {
-    hostPresent === false ? hostWarningError() : genericError()
+    genericError()
   }
 }
 

package/src/utils/paramsUtil/commandlineParams.js

@@ -1,9 +1,5 @@
-const cliOptions = require('../parsedCLIOptions')
-const parsedCLIOptions = cliOptions.getCommandLineArgs()
-
-const getAuth = () => {
+const getAuth = parsedCLIOptions => {
   let params = {}
-
   params.apiKey = parsedCLIOptions['apiKey']
   params.authorization = parsedCLIOptions['authorization']
   params.host = parsedCLIOptions['host']
@@ -11,27 +7,6 @@ const getAuth = () => {
   return params
 }
 
-const getScanParams = () => {
-  let scanParams = {}
-  scanParams.help = parsedCLIOptions['help']
-  scanParams.file = parsedCLIOptions['file']
-  scanParams.language = parsedCLIOptions['language']
-    ? parsedCLIOptions['language'].toUpperCase()
-    : parsedCLIOptions['language']
-  scanParams.ff = parsedCLIOptions['ff']
-  scanParams.timeout = parsedCLIOptions['timeout']
-  scanParams.name = parsedCLIOptions['name']
-  scanParams.verbose = parsedCLIOptions['verbose']
-
-  // if no name, take the full file path and use it as the project name
-  if (!scanParams.name) {
-    scanParams.name = scanParams.file
-  }
-
-  return scanParams
-}
-
 module.exports = {
-  getScanParams: getScanParams,
   getAuth: getAuth
 }

package/src/utils/paramsUtil/paramHandler.js

@@ -4,8 +4,8 @@ const envVariableParams = require('./envVariableParams')
 const { validateAuthParams } = require('../validationCheck')
 const i18n = require('i18n')
 
-const getAuth = () => {
-  let commandLineAuthParamsAuth = commandlineAuth.getAuth()
+const getAuth = params => {
+  let commandLineAuthParamsAuth = commandlineAuth.getAuth(params)
   let envVariableParamsAuth = envVariableParams.getAuth()
   let configStoreParamsAuth = configStoreParams.getAuth()
 
@@ -21,8 +21,4 @@ const getAuth = () => {
   }
 }
 
-const getScanSubCommands = () => {
-  return commandlineAuth.getScanParams()
-}
-
-module.exports = { getAuth: getAuth, getScanSubCommands: getScanSubCommands }
+module.exports = { getAuth: getAuth }

package/src/utils/parsedCLIOptions.js

@@ -1,17 +1,19 @@
-const constants = require('../constants')
 const commandLineArgs = require('command-line-args')
 
-const getCommandLineArgs = () => {
-  return commandLineArgs(
-    constants.commandLineDefinitions.scanOptionDefinitions,
-    {
-      partial: true,
+const getCommandLineArgsCustom = (parameterList, optionDefinitions) => {
+  try {
+    return commandLineArgs(optionDefinitions, {
+      argv: parameterList,
+      partial: false,
       camelCase: true,
       caseInsensitive: true
-    }
-  )
+    })
+  } catch (e) {
+    console.log(e.message.toString())
+    process.exit(1)
+  }
 }
 
 module.exports = {
-  getCommandLineArgs: getCommandLineArgs
+  getCommandLineArgsCustom
 }