snyk 1.1208.0 → 1.1209.0

package/dist/cli/245.index.js

@@ -213370,7 +213370,7 @@ function buildDepGraph(mavenGraph, includeTestScope = false) {
     const { rootId, nodes } = mavenGraph;
     const { pkgInfo: root } = getPkgInfo(rootId);
     const builder = new dep_graph_1.DepGraphBuilder({ name: 'maven' }, root);
-    const visited = [];
+    const visited = {};
     const queue = [];
     queue.push(...getItems(rootId, nodes[rootId]));
     // breadth first search
@@ -213380,9 +213380,10 @@ function buildDepGraph(mavenGraph, includeTestScope = false) {
             continue;
         const { id, parentId } = item;
         const { pkgInfo, scope } = getPkgInfo(id);
-        if (!includeTestScope && scope === 'test')
+        const node = nodes[id];
+        if (!includeTestScope && scope === 'test' && !node.reachesProdDep)
             continue;
-        if (visited.includes(id)) {
+        if (visited[id]) {
             const prunedId = id + ':pruned';
             builder.addPkgNode(pkgInfo, prunedId, { labels: { pruned: 'true' } });
             builder.connectDep(parentId, prunedId);
@@ -213391,8 +213392,8 @@ function buildDepGraph(mavenGraph, includeTestScope = false) {
         const parentNodeId = parentId === rootId ? builder.rootNodeId : parentId;
         builder.addPkgNode(pkgInfo, id);
         builder.connectDep(parentNodeId, id);
-        queue.push(...getItems(id, nodes[id]));
-        visited.push(id);
+        queue.push(...getItems(id, node));
+        visited[id] = true;
     }
     return builder.build();
 }
@@ -213578,26 +213579,41 @@ class MavenGraphBuilder {
         tslib_1.__classPrivateFieldSet(this, _MavenGraphBuilder_graph, {
             rootId,
             nodes: {
-                [rootId]: { dependsOn: [] },
+                [rootId]: { dependsOn: [], parents: [], reachesProdDep: false },
             },
         }, "f");
     }
-    add(id) {
-        if (!this.node(id)) {
-            tslib_1.__classPrivateFieldGet(this, _MavenGraphBuilder_graph, "f").nodes[id] = { dependsOn: [] };
-        }
+    findOrCreateNode(id) {
+        return this.findNode(id) || this.createNode(id);
     }
-    node(id) {
+    findNode(id) {
         return tslib_1.__classPrivateFieldGet(this, _MavenGraphBuilder_graph, "f").nodes[id];
     }
+    createNode(id) {
+        const node = { dependsOn: [], parents: [], reachesProdDep: false };
+        tslib_1.__classPrivateFieldGet(this, _MavenGraphBuilder_graph, "f").nodes[id] = node;
+        return node;
+    }
+    markNodeProdReachable(id) {
+        const node = this.findNode(id);
+        if (node && !node.reachesProdDep) {
+            node.reachesProdDep = true;
+            for (const parentId of node.parents) {
+                this.markNodeProdReachable(parentId);
+            }
+        }
+    }
     connect(parentId, id) {
-        this.add(parentId);
-        this.add(id);
-        const node = this.node(parentId);
-        if (!node)
-            return;
-        if (!node.dependsOn.includes(id)) {
-            node.dependsOn.push(id);
+        const parentNode = this.findOrCreateNode(parentId);
+        const childNode = this.findOrCreateNode(id);
+        if (!childNode.parents.includes(parentId)) {
+            childNode.parents.push(parentId);
+        }
+        if (!parentNode.dependsOn.includes(id)) {
+            parentNode.dependsOn.push(id);
+        }
+        if (!id.endsWith(':test')) {
+            this.markNodeProdReachable(id);
         }
     }
     get graph() {
@@ -213727,13 +213743,24 @@ const childProcess = __webpack_require__(32081);
 const index_1 = __webpack_require__(29615);
 const shescape_1 = __webpack_require__(79114);
 function execute(command, args, options) {
-    const spawnOptions = { shell: true };
+    const spawnOptions = { shell: true, env: Object.assign({}, process.env) };
     if (options && options.cwd) {
         spawnOptions.cwd = options.cwd;
     }
     if (args) {
         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 = '';