snyk 1.882.0 → 1.883.0

package/dist/cli/477.index.js

@@ -44,22 +44,31 @@ const snyk_policy_1 = __webpack_require__(70535);
 const config_1 = __webpack_require__(22541);
 async function display(policy) {
     const p = snyk_policy_1.demunge(policy, config_1.default.ROOT);
+    const delimiter = '\n\n------------------------\n';
     let res = chalk_1.default.bold('Current Snyk policy, read from ' + policy.__filename + ' file') + '\n';
     res += 'Modified: ' + policy.__modified + '\n';
     res += 'Created:  ' + policy.__created + '\n';
     res += p.patch.map(displayRule('Patch vulnerability')).join('\n');
     if (p.patch.length && p.ignore.length) {
-        res += '\n\n------------------------\n';
+        res += delimiter;
     }
     res += p.ignore.map(displayRule('Ignore')).join('\n');
+    if (p.ignore.length && p.exclude.length) {
+        res += delimiter;
+    }
+    res += p.exclude.map(displayRule('Exclude')).join('\n');
     return Promise.resolve(res);
 }
 exports.display = display;
 function displayRule(title) {
     return (rule, i) => {
         i += 1;
-        return (chalk_1.default.bold('\n#' + i + ' ' + title + ' ' + rule.url) +
-            ' in the following paths:\n' +
+        const formattedTitle = title === 'Exclude'
+            ? chalk_1.default.bold(`\n#${i} ${title}`) +
+                ` the following ${chalk_1.default.bold(rule.id)} items/paths:\n`
+            : chalk_1.default.bold(`\n#${i} ${title} ${rule.url}`) +
+                ' in the following paths:\n';
+        return (formattedTitle +
             rule.paths
                 .map((p) => {
                 return (p.path +

package/dist/cli/477.index.js.map

@@ -1 +1 @@
-{"version":3,"file":"477.index.js","mappings":";;;;;;;;;;AAAA,0CAAsC;AACtC,oDAAmD;AACnD,4CAI0B;AAEX,KAAK,UAAU,aAAa,CAAC,IAAa;IACvD,IAAI;QACF,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAE7D,CAAC;QACF,OAAO,MAAM,wBAAO,CAAC,YAAY,CAAC,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,YAAyB,CAAC;QAC9B,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,YAAY,GAAG,IAAI,4BAAmB,EAAE,CAAC;SAC1C;aAAM;YACL,YAAY,GAAG,IAAI,gCAAuB,EAAE,CAAC;YAC7C,YAAY,CAAC,UAAU,GAAG,KAAK,CAAC;SACjC;QACD,MAAM,YAAY,CAAC;KACpB;AACH,CAAC;AAhBD,gCAgBC;;;;;;;;;;;ACxBD,2CAA0B;AAC1B,iDAAsC;AACtC,4CAA8B;AAEvB,KAAK,UAAU,OAAO,CAAC,MAAM;IAClC,MAAM,CAAC,GAAG,qBAAO,CAAC,MAAM,EAAE,gBAAM,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,GAAG,GACL,eAAK,CAAC,IAAI,CACR,iCAAiC,GAAG,MAAM,CAAC,UAAU,GAAG,OAAO,CAChE,GAAG,IAAI,CAAC;IACX,GAAG,IAAI,YAAY,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAC/C,GAAG,IAAI,YAAY,GAAG,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;IAE9C,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClE,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;QACrC,GAAG,IAAI,gCAAgC,CAAC;KACzC;IACD,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEtD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAhBD,0BAgBC;AAED,SAAS,WAAW,CAAC,KAAK;IACxB,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACjB,CAAC,IAAI,CAAC,CAAC;QACP,OAAO,CACL,eAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACpD,4BAA4B;YAC5B,IAAI,CAAC,KAAK;iBACP,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO,CACL,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,CAAC,MAAM;wBACP,CAAC,CAAC,YAAY;4BACZ,CAAC,CAAC,MAAM;4BACR,aAAa;4BACb,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE;4BACvB,IAAI;wBACN,CAAC,CAAC,EAAE,CAAC;oBACP,IAAI,CACL,CAAC;YACJ,CAAC,CAAC;iBACD,IAAI,CAAC,EAAE,CAAC;iBACR,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC","sources":["webpack://snyk/./src/cli/commands/policy.ts","webpack://snyk/./src/lib/display-policy.ts"],"sourcesContent":["import * as policy from 'snyk-policy';\nimport { display } from '../../lib/display-policy';\nimport {\n  FailedToLoadPolicyError,\n  PolicyNotFoundError,\n  CustomError,\n} from '../../lib/errors';\n\nexport default async function displayPolicy(path?: string): Promise<string> {\n  try {\n    const loadedPolicy = (await policy.load(path || process.cwd())) as Promise<\n      string\n    >;\n    return await display(loadedPolicy);\n  } catch (error) {\n    let adaptedError: CustomError;\n    if (error.code === 'ENOENT') {\n      adaptedError = new PolicyNotFoundError();\n    } else {\n      adaptedError = new FailedToLoadPolicyError();\n      adaptedError.innerError = error;\n    }\n    throw adaptedError;\n  }\n}\n","import chalk from 'chalk';\nimport { demunge } from 'snyk-policy';\nimport config from './config';\n\nexport async function display(policy) {\n  const p = demunge(policy, config.ROOT);\n  let res =\n    chalk.bold(\n      'Current Snyk policy, read from ' + policy.__filename + ' file',\n    ) + '\\n';\n  res += 'Modified: ' + policy.__modified + '\\n';\n  res += 'Created:  ' + policy.__created + '\\n';\n\n  res += p.patch.map(displayRule('Patch vulnerability')).join('\\n');\n  if (p.patch.length && p.ignore.length) {\n    res += '\\n\\n------------------------\\n';\n  }\n  res += p.ignore.map(displayRule('Ignore')).join('\\n');\n\n  return Promise.resolve(res);\n}\n\nfunction displayRule(title) {\n  return (rule, i) => {\n    i += 1;\n    return (\n      chalk.bold('\\n#' + i + ' ' + title + ' ' + rule.url) +\n      ' in the following paths:\\n' +\n      rule.paths\n        .map((p) => {\n          return (\n            p.path +\n            (p.reason\n              ? '\\nReason: ' +\n                p.reason +\n                '\\nExpires: ' +\n                p.expires.toUTCString() +\n                '\\n'\n              : '') +\n            '\\n'\n          );\n        })\n        .join('')\n        .replace(/\\s*$/, '')\n    );\n  };\n}\n"],"names":[],"sourceRoot":""}
+{"version":3,"file":"477.index.js","mappings":"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","sources":["webpack://snyk/./src/cli/commands/policy.ts","webpack://snyk/./src/lib/display-policy.ts"],"sourcesContent":["import * as policy from 'snyk-policy';\nimport { display } from '../../lib/display-policy';\nimport {\n  FailedToLoadPolicyError,\n  PolicyNotFoundError,\n  CustomError,\n} from '../../lib/errors';\n\nexport default async function displayPolicy(path?: string): Promise<string> {\n  try {\n    const loadedPolicy = (await policy.load(path || process.cwd())) as Promise<\n      string\n    >;\n    return await display(loadedPolicy);\n  } catch (error) {\n    let adaptedError: CustomError;\n    if (error.code === 'ENOENT') {\n      adaptedError = new PolicyNotFoundError();\n    } else {\n      adaptedError = new FailedToLoadPolicyError();\n      adaptedError.innerError = error;\n    }\n    throw adaptedError;\n  }\n}\n","import chalk from 'chalk';\nimport { demunge } from 'snyk-policy';\nimport config from './config';\n\nexport async function display(policy) {\n  const p = demunge(policy, config.ROOT);\n  const delimiter = '\\n\\n------------------------\\n';\n\n  let res =\n    chalk.bold(\n      'Current Snyk policy, read from ' + policy.__filename + ' file',\n    ) + '\\n';\n  res += 'Modified: ' + policy.__modified + '\\n';\n  res += 'Created:  ' + policy.__created + '\\n';\n\n  res += p.patch.map(displayRule('Patch vulnerability')).join('\\n');\n  if (p.patch.length && p.ignore.length) {\n    res += delimiter;\n  }\n\n  res += p.ignore.map(displayRule('Ignore')).join('\\n');\n  if (p.ignore.length && p.exclude.length) {\n    res += delimiter;\n  }\n\n  res += p.exclude.map(displayRule('Exclude')).join('\\n');\n\n  return Promise.resolve(res);\n}\n\nfunction displayRule(title) {\n  return (rule, i) => {\n    i += 1;\n\n    const formattedTitle =\n      title === 'Exclude'\n        ? chalk.bold(`\\n#${i} ${title}`) +\n          ` the following ${chalk.bold(rule.id)} items/paths:\\n`\n        : chalk.bold(`\\n#${i} ${title} ${rule.url}`) +\n          ' in the following paths:\\n';\n\n    return (\n      formattedTitle +\n      rule.paths\n        .map((p) => {\n          return (\n            p.path +\n            (p.reason\n              ? '\\nReason: ' +\n                p.reason +\n                '\\nExpires: ' +\n                p.expires.toUTCString() +\n                '\\n'\n              : '') +\n            '\\n'\n          );\n        })\n        .join('')\n        .replace(/\\s*$/, '')\n    );\n  };\n}\n"],"names":[],"sourceRoot":""}

package/dist/cli/535.index.js

@@ -12836,6 +12836,34 @@ try {
 } catch (er) {}
 
 
+/***/ }),
+
+/***/ 70382:
+/***/ ((module) => {
+
+module.exports = addExclude;
+
+function addExclude(policy, pattern, group='global') {
+  if (!isPatternGroupValid(group)) {
+    throw new Error('invalid file pattern-group');
+  }
+
+  policy.exclude = policy.exclude ? policy.exclude: {};
+
+  const patterns = policy.exclude[group] ? policy.exclude[group]: [];
+
+  if (patterns.includes(pattern)) {
+    return; // Exit early, to prevent duplication
+  }
+
+  policy.exclude[group] = [...patterns, pattern];
+}
+
+function isPatternGroupValid(group) {
+  return ['global', 'code'].includes(group);
+}
+
+
 /***/ }),
 
 /***/ 24763:
@@ -13373,6 +13401,7 @@ const parse = __webpack_require__(791);
 const tryRequire = __webpack_require__(14402);
 const filter = __webpack_require__(10877);
 const add = __webpack_require__(24763);
+const addExclude = __webpack_require__(70382);
 
 module.exports = {
   filter: filter,
@@ -13383,6 +13412,7 @@ module.exports = {
   matchToRule: match.matchToRule,
   loadFromText: loadFromText,
   add: add,
+  addExclude: addExclude,
   create: create,
 };
 
@@ -13410,6 +13440,7 @@ function attachMethods(policy) {
   policy.add = add.bind(null, policy);
   policy.addIgnore = add.bind(null, policy, 'ignore');
   policy.addPatch = add.bind(null, policy, 'patch');
+  policy.addExclude = addExclude.bind(null, policy);
   return policy;
 }
 
@@ -13840,15 +13871,21 @@ function demunge(policy, apiRoot) {
     apiRoot = '';
   }
 
-  const res = ['ignore', 'patch'].reduce(function (acc, type) {
+  const res = ['ignore', 'patch', 'exclude'].reduce(function (acc, type) {
     acc[type] = policy[type]
       ? Object.keys(policy[type]).map(function (id) {
           const paths = policy[type][id].map(function (pathObj) {
+            if (type === 'exclude' && typeof pathObj === 'string') {
+              return {
+                path: pathObj,
+              };
+            }
+
             const path = Object.keys(pathObj).pop();
             const res = {
               path: path,
             };
-            if (type === 'ignore') {
+            if (type === 'ignore' || type === 'exclude') {
               res.reason = pathObj[path].reason;
               res.expires =
                 pathObj[path].expires && new Date(pathObj[path].expires);
@@ -17804,7 +17841,7 @@ try {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"snyk-policy","description":"Snyk\'s policy parser and matching logic","main":"lib/index.js","scripts":{"lint":"run-p --max-parallel=${JOBS:-6} --aggregate-output lint:*","lint:eslint":"eslint -c .eslintrc lib","lint:commits":"commitlint --from=HEAD~20","format":"prettier --write \'{lib,test}/**/*.?s\'","check-tests":"! grep \'test.only\' test/**/*.test.js -n","env":"node -e \'console.log(process.env, process.versions)\'","tap":"tap test/**/*.test.js -R spec --timeout=60","test":"npm run check-tests && npm run tap"},"keywords":["snyk"],"author":"Remy Sharp","license":"Apache-2.0","devDependencies":{"@commitlint/cli":"^12.1.4","eslint":"^5.0.0","eslint-config-prettier":"^5.0.0","npm-run-all":"^4.1.5","prettier":"^2.0.5","proxyquire":"^2.1.0","sinon":"^4.0.0","tap":"^12.0.1","tap-only":"0.0.5"},"dependencies":{"debug":"^4.1.1","email-validator":"^2.0.4","js-yaml":"^3.13.1","lodash.clonedeep":"^4.5.0","promise-fs":"^2.1.1","semver":"^7.3.4","snyk-module":"^3.0.0","snyk-resolve":"^1.1.0","snyk-try-require":"^2.0.2"},"repository":{"type":"git","url":"https://github.com/snyk/policy.git"},"version":"1.22.2"}');
+module.exports = JSON.parse('{"name":"snyk-policy","description":"Snyk\'s policy parser and matching logic","main":"lib/index.js","scripts":{"lint":"run-p --max-parallel=${JOBS:-6} --aggregate-output lint:*","lint:eslint":"eslint -c .eslintrc lib","lint:commits":"commitlint --from=HEAD~20","format":"prettier --write \'{lib,test}/**/*.?s\'","check-tests":"! grep \'test.only\' test/**/*.test.js -n","env":"node -e \'console.log(process.env, process.versions)\'","tap":"tap test/**/*.test.js -R spec --timeout=60","test":"npm run check-tests && npm run tap"},"keywords":["snyk"],"author":"Remy Sharp","license":"Apache-2.0","devDependencies":{"@commitlint/cli":"^12.1.4","eslint":"^5.0.0","eslint-config-prettier":"^5.0.0","npm-run-all":"^4.1.5","prettier":"^2.0.5","proxyquire":"^2.1.0","sinon":"^4.0.0","tap":"^12.0.1","tap-only":"0.0.5"},"dependencies":{"debug":"^4.1.1","email-validator":"^2.0.4","js-yaml":"^3.13.1","lodash.clonedeep":"^4.5.0","promise-fs":"^2.1.1","semver":"^7.3.4","snyk-module":"^3.0.0","snyk-resolve":"^1.1.0","snyk-try-require":"^2.0.2"},"repository":{"type":"git","url":"https://github.com/snyk/policy.git"},"version":"1.24.0"}');
 
 /***/ })