snyk 1.1128.0 → 1.1130.0

package/dist/cli/95.index.js

@@ -149318,11 +149318,28 @@ const shescape_1 = __webpack_require__(79114);
 const debugLogging = debugModule('snyk-gradle-plugin');
 // Executes a subprocess. Resolves successfully with stdout contents if the exit code is 0.
 function execute(command, args, options, perLineCallback) {
-    const spawnOptions = { shell: true };
-    if (options && options.cwd) {
+    const spawnOptions = {
+        shell: true,
+        env: { ...process.env },
+    };
+    if (options === null || options === void 0 ? void 0 : options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
+    if (options === null || options === void 0 ? void 0 : options.env) {
+        spawnOptions.env = { ...process.env, ...options.env };
+    }
     args = (0, shescape_1.quoteAll)(args, spawnOptions);
+    // Before spawning an external process, we look if we need to restore the system proxy configuration,
+    // which overides the cli internal proxy configuration.
+    if (process.env.SNYK_SYSTEM_HTTP_PROXY !== undefined) {
+        spawnOptions.env.HTTP_PROXY = process.env.SNYK_SYSTEM_HTTP_PROXY;
+    }
+    if (process.env.SNYK_SYSTEM_HTTPS_PROXY !== undefined) {
+        spawnOptions.env.HTTPS_PROXY = process.env.SNYK_SYSTEM_HTTPS_PROXY;
+    }
+    if (process.env.SNYK_SYSTEM_NO_PROXY !== undefined) {
+        spawnOptions.env.NO_PROXY = process.env.SNYK_SYSTEM_NO_PROXY;
+    }
     return new Promise((resolve, reject) => {
         let stdout = '';
         let stderr = '';
@@ -153960,7 +153977,7 @@ exports.extractPkgsFromNpmLockV2 = extractPkgsFromNpmLockV2;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.buildDepGraphNpmLockV2 = exports.parseNpmLockV2Project = exports.extractPkgsFromNpmLockV2 = void 0;
+exports.getChildNodeKey = exports.buildDepGraphNpmLockV2 = exports.parseNpmLockV2Project = exports.extractPkgsFromNpmLockV2 = void 0;
 const extract_npm_lock_v2_pkgs_1 = __webpack_require__(61253);
 Object.defineProperty(exports, "extractPkgsFromNpmLockV2", ({ enumerable: true, get: function () { return extract_npm_lock_v2_pkgs_1.extractPkgsFromNpmLockV2; } }));
 const dep_graph_1 = __webpack_require__(53789);
@@ -154010,14 +154027,14 @@ const buildDepGraphNpmLockV2 = (npmLockPkgs, pkgJson, options) => {
         return acc;
     }, new Map());
     const visitedMap = new Set();
-    dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [], pkgKeysByName);
+    dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphNpmLockV2 = buildDepGraphNpmLockV2;
-const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, ancestry, pkgKeysByName) => {
+const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
     visitedMap.add(node.id);
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
-        const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [
+        const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
             ...ancestry,
             {
                 name: node.name,
@@ -154027,7 +154044,7 @@ const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSyn
         ], pkgKeysByName);
         if (!visitedMap.has(childNode.id)) {
             (0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
-            dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [
+            dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
                 ...ancestry,
                 {
                     name: node.name,
@@ -154039,8 +154056,8 @@ const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSyn
         depGraphBuilder.connectDep(node.id, childNode.id);
     }
 };
-const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps, ancestry, pkgKeysByName) => {
-    let childNodeKey = getChildNodeKey(name, ancestry, pkgs, pkgKeysByName); //
+const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
+    let childNodeKey = (0, exports.getChildNodeKey)(name, ancestry, pkgs, pkgKeysByName); //
     if (!childNodeKey) {
         if (strictOutOfSync) {
             throw new errors_1.OutOfSyncError(`${name}@${depInfo.version}`, parsers_1.LockfileType.npm);
@@ -154073,6 +154090,9 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps,
         depData = pkgs[depData.resolved];
     }
     const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
+    const devDependencies = includeDevDeps
+        ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, depInfo.isDev)
+        : {};
     const optionalDependencies = includeOptionalDeps
         ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
         : {};
@@ -154080,7 +154100,7 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps,
         id: `${name}@${depData.version}`,
         name: name,
         version: depData.version,
-        dependencies: Object.assign(Object.assign({}, dependencies), optionalDependencies),
+        dependencies: Object.assign(Object.assign(Object.assign({}, dependencies), devDependencies), optionalDependencies),
         isDev: depInfo.isDev,
         inBundle: depData.inBundle,
         key: childNodeKey,
@@ -154134,7 +154154,7 @@ const getChildNodeKey = (name, ancestry, pkgs, pkgKeysByName) => {
             keysFilteredByParentKey = possibleFilteredKeys;
         }
     }
-    const ancestry_names = ancestry.map((el) => el.name).concat(name);
+    let ancestry_names = ancestry.map((el) => el.name).concat(name);
     while (ancestry_names.length > 0) {
         const possible_key = `node_modules/${ancestry_names.join('/node_modules/')}`;
         if (pkgs[possible_key]) {
@@ -154142,8 +154162,20 @@ const getChildNodeKey = (name, ancestry, pkgs, pkgKeysByName) => {
         }
         ancestry_names.shift();
     }
+    // This is similar to fetching permutations in the isBundle logic
+    ancestry_names = ancestry.map((el) => el.name).concat(name);
+    const candidateAncestries = candidateKeys.map((el) => el.replace('node_modules/', '').split('/node_modules/'));
+    const filteredCandidates = candidateKeys.filter((candidate, idx) => {
+        return candidateAncestries[idx].every((pkg) => {
+            return ancestry_names.includes(pkg);
+        });
+    });
+    if (filteredCandidates.length === 1) {
+        return filteredCandidates[0];
+    }
     return undefined;
 };
+exports.getChildNodeKey = getChildNodeKey;
 //# sourceMappingURL=index.js.map
 
 /***/ }),