snyk 1.1297.0 → 1.1297.2

package/dist/cli/464.index.js

@@ -220686,38 +220686,6 @@ try {
 } catch (er) {}
 
 
-/***/ }),
-
-/***/ 17426:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.coordsToString = exports.parseCoordinate = void 0;
-function parseCoordinate(coordinate) {
-    if (!coordinate)
-        return {};
-    const [name, version] = coordinate.split('@');
-    const [groupId, artifactId, type, classifier] = name === null || name === void 0 ? void 0 : name.split(':');
-    return {
-        groupId: groupId || undefined,
-        artifactId: artifactId || undefined,
-        version: version || undefined,
-        type: type || undefined,
-        classifier: classifier || undefined,
-    };
-}
-exports.parseCoordinate = parseCoordinate;
-function coordsToString(coords) {
-    let name = `${coords.groupId || 'unknown'}:${coords.artifactId || 'unknown'}:${coords.type || 'jar'}`;
-    if (coords.classifier)
-        name += `:${coords.classifier}`;
-    return `${name}@${coords.version || 'unknown'}`;
-}
-exports.coordsToString = coordsToString;
-//# sourceMappingURL=coordinate.js.map
-
 /***/ }),
 
 /***/ 45339:
@@ -220811,8 +220779,7 @@ function leftPad(s, n) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.findChildren = exports.buildGraph = void 0;
 const dep_graph_1 = __webpack_require__(23423);
-const coordinate_1 = __webpack_require__(17426);
-async function buildGraph(gradleGraph, rootPkgName, projectVersion, verbose, sha1Map) {
+async function buildGraph(gradleGraph, rootPkgName, projectVersion, verbose, coordinateMap) {
     const pkgManager = { name: 'gradle' };
     const isEmptyGraph = !gradleGraph || Object.keys(gradleGraph).length === 0;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder(pkgManager, {
@@ -220839,20 +220806,18 @@ async function buildGraph(gradleGraph, rootPkgName, projectVersion, verbose, sha
             continue;
         let { name = 'unknown', version = 'unknown' } = node;
         let pkgIdProvenance = undefined;
-        if (sha1Map) {
-            if (sha1Map[id]) {
-                id = sha1Map[id];
-                const coord = (0, coordinate_1.parseCoordinate)(id);
-                const newName = `${coord.groupId}:${coord.artifactId}`;
-                const newVersion = coord.version;
+        if (coordinateMap) {
+            if (coordinateMap[id]) {
+                id = coordinateMap[id];
+                const [newName, newVersion] = id.split('@');
                 if (name !== newName || version !== newVersion) {
                     pkgIdProvenance = `${name}@${version}`; // record pkg id provenance if re coordinated
-                    name = newName;
-                    version = newVersion;
                 }
+                name = newName;
+                version = newVersion;
             }
-            if (sha1Map[parentId]) {
-                parentId = sha1Map[parentId];
+            if (coordinateMap[parentId]) {
+                parentId = coordinateMap[parentId];
             }
         }
         const visited = visitedMap[id];
@@ -220928,7 +220893,6 @@ const gradle_attributes_pretty_1 = __webpack_require__(89173);
 const graph_1 = __webpack_require__(23012);
 const search_1 = __webpack_require__(45479);
 const debugModule = __webpack_require__(15158);
-const coordinate_1 = __webpack_require__(17426);
 // To enable debugging output, use `snyk -d`
 let logger = null;
 function debugLog(s) {
@@ -221195,6 +221159,17 @@ async function getAllDepsWithPlugin(root, targetFile, options, gradleVersion) {
     logger(`The following attributes and their possible values were found in your configurations: ${jsonAttrsPretty}`);
     return extractedJSON;
 }
+function splitCoordinate(coordinate) {
+    const coordTest = /^[\w.-]+:[\w.-]+@[\w.-]+$/.test(coordinate);
+    if (!coordTest)
+        return {};
+    const [groupId, artifactId, version] = coordinate.split(/:|@/);
+    const pomCoord = {};
+    pomCoord.artifactId = artifactId;
+    pomCoord.groupId = groupId;
+    pomCoord.version = version;
+    return pomCoord;
+}
 async function getAllDeps(root, targetFile, options, snykHttpClient) {
     const command = getCommand(root, targetFile);
     const gradleVersion = await getGradleVersion(root, command, []);
@@ -221207,14 +221182,14 @@ async function getAllDeps(root, targetFile, options, snykHttpClient) {
         if (versionBuildInfo) {
             extractedJSON.versionBuildInfo = versionBuildInfo;
         }
-        const sha1Map = {};
+        const coordinateMap = {};
         if (extractedJSON.sha1Map) {
             const getCoordinateFromHash = async (hash) => {
                 const originalCoordinate = extractedJSON.sha1Map[hash];
-                const depCoord = (0, coordinate_1.parseCoordinate)(originalCoordinate);
+                const depCoord = splitCoordinate(originalCoordinate);
                 try {
                     const coordinate = await (0, search_1.getMavenPackageInfo)(hash, depCoord, snykHttpClient);
-                    sha1Map[hash] = coordinate;
+                    coordinateMap[originalCoordinate] = coordinate;
                 }
                 catch (err) {
                     debugLog(err);
@@ -221224,7 +221199,7 @@ async function getAllDeps(root, targetFile, options, snykHttpClient) {
                 concurrency: 100,
             });
         }
-        return await processProjectsInExtractedJSON(extractedJSON, options['print-graph'], sha1Map);
+        return await processProjectsInExtractedJSON(extractedJSON, options['print-graph'], coordinateMap);
     }
     catch (err) {
         const error = err;
@@ -221294,7 +221269,7 @@ ${chalk.red.bold(mainErrorMessage)}`;
         throw error;
     }
 }
-async function processProjectsInExtractedJSON(extractedJSON, verbose, sha1Map) {
+async function processProjectsInExtractedJSON(extractedJSON, verbose, coordinateMap) {
     for (const projectId in extractedJSON.projects) {
         const { defaultProject, defaultProjectKey } = extractedJSON;
         const { gradleGraph, projectVersion } = extractedJSON.projects[projectId];
@@ -221306,7 +221281,7 @@ async function processProjectsInExtractedJSON(extractedJSON, verbose, sha1Map) {
         if (isSubProject) {
             rootPkgName = `${defaultProject}/${projectId}`;
         }
-        extractedJSON.projects[projectId].depGraph = await (0, graph_1.buildGraph)(gradleGraph, rootPkgName, projectVersion, verbose, sha1Map);
+        extractedJSON.projects[projectId].depGraph = await (0, graph_1.buildGraph)(gradleGraph, rootPkgName, projectVersion, verbose, coordinateMap);
         // this property usage ends here
         delete extractedJSON.projects[projectId].gradleGraph;
     }
@@ -221413,6 +221388,7 @@ exports.exportsForTests = {
     getVersionBuildInfo,
     toCamelCase,
     getGradleAttributesPretty: gradle_attributes_pretty_1.getGradleAttributesPretty,
+    splitCoordinate,
 };
 //# sourceMappingURL=index.js.map
 
@@ -221427,7 +221403,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getMavenPackageInfo = void 0;
 const packageurl_js_1 = __webpack_require__(38382);
 const _1 = __webpack_require__(71673);
-const coordinate_1 = __webpack_require__(17426);
 const PACKAGE_SEARCH_TYPE = 'maven';
 const PACKAGE_SEARCH_VERSION = '2022-09-21~beta';
 async function getMavenPackageInfo(sha1, depCoords, snykHttpClient) {
@@ -221449,21 +221424,26 @@ async function getMavenPackageInfo(sha1, depCoords, snykHttpClient) {
     });
     if ((res === null || res === void 0 ? void 0 : res.statusCode) >= 400 || !body) {
         (0, _1.debugLog)(`Failed to resolve ${JSON.stringify(depCoords)} using sha1 '${sha1}.`);
-        // use input coordinates if sha1 cannot be resolved for whatever reason
-        return (0, coordinate_1.coordsToString)(depCoords);
     }
+    let groupId;
+    let artifactId;
+    let version;
     try {
         const purlString = (_a = body === null || body === void 0 ? void 0 : body.data[0]) === null || _a === void 0 ? void 0 : _a.id;
         const pkg = packageurl_js_1.PackageURL.fromString(purlString);
-        const { namespace, name, version } = pkg;
-        depCoords.groupId = namespace;
-        depCoords.artifactId = name;
-        depCoords.version = version;
+        const { namespace, name, version: pkgVersion } = pkg;
+        groupId = namespace;
+        artifactId = name;
+        version = pkgVersion;
     }
     catch (_error) {
         (0, _1.debugLog)(`Failed to parse purl components for ${JSON.stringify(depCoords)} using sha1 '${sha1}.`);
     }
-    return (0, coordinate_1.coordsToString)(depCoords);
+    const groupIdString = groupId || 'unknown';
+    const artifactIdString = artifactId ||
+        `${depCoords.artifactId ? `${depCoords.artifactId}-` : ''}${sha1}`;
+    const versionString = version || 'unknown';
+    return `${groupIdString}:${artifactIdString}@${versionString}`;
 }
 exports.getMavenPackageInfo = getMavenPackageInfo;
 //# sourceMappingURL=search.js.map