snyk 1.1280.1 → 1.1281.0

package/dist/cli/245.index.js

@@ -188988,7 +188988,7 @@ async function jarFilesToScannedResults(filePathToContent, targetImage, desiredL
         if (!mappedResult.hasOwnProperty(path)) {
             continue;
         }
-        const fingerprints = getFingerprints(desiredLevelsOfUnpacking, mappedResult[path]);
+        const fingerprints = await getFingerprints(desiredLevelsOfUnpacking, mappedResult[path]);
         const jarFingerprintsFact = {
             type: "jarFingerprints",
             data: {
@@ -189008,11 +189008,9 @@ async function jarFilesToScannedResults(filePathToContent, targetImage, desiredL
     return scanResults;
 }
 exports.jarFilesToScannedResults = jarFilesToScannedResults;
-function getFingerprints(desiredLevelsOfUnpacking, jarBuffers) {
-    const fingerprints = new Set([
-        ...unpackJars(jarBuffers, desiredLevelsOfUnpacking),
-    ]);
-    return Array.from(fingerprints);
+async function getFingerprints(desiredLevelsOfUnpacking, jarBuffers) {
+    const fingerprints = await unpackJars(jarBuffers, desiredLevelsOfUnpacking);
+    return Array.from(new Set(fingerprints));
 }
 /**
  * Unpacks a JAR and attempts to add coords to the
@@ -189102,7 +189100,7 @@ function unpackJar({ jarBuffer, jarPath, desiredLevelsOfUnpacking, requiredLevel
  * @param {number} unpackedLevels
  * @returns JarFingerprint[]
  */
-function unpackJars(jarBuffers, desiredLevelsOfUnpacking, unpackedLevels = 0) {
+async function unpackJars(jarBuffers, desiredLevelsOfUnpacking, unpackedLevels = 0) {
     // We have to unpack jars to get the pom.properties manifest which
     // we use to support shaded jars and get the package coords (if exists)
     // to reduce the dependency on maven search and support private jars.
@@ -189134,12 +189132,13 @@ function unpackJars(jarBuffers, desiredLevelsOfUnpacking, unpackedLevels = 0) {
             // if any of the coords are null for this JAR we didn't manage to get
             // anything from the JAR's pom.properties manifest, so calculate the
             // sha so maven-deps can fallback to searching maven central
-            fingerprints.push(Object.assign({ location: jarInfo.location, digest: jarInfo.coords ? null : (0, buffer_utils_1.bufferToSha1)(jarInfo.buffer), dependencies: jarInfo.dependencies }, jarInfo.coords));
+            fingerprints.push(Object.assign({ location: jarInfo.location, digest: jarInfo.coords ? null : await (0, buffer_utils_1.bufferToSha1)(jarInfo.buffer), dependencies: jarInfo.dependencies }, jarInfo.coords));
         }
         if (jarInfo.nestedJars.length > 0) {
             // this is an uber/fat JAR so we need to unpack the nested JARs to
             // analyze them for coords and further nested JARs (depth flag allowing)
-            fingerprints.push(...unpackJars(jarInfo.nestedJars, desiredLevelsOfUnpacking, unpackedLevels + 1));
+            const nestedJarFingerprints = await unpackJars(jarInfo.nestedJars, desiredLevelsOfUnpacking, unpackedLevels + 1);
+            fingerprints.push(...nestedJarFingerprints);
         }
     }
     return fingerprints;
@@ -190531,14 +190530,24 @@ var AnalysisType;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.bufferToSha1 = void 0;
 const crypto = __webpack_require__(6113);
+const stream_1 = __webpack_require__(12781);
 const types_1 = __webpack_require__(93677);
 const HASH_ENCODING = "hex";
-function bufferToSha1(buffer) {
+async function bufferToSha1(buffer) {
+    const stream = stream_1.Readable.from(buffer);
     const hash = crypto.createHash(types_1.HashAlgorithm.Sha1);
-    hash.setEncoding(HASH_ENCODING);
-    hash.update(buffer);
-    hash.end();
-    return hash.read().toString(HASH_ENCODING);
+    return new Promise((resolve, reject) => {
+        stream
+            .pipe(hash)
+            .on("finish", () => {
+            hash.end();
+            const digest = hash.read().toString(HASH_ENCODING);
+            resolve(digest);
+        })
+            .on("error", (err) => {
+            reject(err);
+        });
+    });
 }
 exports.bufferToSha1 = bufferToSha1;
 //# sourceMappingURL=buffer-utils.js.map