snyk 1.851.0 → 1.852.0

package/dist/cli/245.index.js

@@ -142855,7 +142855,7 @@ exports.spawn = spawn;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isSupportedSize = exports.EXTRACTED_DIR_SUFFIX = exports.DEFAULT_DECOMPRESSING_DEPTH = exports.DECOMPRESSING_CONCURRENCY_LEVEL = exports.HASHING_CONCURRENCY_LEVEL = exports.MAX_SUPPORTED_FILE_SIZE = exports.isWindowsOS = void 0;
+exports.isSupportedSize = exports.DECOMPRESSING_IGNORE_DIR = exports.DECOMPRESSING_WORKSPACE_DIR = exports.DECOMPRESSING_CONCURRENCY_LEVEL = exports.HASHING_CONCURRENCY_LEVEL = exports.MAX_SUPPORTED_FILE_SIZE = exports.isWindowsOS = void 0;
 const os = __webpack_require__(12087);
 const osName = __webpack_require__(7719);
 exports.isWindowsOS = () => osName()
@@ -142864,8 +142864,8 @@ exports.isWindowsOS = () => osName()
 exports.MAX_SUPPORTED_FILE_SIZE = 2 * 1024 * 1024 * 1024 - 1;
 exports.HASHING_CONCURRENCY_LEVEL = os.cpus().length;
 exports.DECOMPRESSING_CONCURRENCY_LEVEL = os.cpus().length * 8;
-exports.DEFAULT_DECOMPRESSING_DEPTH = 1;
-exports.EXTRACTED_DIR_SUFFIX = '.extracted';
+exports.DECOMPRESSING_WORKSPACE_DIR = 'workspace';
+exports.DECOMPRESSING_IGNORE_DIR = 'ignore';
 exports.isSupportedSize = (size) => 0 < size && size < exports.MAX_SUPPORTED_FILE_SIZE;
 //# sourceMappingURL=common.js.map
 
@@ -143121,25 +143121,33 @@ exports.display = display;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.filterArchives = exports.isArchive = exports.isZip = exports.isTar = exports.extract = void 0;
+exports.isArchive = exports.isZip = exports.isTar = exports.extract = void 0;
 const fs_1 = __webpack_require__(35747);
 const path_1 = __webpack_require__(85622);
+const uuid_1 = __webpack_require__(42277);
 const common_1 = __webpack_require__(51469);
 const debug_1 = __webpack_require__(36583);
 const pMap = __webpack_require__(81334);
 const AdmZip = __webpack_require__(55285);
 const tar = __webpack_require__(97998);
-const { mkdir } = fs_1.promises;
+const { mkdir, rename } = fs_1.promises;
 const zipFormats = ['.zip', '.zipx'];
 const tarFormats = ['.tar', '.gz', '.tgz'];
-async function handleExtraction(path, temporaryDir, childArchiveHandler) {
-    const extractionTarget = path_1.join(temporaryDir, path.includes(temporaryDir)
-        ? path_1.relative(temporaryDir, `${path}${common_1.EXTRACTED_DIR_SUFFIX}`)
+async function handleExtraction(path, temporaryDir, keepArchive, childArchiveHandler) {
+    const extractionSource = keepArchive
+        ? path
+        : path_1.join(temporaryDir, common_1.DECOMPRESSING_IGNORE_DIR, `${uuid_1.v4()}-${path_1.basename(path)}`);
+    if (!keepArchive) {
+        await mkdir(path_1.dirname(extractionSource), { recursive: true });
+        await rename(path, extractionSource);
+    }
+    const extractionTarget = path_1.join(temporaryDir, common_1.DECOMPRESSING_WORKSPACE_DIR, path.includes(temporaryDir)
+        ? path_1.relative(path_1.join(temporaryDir, common_1.DECOMPRESSING_WORKSPACE_DIR), path)
         : path_1.basename(path));
     await mkdir(extractionTarget, { recursive: true });
-    if (isTar(path)) {
+    if (isTar(extractionSource)) {
         await tar.x({
-            file: path,
+            file: extractionSource,
             cwd: extractionTarget,
             sync: true,
             onentry: (entry) => {
@@ -143150,8 +143158,8 @@ async function handleExtraction(path, temporaryDir, childArchiveHandler) {
             },
         });
     }
-    else if (isZip(path)) {
-        const zip = new AdmZip(path);
+    else if (isZip(extractionSource)) {
+        const zip = new AdmZip(extractionSource);
         await pMap(zip.getEntries(), (entry) => {
             const childAbsolutePath = path_1.join(extractionTarget, entry.entryName);
             zip.extractEntryTo(entry.entryName, extractionTarget, true, true);
@@ -143168,7 +143176,8 @@ async function extract(archives, temporaryDir, depthLimit, depth = 0) {
     const childArchives = [];
     for (const archive of archives) {
         try {
-            await handleExtraction(archive, temporaryDir, (childArchive) => childArchives.push(childArchive));
+            const keepArchive = 0 === depth;
+            await handleExtraction(archive, temporaryDir, keepArchive, (childArchive) => childArchives.push(childArchive));
         }
         catch (err) {
             debug_1.debug(`Could not extract archive: ${archive} ${err}`);
@@ -143191,10 +143200,6 @@ function isArchive(path) {
     return isTar(path) || isZip(path);
 }
 exports.isArchive = isArchive;
-function filterArchives(paths) {
-    return paths.filter((path) => isArchive(path));
-}
-exports.filterArchives = filterArchives;
 //# sourceMappingURL=extract.js.map
 
 /***/ }),
@@ -143210,16 +143215,22 @@ const fs_1 = __webpack_require__(35747);
 const path_1 = __webpack_require__(85622);
 const common_1 = __webpack_require__(51469);
 const debug_1 = __webpack_require__(36583);
+const extract_1 = __webpack_require__(18293);
 exports.readdir = fs_1.promises.readdir, exports.lstat = fs_1.promises.lstat;
 async function find(src) {
-    const result = [];
+    const fileResults = [];
+    const archiveResults = [];
     await traverse(src, async (path, stats) => {
         if (!common_1.isSupportedSize(stats.size)) {
             return;
         }
-        result.push(path);
+        if (extract_1.isArchive(path)) {
+            archiveResults.push(path);
+            return;
+        }
+        fileResults.push(path);
     });
-    return result;
+    return [fileResults, archiveResults];
 }
 exports.find = find;
 async function traverse(src, handle) {
@@ -143358,23 +143369,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.scan = void 0;
 const fs = __webpack_require__(35747);
 const path = __webpack_require__(85622);
+const path_1 = __webpack_require__(85622);
 const debug_1 = __webpack_require__(36583);
 const find_1 = __webpack_require__(75933);
 const hosted_git_info_1 = __webpack_require__(95238);
 const signatures_1 = __webpack_require__(47670);
 const git_1 = __webpack_require__(68361);
 const extract_1 = __webpack_require__(18293);
-const common_1 = __webpack_require__(51469);
 const fs_1 = __webpack_require__(93689);
+const common_1 = __webpack_require__(51469);
 async function scan(options) {
     try {
         debug_1.debug.enabled = !!(options === null || options === void 0 ? void 0 : options.debug);
         debug_1.debug('options %o \n', options);
-        const extractionDepthLimit = options['--max-depth'] !== undefined
-            ? options['--max-depth']
-            : common_1.DEFAULT_DECOMPRESSING_DEPTH;
+        const extractionDepthLimit = options['max-depth'] || 0;
         if (extractionDepthLimit < 0) {
-            throw 'invalid options: --max-depth should be a positive number.';
+            throw 'invalid options: --max-depth should be greater than or equal to 0.';
         }
         if (!options.path) {
             throw 'invalid options: no path provided.';
@@ -143383,25 +143393,25 @@ async function scan(options) {
             throw `'${options.path}' does not exist.`;
         }
         const start = Date.now();
-        const paths = await find_1.find(options.path);
-        const archives = extract_1.filterArchives(paths);
-        let temporaryDir = null;
-        if (archives.length > 0) {
-            temporaryDir = await fs_1.createTemporaryDir();
-            await extract_1.extract(archives, temporaryDir, extractionDepthLimit);
-            paths.push(...(await find_1.find(temporaryDir)));
-        }
-        debug_1.debug('%d files found \n', paths.length);
-        const signatures = await signatures_1.computeSignaturesConcurrently(paths);
+        const [filePaths, archivePaths] = await find_1.find(options.path);
+        let extractionWorkspace = null;
+        if (0 < extractionDepthLimit && 0 < archivePaths.length) {
+            const temporaryDir = await fs_1.createTemporaryDir();
+            extractionWorkspace = path_1.join(temporaryDir, common_1.DECOMPRESSING_WORKSPACE_DIR);
+            await extract_1.extract(archivePaths, temporaryDir, extractionDepthLimit);
+            const [newFilePaths, newArchivePaths] = await find_1.find(extractionWorkspace);
+            filePaths.push(...newFilePaths, ...newArchivePaths);
+        }
+        else {
+            filePaths.push(...archivePaths);
+        }
+        debug_1.debug('%d files found \n', filePaths.length);
+        const signatures = await signatures_1.computeSignaturesConcurrently(filePaths);
         signatures.forEach((s) => {
-            if (temporaryDir && s.path.includes(temporaryDir)) {
-                s.path = path
-                    .relative(temporaryDir, s.path)
-                    .replace(new RegExp(common_1.EXTRACTED_DIR_SUFFIX, 'g'), '');
-            }
-            else {
-                s.path = path.relative(options.path, s.path);
-            }
+            const src = extractionWorkspace && s.path.includes(extractionWorkspace)
+                ? extractionWorkspace
+                : options.path;
+            s.path = path.relative(src, s.path);
         });
         const end = Date.now();
         const totalMilliseconds = end - start;