@contrast/contrast 1.0.5 → 1.0.6

package/src/scaAnalysis/java/javaBuildDepsParser.js

@@ -4,13 +4,13 @@ let sb = new StringBuilder()
 
 const parseBuildDeps = (config, input) => {
   const { mvnDependancyTreeOutput, projectType } = input
-  // console.log(projectType)
   try {
     return parseGradle(mvnDependancyTreeOutput, config, projectType)
   } catch (err) {
     throw new Error(i18n.__('javaParseProjectFile') + `${err.message}`)
   }
 }
+
 const preParser = shavedOutput => {
   let obj = []
   for (let dep in shavedOutput) {
@@ -387,5 +387,18 @@ const parseGradle = (gradleDependencyTreeOutput, config, projectType) => {
 }
 
 module.exports = {
-  parseBuildDeps
+  parseBuildDeps,
+  shaveOutput,
+  validateIndentation,
+  calculateLevels,
+  lastChild,
+  hasChildren,
+  getElementHeader,
+  createElement,
+  stripElement,
+  checkVersion,
+  computeRelationToLastElement,
+  addIndentation,
+  computeLevel,
+  computeIndentation
 }

package/src/scan/formatScanOutput.ts

@@ -1,4 +1,8 @@
-import { ProjectOverview, ScanResultsModel } from './models/scanResultsModel'
+import {
+  ProjectOverview,
+  ScanResultsInstances,
+  ScanResultsModel
+} from './models/scanResultsModel'
 import i18n from 'i18n'
 import chalk from 'chalk'
 import { ResultContent } from './models/resultContentModel'
@@ -16,7 +20,7 @@ import {
 export function formatScanOutput(scanResults: ScanResultsModel) {
   const { scanResultsInstances } = scanResults
 
-  let projectOverview = getProjectOverview(scanResultsInstances.content)
+  let projectOverview = getProjectOverview(scanResultsInstances)
   if (scanResultsInstances.content.length === 0) {
     console.log(i18n.__('scanNoVulnerabilitiesFound'))
     console.log(i18n.__('scanNoVulnerabilitiesFoundSecureCode'))
@@ -118,7 +122,7 @@ function printVulnInfo(projectOverview: any) {
   )
 }
 
-export function getProjectOverview(content: ResultContent[]) {
+export function getProjectOverview(scanResultsInstances: ScanResultsInstances) {
   let acc: any = {
     critical: 0,
     high: 0,
@@ -127,11 +131,16 @@ export function getProjectOverview(content: ResultContent[]) {
     note: 0,
     total: 0
   }
-  content.forEach((i: ResultContent) => {
-    acc[i.severity.toLowerCase()] += 1
-    acc.total += 1
-    return acc
-  })
+  if (
+    scanResultsInstances?.content &&
+    scanResultsInstances.content.length > 0
+  ) {
+    scanResultsInstances.content.forEach((i: ResultContent) => {
+      acc[i.severity.toLowerCase()] += 1
+      acc.total += 1
+      return acc
+    })
+  }
 
   return acc
 }

package/src/scan/scan.ts

@@ -40,18 +40,19 @@ export const sendScan = async (config: any) => {
           return res.body.id
         } else {
           if (config.debug) {
-            console.log(res.statusCode)
             console.log(config)
+            oraWrapper.failSpinner(
+              startUploadSpinner,
+              i18n.__('uploadingScanFail')
+            )
+            console.log(i18n.__('genericServiceError', res.statusCode))
           }
-          oraWrapper.failSpinner(
-            startUploadSpinner,
-            i18n.__('uploadingScanFail')
-          )
           if (res.statusCode === 403) {
             console.log(i18n.__('permissionsError'))
             process.exit(1)
           }
-          console.log(i18n.__('genericServiceError', res.statusCode))
+          oraWrapper.stopSpinner(startUploadSpinner)
+          console.log('Contrast Scan Finished')
           process.exit(1)
         }
       })

package/src/scan/scanController.js

@@ -2,7 +2,8 @@ const i18n = require('i18n')
 const {
   returnOra,
   startSpinner,
-  succeedSpinner
+  succeedSpinner,
+  stopSpinner
 } = require('../utils/oraWrapper')
 const populateProjectIdAndProjectName = require('./populateProjectIdAndProjectName')
 const scan = require('./scan')
@@ -64,11 +65,17 @@ const startScan = async configToUse => {
 
     const endTime = performance.now()
     const scanDurationMs = endTime - startTime
-    succeedSpinner(startScanSpinner, 'Contrast Scan complete')
-    console.log(
-      `----- Scan completed in ${(scanDurationMs / 1000).toFixed(2)}s -----`
-    )
-    return { scanDetail, scanResultsInstances }
+    if (scanResultsInstances.statusCode !== 200) {
+      stopSpinner(startScanSpinner)
+      console.log('Result Service is unavailable, please try again later')
+      process.exit(1)
+    } else {
+      succeedSpinner(startScanSpinner, 'Contrast Scan complete')
+      console.log(
+        `----- Scan completed in ${(scanDurationMs / 1000).toFixed(2)}s -----`
+      )
+      return { scanDetail, scanResultsInstances: scanResultsInstances.body }
+    }
   }
 }
 

package/src/scan/scanResults.js

@@ -3,6 +3,7 @@ const requestUtils = require('../../src/utils/requestUtils')
 const oraFunctions = require('../utils/oraWrapper')
 const _ = require('lodash')
 const i18n = require('i18n')
+const oraWrapper = require('../utils/oraWrapper')
 
 const getScanId = async (config, codeArtifactId, client) => {
   return client
@@ -47,23 +48,27 @@ const returnScanResults = async (
         }
         if (result.body.status === 'FAILED') {
           complete = true
-          oraFunctions.failSpinner(
-            startScanSpinner,
-            i18n.__(
-              'scanNotCompleted',
-              'https://docs.contrastsecurity.com/en/binary-package-preparation.html'
+          if (config.debug) {
+            oraFunctions.failSpinner(
+              startScanSpinner,
+              i18n.__(
+                'scanNotCompleted',
+                'https://docs.contrastsecurity.com/en/binary-package-preparation.html'
+              )
             )
-          )
-          result.body.errorMessage ? console.log(result.body.errorMessage) : ''
+          }
           if (
-            result.body.errorMessage ===
+            result?.body?.errorMessage ===
             'Unable to determine language for code artifact'
           ) {
+            console.log(result.body.errorMessage)
             console.log(
               'Try scanning again using --language param. ',
               i18n.__('scanOptionsLanguageSummary')
             )
           }
+          oraWrapper.stopSpinner(startScanSpinner)
+          console.log('Contrast Scan Finished')
           process.exit(1)
         }
       }
@@ -86,10 +91,16 @@ const returnScanResultsInstances = async (config, scanId) => {
   try {
     result = await client.getScanResultsInstances(config, scanId)
     if (JSON.stringify(result.statusCode) == 200) {
-      return result.body
+      return { body: result.body, statusCode: result.statusCode }
+    }
+
+    if (JSON.stringify(result.statusCode) == 503) {
+      return { statusCode: result.statusCode }
     }
   } catch (e) {
-    console.log(e.message.toString())
+    if (config.debug) {
+      console.log(e.message.toString())
+    }
   }
 }
 

package/src/utils/oraWrapper.js

@@ -8,6 +8,10 @@ const startSpinner = spinner => {
   spinner.start()
 }
 
+const stopSpinner = spinner => {
+  spinner.stop()
+}
+
 const succeedSpinner = (spinner, text) => {
   spinner.succeed(text)
 }
@@ -20,5 +24,6 @@ module.exports = {
   returnOra,
   startSpinner,
   succeedSpinner,
-  failSpinner
+  failSpinner,
+  stopSpinner
 }