@contrast/contrast 2.0.1 → 2.0.2-beta.1

package/src/scan/fileUtils.js

@@ -18,6 +18,7 @@ const findAllFiles = async (filePath, depth = 2) => {
       '**/build.gradle',
       '**/build.gradle.kts',
       '**/package.json',
+      '**/package-lock.json',
       '**/yarn.lock',
       '**/Pipfile',
       '**/*.csproj',
@@ -51,94 +52,107 @@ const findFilesJava = async (languagesFound, filePath, depth = 1) => {
   )
 
   if (result.length > 0) {
-    return languagesFound.push({ JAVA: result, language: 'JAVA' })
+    let lockFile = result.find(i => i.includes('pom') || i.includes('gradle'))
+    return languagesFound.push({
+      JAVA: result,
+      language: 'JAVA',
+      filePath: lockFile
+    })
   }
   return languagesFound
 }
 
-const findFilesJavascript = async (languagesFound, filePath) => {
+const findFilesJavascript = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(
     ['**/package.json', '**/yarn.lock', '**/package-lock.json'],
     {
       dot: false,
-      deep: 1,
+      deep: depth,
       onlyFiles: true,
       cwd: filePath ? filePath : process.cwd()
     }
   )
 
   if (result.length > 0) {
-    return languagesFound.push({ JAVASCRIPT: result, language: 'JAVASCRIPT' })
+    let lockFile = result.find(i => i.includes('lock'))
+    return languagesFound.push({
+      JAVASCRIPT: result,
+      language: 'JAVASCRIPT',
+      filePath: lockFile
+    })
   }
   return languagesFound
 }
 
-const findFilesPython = async (languagesFound, filePath) => {
+const findFilesPython = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(['**/Pipfile.lock', '**/Pipfile'], {
     dot: false,
-    deep: 3,
+    deep: depth,
     onlyFiles: true,
     cwd: filePath ? filePath : process.cwd()
   })
 
   if (result.length > 0) {
-    return languagesFound.push({ PYTHON: result })
+    return languagesFound.push({ PYTHON: result, filePath: 'Pipfile' })
   }
   return languagesFound
 }
 
-const findFilesGo = async (languagesFound, filePath) => {
+const findFilesGo = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(['**/go.mod'], {
     dot: false,
-    deep: 3,
+    deep: depth,
     onlyFiles: true,
     cwd: filePath ? filePath : process.cwd()
   })
 
   if (result.length > 0) {
-    return languagesFound.push({ GO: result })
+    return languagesFound.push({ GO: result, filePath: 'go.mod' })
   }
   return languagesFound
 }
 
-const findFilesRuby = async (languagesFound, filePath) => {
+const findFilesRuby = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(['**/Gemfile', '**/Gemfile.lock'], {
     dot: false,
-    deep: 3,
+    deep: depth,
     onlyFiles: true,
     cwd: filePath ? filePath : process.cwd()
   })
 
   if (result.length > 0) {
-    return languagesFound.push({ RUBY: result })
+    return languagesFound.push({ RUBY: result, filePath: 'Gemfile' })
   }
   return languagesFound
 }
 
-const findFilesPhp = async (languagesFound, filePath) => {
+const findFilesPhp = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(['**/composer.json', '**/composer.lock'], {
     dot: false,
-    deep: 3,
+    deep: depth,
     onlyFiles: true,
     cwd: filePath ? filePath : process.cwd()
   })
 
   if (result.length > 0) {
-    return languagesFound.push({ PHP: result })
+    return languagesFound.push({ PHP: result, filePath: 'composer.lock' })
   }
   return languagesFound
 }
 
-const findFilesDotNet = async (languagesFound, filePath) => {
+const findFilesDotNet = async (languagesFound, filePath, depth = 1) => {
   const result = await fg(['**/*.csproj', '**/packages.lock.json'], {
     dot: false,
-    deep: 3,
+    deep: depth,
     onlyFiles: true,
     cwd: filePath ? filePath : process.cwd()
   })
 
   if (result.length > 0) {
-    return languagesFound.push({ DOTNET: result })
+    return languagesFound.push({
+      DOTNET: result,
+      filePath: 'packages.lock.json'
+    })
   }
   return languagesFound
 }

package/src/utils/paramsUtil/paramHandler.js

@@ -1,7 +1,10 @@
 const commandlineAuth = require('./commandlineParams')
 const configStoreParams = require('./configStoreParams')
 const envVariableParams = require('./envVariableParams')
-const { validateAuthParams } = require('../validationCheck')
+const {
+  validateAuthParams,
+  validateFingerprintParams
+} = require('../validationCheck')
 const i18n = require('i18n')
 
 const getAuth = params => {
@@ -21,4 +24,15 @@ const getAuth = params => {
   }
 }
 
-module.exports = { getAuth }
+const getFingerprint = params => {
+  if (validateFingerprintParams(params)) {
+    return params
+  } else {
+    console.log(
+      'missing fingerprint params please check repository-url and repository-name'
+    )
+    process.exit(1)
+  }
+}
+
+module.exports = { getAuth, getFingerprint }

package/src/utils/validationCheck.js

@@ -27,8 +27,13 @@ const validateAuthParams = params => {
   )
 }
 
+const validateFingerprintParams = params => {
+  return !!(params.repositoryUrl && params.repositoryName)
+}
+
 module.exports = {
   checkConfigHasRequiredValues: checkConfigHasRequiredValues,
   validateAuthParams: validateAuthParams,
-  validateRequiredScanParams: validateRequiredScanParams
+  validateRequiredScanParams: validateRequiredScanParams,
+  validateFingerprintParams: validateFingerprintParams
 }

package/dist/utils/settingsHelper.js

@@ -1,14 +0,0 @@
-"use strict";
-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
-};

package/src/utils/settingsHelper.js

@@ -1,16 +0,0 @@
-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
-}