snyk 1.796.0 → 1.800.0

package/dist/cli/727.index.js

@@ -169854,7 +169854,7 @@ Object.defineProperty(exports, "nodeFilesToScannedProjects", ({ enumerable: true
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.jarFilesToScannedProjects = void 0;
+exports.parsePomProperties = exports.getDependencyFromPomProperties = exports.jarFilesToScannedProjects = void 0;
 const admzip = __webpack_require__(55285);
 const path = __webpack_require__(85622);
 const buffer_utils_1 = __webpack_require__(29098);
@@ -169863,6 +169863,7 @@ function groupJarFingerprintsByPath(input) {
         return {
             location: filePath,
             digest,
+            dependencies: [],
         };
     });
     const resultAggregatedByPath = jarFingerprints.reduce((jarsAggregatedByPath, jarFingerprint) => {
@@ -169911,12 +169912,13 @@ function getJarShas(jarBuffers) {
         return Object.assign(Object.assign({}, element), { digest: buffer_utils_1.bufferToSha1(element.digest) });
     });
 }
-function unpackJarsTraverse({ jarBuffer, jarPath, desiredLevelsOfUnpacking, unpackedLevels, jarBuffers, }) {
+function unpackJarsTraverse({ jarBuffer, jarPath, desiredLevelsOfUnpacking, unpackedLevels, jarBuffers, dependencies = [], }) {
     let isFatJar = false;
     if (unpackedLevels >= desiredLevelsOfUnpacking) {
         jarBuffers.push({
             location: jarPath,
             digest: jarBuffer,
+            dependencies,
         });
     }
     else {
@@ -169926,6 +169928,15 @@ function unpackJarsTraverse({ jarBuffer, jarPath, desiredLevelsOfUnpacking, unpa
         // sure it states the level, and not counting all the jars found, regardless of level.
         unpackedLevels = unpackedLevels + 1;
         for (const zipEntry of zipEntries) {
+            // pom.properties is file describing a dependency within a JAR
+            // using this file allows resolution of shaded jars
+            if (zipEntry.entryName.endsWith("pom.properties")) {
+                const entryData = zipEntry.getData().toString();
+                const dep = getDependencyFromPomProperties(entryData, jarPath);
+                if (dep) {
+                    dependencies.push(dep);
+                }
+            }
             if (zipEntry.entryName.endsWith(".jar")) {
                 isFatJar = true;
                 const entryData = zipEntry.getData();
@@ -169937,6 +169948,7 @@ function unpackJarsTraverse({ jarBuffer, jarPath, desiredLevelsOfUnpacking, unpa
                     desiredLevelsOfUnpacking,
                     unpackedLevels,
                     jarBuffers,
+                    dependencies,
                 });
             }
         }
@@ -169944,6 +169956,7 @@ function unpackJarsTraverse({ jarBuffer, jarPath, desiredLevelsOfUnpacking, unpa
             jarBuffers.push({
                 location: jarPath,
                 digest: jarBuffer,
+                dependencies,
             });
         }
     }
@@ -169964,6 +169977,47 @@ function unpackFatJars(jarBuffers, desiredLevelsOfUnpacking) {
     }
     return fingerprints;
 }
+/**
+ * Gets a formatted dependency object from the contents of
+ * a pom.properties file that describes a JAR dependency
+ * @param {string} fileContent
+ * @param {string} jarPath
+ */
+function getDependencyFromPomProperties(fileContent, jarPath) {
+    const dep = parsePomProperties(fileContent);
+    // we need all of these props to allow us to inject the dependency
+    // into the depGraph
+    if (!dep.name || !dep.parentName || !dep.version) {
+        return null;
+    }
+    // Dependency shouldn't be a reference for the JAR itself
+    if (dep && !jarPath.endsWith(`${dep.name}-${dep.version}.jar`)) {
+        return dep;
+    }
+    return null;
+}
+exports.getDependencyFromPomProperties = getDependencyFromPomProperties;
+/**
+ * Parses the file content of a pom.properties file to extract
+ * the "fields" for a JAR dependency.
+ * @param {string} fileContent
+ */
+function parsePomProperties(fileContent) {
+    const fileContentLines = fileContent
+        .split(/\n/)
+        .filter((line) => /^(groupId|artifactId|version)=/.test(line)); // These are the only properties we are interested in
+    const dep = fileContentLines.reduce((dep, line) => {
+        const [key, value] = line.split("=");
+        dep[key] = value.trim(); // Getting rid of EOL
+        return dep;
+    }, {});
+    return {
+        name: dep.artifactId,
+        parentName: dep.groupId,
+        version: dep.version,
+    };
+}
+exports.parsePomProperties = parsePomProperties;
 //# sourceMappingURL=java.js.map
 
 /***/ }),