snyk 1.786.0 → 1.790.0

package/dist/cli/64.index.js

@@ -18788,13 +18788,14 @@ const sub_process_1 = __webpack_require__(28219);
 const path = __webpack_require__(85622);
 const os_1 = __webpack_require__(12087);
 const errors_1 = __webpack_require__(38133);
+const fs = __webpack_require__(35747);
+const tmp = __webpack_require__(21086);
 function getGradleCommandArgs(targetPath, initScript, confAttrs) {
-    const gradleArgs = [
-        'printClasspath',
-        '-I',
-        path.join(__dirname, ...'../bin/init.gradle'.split('/')),
-        '-q',
-    ];
+    // For binary releases, the original file would be in the binary build and inaccesible
+    const originalPath = path.join(__dirname, ...'../bin/init.gradle'.split('/'));
+    const tmpFilePath = tmp.fileSync().name;
+    fs.copyFileSync(originalPath, tmpFilePath);
+    const gradleArgs = ['printClasspath', '-I', tmpFilePath, '-q'];
     if (targetPath) {
         gradleArgs.push('-p', targetPath);
     }
@@ -172542,6 +172543,7 @@ function selectDisplayStrategy(options, depGraph, testResult) {
 }
 exports.selectDisplayStrategy = selectDisplayStrategy;
 function displayDependencies(depGraph, fileSignaturesDetails, depsFilePaths = {}) {
+    var _a;
     let result = [];
     const dependencies = depGraph === null || depGraph === void 0 ? void 0 : depGraph.getDepPkgs();
     const hasDependencies = (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) > 0;
@@ -172550,10 +172552,9 @@ function displayDependencies(depGraph, fileSignaturesDetails, depsFilePaths = {}
     }
     result.push(chalk.whiteBright('\nDependencies:\n'));
     for (const { name, version } of dependencies) {
-        const dependencyId = `${name}@${version}`;
+        const dependencyId = `${name}@${version}`.toLowerCase();
         result.push(`\n${common_1.leftPad(dependencyId, 2)}`);
-        if (fileSignaturesDetails &&
-            fileSignaturesDetails[dependencyId].confidence) {
+        if (fileSignaturesDetails && ((_a = fileSignaturesDetails[dependencyId]) === null || _a === void 0 ? void 0 : _a.confidence)) {
             result.push(common_1.leftPad(`confidence: ${fileSignaturesDetails[dependencyId].confidence.toFixed(3)}`, 2));
         }
         if (!object_1.isEmpty(depsFilePaths)) {
@@ -172681,7 +172682,7 @@ exports.display = display;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.extractFilePaths = exports.find = exports.stat = void 0;
+exports.find = exports.stat = void 0;
 const fs = __webpack_require__(35747);
 const path_1 = __webpack_require__(85622);
 const util_1 = __webpack_require__(31669);
@@ -172689,42 +172690,34 @@ const common_1 = __webpack_require__(51469);
 const debug_1 = __webpack_require__(36583);
 const readdir = util_1.promisify(fs.readdir);
 exports.stat = util_1.promisify(fs.stat);
-async function find(dir) {
-    const dirStat = await exports.stat(dir);
-    if (!dirStat.isDirectory()) {
-        throw new Error(`${dir} is not a directory`);
-    }
-    const paths = await readdir(dir);
-    const absolutePaths = [];
-    for (const relativePath of paths) {
-        absolutePaths.push(path_1.join(dir, relativePath));
-    }
-    return await extractFilePaths(absolutePaths);
+async function find(src) {
+    const result = [];
+    await traverse(src, (filePath, stats) => {
+        if (!stats.isFile() || stats.size > common_1.MAX_SUPPORTED_FILE_SIZE) {
+            return;
+        }
+        result.push(filePath);
+    });
+    return result;
 }
 exports.find = find;
-async function extractFilePaths(absolutePaths) {
-    const result = [];
-    for (const absolutePath of absolutePaths) {
-        try {
-            const fileStats = await exports.stat(absolutePath);
-            if (fileStats.isDirectory()) {
-                const subFiles = await find(absolutePath);
-                result.push(...subFiles);
-            }
-            else if (fileStats.isFile()) {
-                if (fileStats.size > common_1.MAX_SUPPORTED_FILE_SIZE) {
-                    continue;
-                }
-                result.push(absolutePath);
-            }
+async function traverse(src, handle) {
+    try {
+        const stats = await exports.stat(src);
+        if (!stats.isDirectory()) {
+            handle(src, stats);
+            return;
         }
-        catch (error) {
-            debug_1.debug(error.message || `Error reading file ${absolutePath}. ${error}`);
+        const entries = await readdir(src);
+        for (const entry of entries) {
+            const absolute = path_1.join(src, entry);
+            await traverse(absolute, handle);
         }
     }
-    return result;
+    catch (error) {
+        debug_1.debug(error.message || `Error reading file ${src}. ${error}`);
+    }
 }
-exports.extractFilePaths = extractFilePaths;
 //# sourceMappingURL=find.js.map
 
 /***/ }),
@@ -207178,14 +207171,14 @@ async function getTargetFrameworksFromProjFile(rootDir) {
                 reject(new errors_1.FileNotProcessableError(err));
                 return;
             }
-            const parsedTargetFrameworks = (((_b = (_a = parsedCsprojContents === null || parsedCsprojContents === void 0 ? void 0 : parsedCsprojContents.Project) === null || _a === void 0 ? void 0 : _a.PropertyGroup) === null || _b === void 0 ? void 0 : _b.reduce((targetFrameworks, propertyGroup) => {
+            const parsedTargetFrameworks = ((_b = (_a = parsedCsprojContents === null || parsedCsprojContents === void 0 ? void 0 : parsedCsprojContents.Project) === null || _a === void 0 ? void 0 : _a.PropertyGroup) === null || _b === void 0 ? void 0 : _b.reduce((targetFrameworks, propertyGroup) => {
                 var _a, _b, _c;
                 const targetFrameworkSource = ((_a = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFrameworkVersion) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFramework) === null || _b === void 0 ? void 0 : _b[0]) || ((_c = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFrameworks) === null || _c === void 0 ? void 0 : _c[0]) ||
                     '';
                 return targetFrameworks
                     .concat(targetFrameworkSource.split(';'))
                     .filter(Boolean);
-            }, [])) || []);
+            }, [])) || [];
             if (parsedTargetFrameworks.length < 1) {
                 debug('Could not find TargetFrameworkVersion/TargetFramework' +
                     '/TargetFrameworks defined in the Project.PropertyGroup field of ' +
@@ -207834,7 +207827,7 @@ async function loadNuspecFromAsync(dep) {
 //this is exported for testing, but should not executed directly. Hence the '_' in the name.
 async function _parsedNuspec(nuspecContent, targetFramework, depName) {
     var _a;
-    const parsedNuspec = await parseXML.parseStringPromise(nuspecContent);
+    const parsedNuspec = await parseXML.parseStringPromise(nuspecContent.trim());
     let ownDeps = [];
     //note: this will throw if assertion fails
     assertNuspecSchema(parsedNuspec);