snyk 1.893.0 → 1.896.0

package/dist/cli/315.index.js

@@ -5603,14 +5603,11 @@ async function analyzeBundle(options) {
 }
 exports.analyzeBundle = analyzeBundle;
 function normalizeResultFiles(files, baseDir) {
-    if (baseDir) {
-        return Object.entries(files).reduce((obj, [path, positions]) => {
-            const filePath = (0, files_1.resolveBundleFilePath)(baseDir, path);
-            obj[filePath] = positions;
-            return obj;
-        }, {});
-    }
-    return files;
+    return Object.entries(files).reduce((obj, [path, positions]) => {
+        const filePath = (0, files_1.resolveBundleFilePath)(baseDir, path);
+        obj[filePath] = positions;
+        return obj;
+    }, {});
 }
 async function analyzeFolders(options) {
     if (!options.connection.requestId) {
@@ -5940,6 +5937,7 @@ async function createBundleFromFolders(options) {
     ]);
     emitter_1.emitter.scanFilesProgress(0);
     const bundleFiles = [];
+    const skippedOversizedFiles = [];
     let totalFiles = 0;
     const bundleFileCollector = (0, files_1.collectBundleFiles)({
         ...(0, lodash_pick_1.default)(options, ['paths', 'symlinksEnabled']),
@@ -5948,7 +5946,7 @@ async function createBundleFromFolders(options) {
         supportedFiles,
     });
     for await (const f of bundleFileCollector) {
-        bundleFiles.push(f);
+        typeof f == 'string' ? skippedOversizedFiles.push(f) : bundleFiles.push(f);
         totalFiles += 1;
         emitter_1.emitter.scanFilesProgress(totalFiles);
     }
@@ -5968,6 +5966,7 @@ async function createBundleFromFolders(options) {
         baseDir,
         supportedFiles,
         fileIgnores,
+        skippedOversizedFiles,
     };
 }
 exports.createBundleFromFolders = createBundleFromFolders;
@@ -6399,6 +6398,7 @@ async function* searchFiles(patterns, cwd, symlinksEnabled, ignores) {
 }
 /**
  * Returns bundle files from requested paths
+ * If a file exceeds the maximum file size, it returns a string with its path
  * */
 async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnores, paths, supportedFiles, }) {
     const cache = new cache_1.Cache(constants_1.CACHE_KEY, baseDir);
@@ -6411,8 +6411,8 @@ async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnor
         // Check if symlink and exclude if requested
         if (!fileStats || (fileStats.isSymbolicLink() && !symlinksEnabled))
             continue;
-        if (fileStats.isFile() && fileStats.size <= constants_1.MAX_FILE_SIZE) {
-            files.push(path);
+        if (fileStats.isFile()) {
+            fileStats.size <= constants_1.MAX_FILE_SIZE ? files.push(path) : yield path;
         }
         else if (fileStats.isDirectory()) {
             dirs.push(path);
@@ -6426,8 +6426,8 @@ async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnor
         for await (const filePath of searcher) {
             const fileInfo = await getFileInfo(filePath.toString(), baseDir, false, cache);
             // dc ignore AttrAccessOnNull: false positive, there is a precondition with &&
-            if (fileInfo && fileInfo.size <= constants_1.MAX_FILE_SIZE) {
-                yield fileInfo;
+            if (fileInfo) {
+                fileInfo.size <= constants_1.MAX_FILE_SIZE ? yield fileInfo : yield fileInfo.bundlePath;
             }
         }
     }
@@ -6437,8 +6437,8 @@ async function* collectBundleFiles({ symlinksEnabled = false, baseDir, fileIgnor
         for await (const filePath of searcher) {
             const fileInfo = await getFileInfo(filePath.toString(), baseDir, false, cache);
             // dc ignore AttrAccessOnNull: false positive, there is a precondition with &&
-            if (fileInfo && fileInfo.size <= constants_1.MAX_FILE_SIZE) {
-                yield fileInfo;
+            if (fileInfo) {
+                fileInfo.size <= constants_1.MAX_FILE_SIZE ? yield fileInfo : yield fileInfo.bundlePath;
             }
         }
     }
@@ -6556,7 +6556,10 @@ function resolveBundleFilePath(baseDir, bundleFilePath) {
     if (isWindows) {
         relPath = relPath.replace(/\//g, '\\');
     }
-    return nodePath.resolve(baseDir, decodeURI(relPath));
+    if (baseDir) {
+        return nodePath.resolve(baseDir, decodeURI(relPath));
+    }
+    return decodeURI(relPath);
 }
 exports.resolveBundleFilePath = resolveBundleFilePath;
 function* composeFilePayloads(files, bucketSize = constants_1.MAX_PAYLOAD) {
@@ -6860,7 +6863,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getIpFamily = exports.checkSession = exports.startSession = exports.getAnalysis = exports.AnalysisSeverity = exports.constants = exports.emitter = exports.extendAnalysis = exports.createBundleFromFolders = exports.analyzeFolders = exports.getGlobPatterns = void 0;
+exports.getIpFamily = exports.checkSession = exports.startSession = exports.getAnalysis = exports.AnalysisSeverity = exports.constants = exports.MAX_FILE_SIZE = exports.emitter = exports.extendAnalysis = exports.createBundleFromFolders = exports.analyzeFolders = exports.getGlobPatterns = void 0;
 const analysis_1 = __webpack_require__(54151);
 Object.defineProperty(exports, "analyzeFolders", ({ enumerable: true, get: function () { return analysis_1.analyzeFolders; } }));
 Object.defineProperty(exports, "extendAnalysis", ({ enumerable: true, get: function () { return analysis_1.extendAnalysis; } }));
@@ -6873,6 +6876,8 @@ Object.defineProperty(exports, "startSession", ({ enumerable: true, get: functio
 Object.defineProperty(exports, "checkSession", ({ enumerable: true, get: function () { return http_1.checkSession; } }));
 Object.defineProperty(exports, "getAnalysis", ({ enumerable: true, get: function () { return http_1.getAnalysis; } }));
 Object.defineProperty(exports, "getIpFamily", ({ enumerable: true, get: function () { return http_1.getIpFamily; } }));
+const constants_1 = __webpack_require__(65765);
+Object.defineProperty(exports, "MAX_FILE_SIZE", ({ enumerable: true, get: function () { return constants_1.MAX_FILE_SIZE; } }));
 const constants = __importStar(__webpack_require__(65765));
 exports.constants = constants;
 const files_1 = __webpack_require__(32083);
@@ -154685,15 +154690,24 @@ async function scan(options) {
 }
 exports.scan = scan;
 function getExcludedPatterns(projectRoot, policyFilePath = path_1.join(projectRoot, invariants_1.DEFAULT_SNYK_POLICY_FILE)) {
-    var _a;
+    var _a, _b;
     if (!dotSnyk.exists(policyFilePath)) {
         return [];
     }
     const config = dotSnyk.parse(policyFilePath);
-    return [
-        policyFilePath,
-        ...dotSnyk.toAbsolutePaths(projectRoot, (_a = config === null || config === void 0 ? void 0 : config.exclude) === null || _a === void 0 ? void 0 : _a.global),
-    ];
+    const paths = (_b = (_a = config === null || config === void 0 ? void 0 : config.exclude) === null || _a === void 0 ? void 0 : _a.global) === null || _b === void 0 ? void 0 : _b.filter((item) => {
+        if (typeof item === 'object') {
+            const key = Object.keys(item)[0];
+            return !key ? false : !dotSnyk.hasExpired(item[key].expires);
+        }
+        return true;
+    }).map((item) => {
+        if (typeof item === 'object') {
+            return Object.keys(item)[0];
+        }
+        return item;
+    });
+    return [policyFilePath, ...dotSnyk.toAbsolutePaths(projectRoot, paths)];
 }
 exports.getExcludedPatterns = getExcludedPatterns;
 //# sourceMappingURL=scan.js.map
@@ -154744,7 +154758,7 @@ exports.isBinary = isBinary;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.toAbsolutePaths = exports.parse = exports.exists = void 0;
+exports.hasExpired = exports.toAbsolutePaths = exports.parse = exports.exists = void 0;
 const fs_1 = __webpack_require__(35747);
 const yaml_1 = __webpack_require__(6792);
 const path_1 = __webpack_require__(85622);
@@ -154776,6 +154790,21 @@ function toAbsolutePaths(basedir, paths = []) {
     return paths.map((p) => path_1.resolve(basedir, p));
 }
 exports.toAbsolutePaths = toAbsolutePaths;
+/**
+ * Resolves an array of paths relative to the basedir
+ * @param {string} expires - date string
+ * @returns {boolean} - whether or not the provided date has expired
+ */
+function hasExpired(expires) {
+    if (expires === null || expires === undefined) {
+        return false;
+    }
+    if (isNaN(Date.parse(expires))) {
+        throw `Invalid date format provided dates should be formatted as "yyyy-MM-ddTHH:mm:ss.fffZ"`;
+    }
+    return new Date() > new Date(expires);
+}
+exports.hasExpired = hasExpired;
 //# sourceMappingURL=index.js.map
 
 /***/ }),