@contrast/contrast 1.0.23 → 2.0.1

package/src/scan/autoDetection.js

@@ -1,18 +1,62 @@
 const i18n = require('i18n')
 const fileFinder = require('./fileUtils')
-
-const autoDetectFingerprintInfo = async (filePath, depth) => {
+const {
+  supportedLanguages: { JAVA, GO, PYTHON, RUBY, JAVASCRIPT, NODE, PHP, DOTNET }
+} = require('../constants/constants')
+const autoDetectFingerprintInfo = async (filePath, depth, config) => {
   let complexObj = await fileFinder.findAllFiles(filePath, depth)
   let result = []
   let count = 0
   complexObj.forEach(i => {
     count++
-    result.push({ filePath: i, id: count.toString() })
+    result.push({
+      filePath: i,
+      id: count.toString(),
+      repositoryId: config.repositoryId
+    })
   })
 
   return result
 }
 
+const detectPackageManager = async array => {
+  array.forEach(i => {
+    if (i.filePath.includes('pom.xml')) {
+      i['language'] = JAVA
+      i['packageManager'] = 'MAVEN'
+    }
+    if (i.filePath.includes('build.gradle.kts')) {
+      i['language'] = JAVA
+      i['packageManager'] = 'GRADLE'
+    }
+    if (i.filePath.includes('build.gradle')) {
+      i['language'] = JAVA
+      i['packageManager'] = 'GRADLE'
+    }
+    if (i.filePath.includes('package-lock.json')) {
+      i['language'] = JAVASCRIPT
+      i['packageManager'] = 'NPM'
+    }
+    if (i.filePath.includes('yarn.lock')) {
+      i['language'] = JAVASCRIPT
+      i['packageManager'] = 'YARN'
+    }
+    if (i.filePath.includes('Pipfile')) {
+      i['language'] = PYTHON
+    }
+    if (i.filePath.includes('csproj')) {
+      i['language'] = DOTNET
+    }
+    if (i.filePath.includes('Gemfile')) {
+      i['language'] = RUBY
+    }
+    if (i.filePath.includes('go.mod')) {
+      i['language'] = GO
+    }
+  })
+  return array
+}
+
 const autoDetectFileAndLanguage = async configToUse => {
   const entries = await fileFinder.findFile()
 
@@ -67,7 +111,7 @@ const dealWithMultiJava = filesFound => {
   let hasMultiJava =
     filesFound.filter(data => {
       return (
-        Object.keys(data)[0] === 'JAVA' &&
+        Object.keys(data)[0] === JAVA &&
         Object.values(data)[0].includes('build.gradle') &&
         Object.values(data)[0].includes('pom.xml')
       )
@@ -119,5 +163,6 @@ module.exports = {
   autoDetectAuditFilesAndLanguages,
   errorOnAuditFileDetection,
   autoDetectFingerprintInfo,
-  dealWithMultiJava
+  dealWithMultiJava,
+  detectPackageManager
 }

package/src/scan/fileUtils.js

@@ -18,6 +18,7 @@ const findAllFiles = async (filePath, depth = 2) => {
       '**/build.gradle',
       '**/build.gradle.kts',
       '**/package.json',
+      '**/yarn.lock',
       '**/Pipfile',
       '**/*.csproj',
       '**/Gemfile',
@@ -38,19 +39,19 @@ const findAllFiles = async (filePath, depth = 2) => {
   return []
 }
 
-const findFilesJava = async (languagesFound, filePath) => {
+const findFilesJava = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(
     ['**/pom.xml', '**/build.gradle', '**/build.gradle.kts'],
     {
       dot: false,
-      deep: 1,
+      deep: depth,
       onlyFiles: true,
       cwd: filePath ? filePath : process.cwd()
     }
   )
 
   if (result.length > 0) {
-    return languagesFound.push({ JAVA: result })
+    return languagesFound.push({ JAVA: result, language: 'JAVA' })
   }
   return languagesFound
 }
@@ -67,7 +68,7 @@ const findFilesJavascript = async (languagesFound, filePath) => {
   )
 
   if (result.length > 0) {
-    return languagesFound.push({ JAVASCRIPT: result })
+    return languagesFound.push({ JAVASCRIPT: result, language: 'JAVASCRIPT' })
   }
   return languagesFound
 }

package/src/utils/commonApi.js

@@ -12,7 +12,33 @@ const {
   parametersError,
   invalidHostNameError
 } = require('../common/errorHandling')
+const { performance } = require('perf_hooks')
+const requestUtils = require('./requestUtils')
+const oraFunctions = require('./oraWrapper')
 
+const getTimeout = config => {
+  if (config.timeout) {
+    return config.timeout
+  } else {
+    if (config.verbose) {
+      console.log('Timeout set to 5 minutes')
+    }
+    return 300
+  }
+}
+
+const handleTimeout = (startTime, timeout, reportSpinner) => {
+  const endTime = performance.now() - startTime
+  if (requestUtils.millisToSeconds(endTime) > timeout) {
+    oraFunctions.failSpinner(
+      reportSpinner,
+      'Contrast audit timed out at the specified timeout of ' +
+        timeout +
+        ' seconds.'
+    )
+    throw new Error('You can update the timeout using --timeout')
+  }
+}
 const handleResponseErrors = (res, api) => {
   if (res.statusCode === 400) {
     api === 'catalogue' ? badRequestError(true) : badRequestError(false)
@@ -71,5 +97,7 @@ module.exports = {
   getValidHost: getValidHost,
   getProtocol: getProtocol,
   handleResponseErrors: handleResponseErrors,
-  getHttpClient: getHttpClient
+  getHttpClient: getHttpClient,
+  handleTimeout: handleTimeout,
+  getTimeout: getTimeout
 }

package/src/utils/settingsHelper.js

@@ -0,0 +1,16 @@
+const generalAPI = require('./generalAPI')
+const { SAAS } = require('../constants/constants')
+
+const getSettings = async config => {
+  config.isEOP =
+    (await generalAPI.getMode(config)).toUpperCase() === SAAS ? false : true
+
+  if (config.legacy === undefined) {
+    config.legacy = config.isEOP
+  }
+  return config
+}
+
+module.exports = {
+  getSettings
+}