snyk 1.1277.0 → 1.1278.0

package/dist/cli/245.index.js

@@ -232396,6 +232396,7 @@ exports.inspect = inspect;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.publish = exports.run = exports.restore = exports.validate = void 0;
 const debugModule = __webpack_require__(15158);
+const errors = __webpack_require__(62153);
 const errors_1 = __webpack_require__(62153);
 const path = __webpack_require__(71017);
 const subprocess = __webpack_require__(24862);
@@ -232432,9 +232433,21 @@ async function validate() {
 exports.validate = validate;
 async function restore(projectPath) {
     const command = 'dotnet';
-    const args = ['restore', '--no-cache', projectPath];
-    await handle('restore', command, args);
-    return;
+    const args = ['restore', '--no-cache', '--verbosity', 'normal', projectPath];
+    const result = await handle('restore', command, args);
+    // A customer can define a <BaseOutPutPath> that redirects where `dotnet` saves the assets file. This will
+    // get picked up by the dotnet tool and reported in the output logs.
+    const regex = /Path:\s+(\S+project.assets.json)/g;
+    const matches = result.stdout.matchAll(regex);
+    const manifestFiles = [];
+    for (const match of matches) {
+        manifestFiles.push(match[1]);
+    }
+    if (manifestFiles.length === 0) {
+        throw new errors.FileNotProcessableError('found no information in stdout about the whereabouts of the assets file');
+    }
+    // Return the last element in the log, as it might be mentioning local asset files in reverse order.
+    return manifestFiles[manifestFiles.length - 1];
 }
 exports.restore = restore;
 async function run(projectPath, options) {
@@ -232806,7 +232819,6 @@ async function buildDepGraphFromFiles(root, targetFile, manifestType, useProject
     const safeTargetFile = targetFile || '.';
     const fileContentPath = path.resolve(safeRoot, safeTargetFile);
     const fileContent = getFileContents(fileContentPath);
-    const projectRootFolder = path.resolve(fileContentPath, '../../');
     const parser = PARSERS['dotnet-core-v2'];
     const projectAssets = await parser.fileContentParser.parse(fileContent);
     if (!((_a = projectAssets.project) === null || _a === void 0 ? void 0 : _a.frameworks)) {
@@ -232816,14 +232828,14 @@ async function buildDepGraphFromFiles(root, targetFile, manifestType, useProject
     // otherwise the raw key name, as it's not guaranteed that all framework objects contains a targetAlias.
     const targetFrameworks = Object.entries(projectAssets.project.frameworks).map(([key, value]) => ('targetAlias' in value ? value.targetAlias : key));
     if (targetFrameworks.length <= 0) {
-        throw new errors_1.FileNotProcessableError(`unable to detect a target framework in ${projectRootFolder}, a valid one is needed to continue down this path.`);
+        throw new errors_1.FileNotProcessableError(`unable to detect a target framework in ${safeTargetFile}, a valid one is needed to continue down this path.`);
     }
     if (targetFramework && !targetFrameworks.includes(targetFramework)) {
         console.log(`\x1b[33m⚠ WARNING\x1b[0m: Supplied targetframework \x1b[1m${targetFramework}\x1b[0m was not detected in the supplied 
 manifest file. Available targetFrameworks detected was \x1b[1m${targetFrameworks.join(',')}\x1b[0m. 
 Will attempt to build dependency graph anyway, but the operation might fail.`);
     }
-    let resolvedProjectName = getRootName(root, projectRootFolder, projectNamePrefix);
+    let resolvedProjectName = getRootName(root, safeRoot, projectNamePrefix);
     const projectNameFromManifestFile = (_c = (_b = projectAssets === null || projectAssets === void 0 ? void 0 : projectAssets.project) === null || _b === void 0 ? void 0 : _b.restore) === null || _c === void 0 ? void 0 : _c.projectName;
     if (manifestType === types_1.ManifestType.DOTNET_CORE &&
         useProjectNameFromAssetsFile) {
@@ -232847,12 +232859,12 @@ Will attempt to build dependency graph anyway, but the operation might fail.`);
     if (decidedTargetFrameworks.length == 0) {
         throw new errors_1.InvalidManifestError(`Was not able to find any supported TargetFrameworks to scan, aborting`);
     }
+    // Ensure `dotnet` is installed on the system or fail trying.
+    await dotnet.validate();
     const results = [];
     for (const decidedTargetFramework of decidedTargetFrameworks) {
-        // Ensure `dotnet` is installed on the system or fail trying.
-        await dotnet.validate();
         // Run `dotnet publish` to create a self-contained publishable binary with included .dlls for assembly version inspection.
-        const publishDir = await dotnet.publish(projectRootFolder, decidedTargetFramework);
+        const publishDir = await dotnet.publish(safeRoot, decidedTargetFramework);
         // Then inspect the dependency graph for the runtimepackage's assembly versions.
         const depsFilePath = path.resolve(publishDir, `${projectNameFromManifestFile}.deps.json`);
         const depsFile = fs.readFileSync(depsFilePath);
@@ -233715,6 +233727,7 @@ const parseXML = __webpack_require__(5055);
 const debugModule = __webpack_require__(15158);
 const depsParser = __webpack_require__(91885);
 const framework_1 = __webpack_require__(93935);
+const errors_1 = __webpack_require__(62153);
 const debug = debugModule('snyk');
 function fromPackagesConfigEntry(manifest) {
     debug('Extracting by packages.config entry:' +
@@ -233736,13 +233749,14 @@ function parse(fileContent) {
         if (err) {
             throw err;
         }
-        else {
-            const packages = result.packages.package || [];
-            packages.forEach(function scanPackagesConfigNode(node) {
-                const installedDependency = fromPackagesConfigEntry(node);
-                installedPackages.push(installedDependency);
-            });
+        if (!('packages' in result)) {
+            throw new errors_1.InvalidManifestError(`Could not find a <packages> tag in your packages.config file. Please read this guide \x1b[4mhttps://learn.microsoft.com/en-us/nuget/reference/packages-config#schema\x1b[0m.`);
         }
+        const packages = result.packages.package || [];
+        packages.forEach(function scanPackagesConfigNode(node) {
+            const installedDependency = fromPackagesConfigEntry(node);
+            installedPackages.push(installedDependency);
+        });
     });
     return installedPackages;
 }