npm - @contrast/assess - Versions diffs - 1.10.0 → 1.12.0 - Mend

@contrast/assess 1.10.0 → 1.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (119) hide show

package/lib/dataflow/sinks/install/http/server-response.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -40,6 +40,7 @@ module.exports = function(core) {
     patcher,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: {
@@ -48,7 +49,6 @@ module.exports = function(core) {
           reportSafePositive,
           isSafeContentType
         },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/koa/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sinks/install/koa/unvalidated-redirect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -39,10 +39,10 @@ module.exports = function(core) {
     config,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, reportFindings, reportSafePositive },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/marsdb.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -43,10 +43,10 @@ module.exports = function(core) {
     patcher,
     scopes: { sources, instrumentation },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, reportFindings },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/mongodb.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -74,10 +74,10 @@ module.exports = function(core) {
     patcher,
     scopes: { sources, instrumentation },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
-        sinks: { isVulnerable, runInActiveSink, isLocked, reportFindings, reportSafePositive },
-        eventFactory: { createSinkEvent }
+        sinks: { isVulnerable, runInActiveSink, isLocked, reportFindings, reportSafePositive }
       }
     }
   } = core;
@@ -85,16 +85,16 @@ module.exports = function(core) {
   const instr = core.assess.dataflow.sinks.mongodb = {};
   instr.getQueryVulnerabilityInfo = function getQueryVulnerabilityInfo(query) {
+    const reportSafe = [];
     let vulnInfo = null;
-    let reportSafe = null;
     if (isString(query)) {
       const strInfo = tracker.getData(query);
       if (strInfo) {
         if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
           vulnInfo = { strInfo };
-        } else {
-          reportSafe = { strInfo };
+        } else if (config.assess.safe_positives.enable) {
+          reportSafe.push({ strInfo });
         }
       }
@@ -109,8 +109,8 @@ module.exports = function(core) {
         if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
           vulnInfo = { path: [...path], strInfo };
           return true; // halts traversal
-        } else {
-          reportSafe = { path: [...path], strInfo };
+        } else if (config.assess.safe_positives.enable) {
+          reportSafe.push({ path: [...path], strInfo });
         }
       }
     });
@@ -119,8 +119,8 @@ module.exports = function(core) {
   };
   instr.getAggregateVulnerabilityInfo = function getAggregateVulnerabilityInfo(aggregation) {
+    const reportSafe = [];
     let vulnInfo = null;
-    let reportSafe = null;
     if (!isNonEmptyObject(aggregation)) return { vulnInfo, reportSafe };
@@ -141,8 +141,8 @@ module.exports = function(core) {
           if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
             vulnInfo = { path: [...path], strInfo };
             return true; // halts traversal
-          } else {
-            reportSafe = { path: [...path], strInfo };
+          } else if (config.assess.safe_positives.enable) {
+            reportSafe.push({ path: [...path], strInfo });
           }
         }
       }
@@ -152,16 +152,16 @@ module.exports = function(core) {
   };
   instr.getMapReduceVulnerabilityInfo = function getMapReduceVulnerabilityInfo(argToCheck, argIdx) {
+    const reportSafe = [];
     let vulnInfo = null;
-    let reportSafe = null;
     if (argIdx !== 2 && isString(argToCheck)) {
       const strInfo = tracker.getData(argToCheck);
       if (strInfo) {
         if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
           vulnInfo = { strInfo };
-        } else {
-          reportSafe = { strInfo };
+        } else if (config.assess.safe_positives.enable) {
+          reportSafe.push({ strInfo });
         }
       }
@@ -181,8 +181,8 @@ module.exports = function(core) {
           if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
             vulnInfo = { path: [...path], strInfo };
             return true; // halts traversal
-          } else {
-            reportSafe = { path: [...path], strInfo };
+          } else if (config.assess.safe_positives.enable) {
+            reportSafe.push({ path: [...path], strInfo });
           }
         }
       }
@@ -192,16 +192,16 @@ module.exports = function(core) {
   };
   instr.getGroupVulnerabilityInfo = function getGroupVulnerabilityInfo(argToCheck, argIdx) {
+    const reportSafe = [];
     let vulnInfo = null;
-    let reportSafe = null;
     if (argIdx !== 1 && isString(argToCheck)) {
       const strInfo = tracker.getData(argToCheck);
       if (strInfo) {
         if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
           vulnInfo = { strInfo };
-        } else {
-          reportSafe = { strInfo };
+        } else if (config.assess.safe_positives.enable) {
+          reportSafe.push({ strInfo });
         }
       }
@@ -216,8 +216,8 @@ module.exports = function(core) {
         if (isVulnerable(UNTRUSTED, querySafeTags, strInfo.tags)) {
           vulnInfo = { path: [...path], strInfo };
           return true; // halts traversal
-        } else {
-          reportSafe = { path: [...path], strInfo };
+        } else if (config.assess.safe_positives.enable) {
+          reportSafe.push({ path: [...path], strInfo });
         }
       }
     });
@@ -248,12 +248,19 @@ module.exports = function(core) {
             vulnArgIdx = argIdx;
             break;
           }
-          if (reportSafe) safeReports.push({ ...reportSafe, argIdx });
+          if (config.assess.safe_positives.enable && reportSafe.length) {
+            reportSafe.forEach(el => safeReports.push({ ...el, argIdx }));
+          }
         }
         if (!vulnInfo) {
           if (safeReports.length && config.assess.safe_positives.enable) {
-            const safeTags = safeReports.map((report) => filterSafeTags(querySafeTags, report.strInfo));
+            const safeTags = safeReports
+              .map((report) => filterSafeTags(querySafeTags, report.strInfo))
+              .flat()
+              .filter((value, index, self) => index === self.indexOf(value));
             const strInfo = safeReports.map((report) => {
               const tags = report.path ? utils.createAdjustedQueryTags(report.path, report.strInfo.tags, report.strInfo.value, inspect(origArgs[report.argIdx], { depth: 4 })) : report.strInfo?.tags;
@@ -266,7 +273,7 @@ module.exports = function(core) {
             reportSafePositive({
               name,
               ruleId: NOSQL_INJECTION_MONGO,
-              safeTags: safeTags.length === 1 ? safeTags[0] : safeTags,
+              safeTags,
               strInfo: strInfo.length === 1 ? strInfo[0] : strInfo
             });
           }
@@ -323,8 +330,6 @@ module.exports = function(core) {
     });
   };
-  return instr;
   function patchCollection(mongodb, version) {
     for (const method of collectionMethods) {
       const proto = mongodb.Collection.prototype;
@@ -400,4 +405,6 @@ module.exports = function(core) {
     return name;
   }
+  return instr;
 };

package/lib/dataflow/sinks/install/mssql.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -39,10 +39,10 @@ module.exports = function(core) {
     config,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, isLocked, reportFindings, reportSafePositive },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/mysql.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -46,10 +46,10 @@ module.exports = function(core) {
     patcher,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
-        sinks: { isVulnerable, isLocked, reportFindings },
-        eventFactory: { createSinkEvent },
+        sinks: { isVulnerable, isLocked, reportFindings }
       },
     },
   } = core;

package/lib/dataflow/sinks/install/postgres.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -30,10 +30,10 @@ module.exports = function(core) {
     patcher,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, isLocked, reportFindings, reportSafePositive },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/sequelize.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -35,10 +35,10 @@ module.exports = function(core) {
     config,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, runInActiveSink, reportFindings, reportSafePositive },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/sqlite3.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -35,10 +35,10 @@ module.exports = function(core) {
     patcher,
     scopes: { sources },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: { isVulnerable, isLocked, reportFindings },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sinks/install/vm.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -48,6 +48,7 @@ module.exports = function(core) {
     patcher,
     scopes: { sources, instrumentation },
     assess: {
+      eventFactory: { createSinkEvent },
       dataflow: {
         tracker,
         sinks: {
@@ -57,7 +58,6 @@ module.exports = function(core) {
           reportFindings,
           reportSafePositive,
         },
-        eventFactory: { createSinkEvent },
       },
     },
   } = core;

package/lib/dataflow/sources/common.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/handler.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -25,10 +25,10 @@ const {
 module.exports = function(core) {
   const {
     assess: {
+      eventFactory,
       dataflow: {
         sources,
-        tracker,
-        eventFactory
+        tracker
       }
     },
     config,

package/lib/dataflow/sources/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/body-parser1.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/busboy1.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/cookie-parser1.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/express/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/express/params.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/express/parsedUrl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/fastify/fastify.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/fastify/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/formidable1.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/http.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -80,7 +80,7 @@ module.exports = function(core) {
         pre(data) {
           const [name = '', value] = data.args;
           if (toLowerCase(name) === 'content-type' && value) {
-            scopes.sources.getStore().assess.responseData.contentType = value;
+            store.assess.responseData.contentType = value;
           }
         }
       });

package/lib/dataflow/sources/install/koa/index.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/koa/koa-bodyparsers.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/koa/koa-routers.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/koa/koa2.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/qs6.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/sources/install/querystring.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/tag-utils.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/tracker.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -21,11 +21,7 @@ const { isString } = require('@contrast/common');
 module.exports = function tracker(core) {
   const {
     assess: {
-      dataflow: {
-        eventFactory: {
-          createdEvents
-        }
-      }
+      eventFactory: { createdEvents },
     },
     logger
   } = core;

package/lib/dataflow/utils/is-safe-content-type.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/dataflow/utils/is-vulnerable.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial

package/lib/{dataflow/event-factory.js → event-factory.js} RENAMED Viewed

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
@@ -26,7 +26,7 @@ module.exports = function(core) {
     scopes: { sources },
   } = core;
-  const eventFactory = core.assess.dataflow.eventFactory = {};
+  const eventFactory = core.assess.eventFactory = {};
   eventFactory.createdEvents = new WeakSet();
@@ -214,5 +214,61 @@ module.exports = function(core) {
     return event;
   };
+  eventFactory.createSessionEvent = function(data) {
+    const {
+      context,
+      name = '',
+      moduleName,
+      methodName,
+      object = { value: null, tracked: false },
+      args = [],
+      result = { value: null, tracked: false },
+      source,
+      stacktraceOpts,
+      framework,
+      options
+    } = data;
+    if (!name) {
+      logger.debug({ data }, 'no sink event name');
+      return null;
+    }
+    if (
+      (!source || !source.match(annotationRegExp))
+    ) {
+      logger.debug({ data }, 'malformed or missing sink event source field');
+      return null;
+    }
+    let stack;
+    if (config.assess.stacktraces !== 'NONE') {
+      stack = createSnapshot(stacktraceOpts)();
+    } else {
+      stack = [];
+    }
+    const event = {
+      args,
+      context,
+      history: [],
+      name,
+      moduleName,
+      methodName,
+      object,
+      result,
+      source,
+      stack,
+      tags: {},
+      time: Date.now(),
+      framework,
+      options,
+    };
+    eventFactory.createdEvents.add(event);
+    return event;
+  };
   return eventFactory;
 };