@contrast/assess 1.53.0 → 1.54.1

package/lib/dataflow/propagation/install/mongoose/schema-string.js

@@ -67,7 +67,7 @@ module.exports = function (core) {
             },
             target: 'R',
             stacktraceOpts: {
-              prependFrames: [data.orig],
+              constructorOpt: data.hooked
             },
           });
 
@@ -110,7 +110,7 @@ module.exports = function (core) {
             },
             target: 'R',
             stacktraceOpts: {
-              prependFrames: [data.orig],
+              constructorOpt: data.hooked
             },
           });
 
@@ -269,9 +269,8 @@ module.exports = function (core) {
           : {}),
       },
       target: 'P0',
-      stacktraceOpts: {
-        prependFrames: [orig],
-      },
+      // todo
+      // stacktraceOpts:
     });
 
     if (!event) {

package/lib/dataflow/propagation/install/mustache-escape.js

@@ -40,7 +40,7 @@ module.exports = function(core) {
           patchType,
           usePerf: 'sync',
           post(data) {
-            const { args, result, hooked, orig } = data;
+            const { args, result, hooked } = data;
             if (!result || !args[0] || !getPropagatorContext()) return;
 
             const argInfo = tracker.getData(args[0]);
@@ -57,7 +57,9 @@ module.exports = function(core) {
               name,
               moduleName: 'mustache',
               methodName: 'escape',
-              context: `mustache.escape(${argInfo.value})`,
+              get context() {
+                return `mustache.escape(${argInfo.value})`;
+              },
               object: {
                 value: 'mustache',
                 tracked: false
@@ -74,7 +76,6 @@ module.exports = function(core) {
               addedTags: [HTML_ENCODED],
               stacktraceOpts: {
                 constructorOpt: hooked,
-                prependFrames: [orig]
               },
             });
 

package/lib/dataflow/propagation/install/mysql-connection-escape.js

@@ -17,7 +17,7 @@
 
 const { DataflowTag: { SQL_ENCODED } } = require('@contrast/common');
 const { createFullLengthCopyTags } = require('../../tag-utils');
-const { patchType, createModuleLabel } = require('../common');
+const { patchType } = require('../common');
 
 module.exports = function(core) {
   const {
@@ -32,7 +32,7 @@ module.exports = function(core) {
 
   function createPostHook(eventName, objectValue) {
     return function(data) {
-      const { args, result, hooked, orig } = data;
+      const { args, result, hooked } = data;
       if (!result || !args[0] || !getPropagatorContext()) return;
 
       const argInfo = tracker.getData(args[0]);
@@ -49,7 +49,9 @@ module.exports = function(core) {
         name: eventName,
         moduleName: 'mysql',
         methodName: 'escape',
-        context: `mysql.escape('${argInfo.value}')`,
+        get context() {
+          return `mysql.escape('${argInfo.value}')`;
+        },
         object: {
           value: objectValue,
           tracked: false
@@ -66,7 +68,6 @@ module.exports = function(core) {
         target: 'R',
         stacktraceOpts: {
           constructorOpt: hooked,
-          prependFrames: [orig]
         },
       });
 
@@ -92,7 +93,7 @@ module.exports = function(core) {
           name: 'mysql.escape',
           patchType,
           usePerf: 'sync',
-          post: createPostHook('mysql.escape', `${createModuleLabel('mysql', version)}`)
+          post: createPostHook('mysql.escape', 'mysql')
         });
       });
 
@@ -101,7 +102,7 @@ module.exports = function(core) {
           name: 'mysql.Connection.prototype.escape',
           patchType,
           usePerf: 'sync',
-          post: createPostHook('mysql/lib/Connection.escape', `[${createModuleLabel('mysql', version)}].Connection`)
+          post: createPostHook('mysql/lib/Connection.escape', 'mysql.Connection')
         });
       });
 
@@ -111,7 +112,7 @@ module.exports = function(core) {
           name: 'mysql2.escape',
           patchType,
           usePerf: 'sync',
-          post: createPostHook('mysql2.escape', `${createModuleLabel('mysql2', version)}`)
+          post: createPostHook('mysql2.escape', 'mysql2')
         });
       });
 
@@ -120,7 +121,7 @@ module.exports = function(core) {
           name: 'mysql2.Connection.prototype.escape',
           patchType,
           usePerf: 'sync',
-          post: createPostHook('mysql2/lib/connection.Connection.escape', `[${createModuleLabel('mysql2', version)}].Connection`)
+          post: createPostHook('mysql2/lib/connection.Connection.escape', 'mysql2.Connection')
         });
       });
     },

package/lib/dataflow/propagation/install/path/basename.js

@@ -17,6 +17,7 @@
 
 const { isString, primordials: { ArrayPrototypeJoin } } = require('@contrast/common');
 const { patchType } = require('../../common');
+const { pathObject: object } = require('./common');
 const { excludeExtensionDotFromTags, createBasenameTagsInResult } = require('./common');
 
 module.exports = function(core) {
@@ -41,7 +42,7 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args: origArgs, result, name, hooked, orig } = data;
+              const { args: origArgs, result, name, hooked } = data;
 
               if (!result || !getPropagatorContext()) return;
 
@@ -77,12 +78,11 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'basename',
-                context: `path.basename(${ArrayPrototypeJoin.call(args.map(a => `'${a.value}'`))})`,
-                history: [strInfo],
-                object: {
-                  value: 'path',
-                  isTracked: false,
+                get context() {
+                  return `path.basename(${ArrayPrototypeJoin.call(args.map(a => `'${a.value}'`))})`;
                 },
+                history: [strInfo],
+                object,
                 args,
                 result: {
                   value: result,
@@ -93,7 +93,6 @@ module.exports = function(core) {
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
 

package/lib/dataflow/propagation/install/path/common.js

@@ -170,6 +170,7 @@ function excludeExtensionDotFromTags({ result, tags, isWin32 }) {
 }
 
 module.exports = {
+  pathObject: Object.freeze({ value: 'path', tracked: false }),
   createBasenameTagsInResult,
   createArgTagsInResult,
   excludeExtensionDotFromTags,

package/lib/dataflow/propagation/install/path/dirname.js

@@ -16,7 +16,7 @@
 'use strict';
 const { isString } = require('@contrast/common');
 const { patchType } = require('../../common');
-const { createArgTagsInResult } = require('./common');
+const { createArgTagsInResult, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -40,7 +40,7 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name, hooked, orig } = data;
+              const { args, result, name, hooked } = data;
 
               if (!result || !getPropagatorContext()) return;
 
@@ -64,12 +64,11 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'dirname',
-                context: `path.dirname('${strInfo.value}')`,
-                history: [strInfo],
-                object: {
-                  value: 'path',
-                  isTracked: false,
+                get context() {
+                  return `path.dirname('${strInfo.value}')`;
                 },
+                history: [strInfo],
+                object,
                 args: [
                   {
                     value: strInfo.value,
@@ -85,7 +84,6 @@ module.exports = function(core) {
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
 

package/lib/dataflow/propagation/install/path/extname.js

@@ -18,7 +18,7 @@
 const { isString } = require('@contrast/common');
 const { createSubsetTags } = require('../../../tag-utils');
 const { patchType } = require('../../common');
-const { excludeExtensionDotFromTags } = require('./common');
+const { excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -42,15 +42,13 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name, hooked, orig } = data;
+              const { args, result, name, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const pathStr = args[0];
-
               if (!pathStr || !isString(pathStr)) return;
 
               const strInfo = tracker.getData(pathStr);
-
               if (!strInfo) return;
 
               let newTags = createSubsetTags(strInfo.tags, pathStr.indexOf(result), result.length);
@@ -65,35 +63,23 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'extname',
-                context: `path.extname('${strInfo.value}')`,
-                history: [strInfo],
-                object: {
-                  value: 'path',
-                  isTracked: false,
-                },
-                args: [
-                  {
-                    value: strInfo.value,
-                    tracked: true,
-                  },
-                ],
-                result: {
-                  value: result,
-                  tracked: true,
+                get context() {
+                  return `path.extname('${strInfo.value}')`;
                 },
+                history: [strInfo],
+                object,
+                args: [{ value: strInfo.value, tracked: true }],
+                result: { value: result, tracked: true },
                 tags: newTags,
                 source: 'P',
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
-
               if (!event) return;
 
               const { extern } = tracker.track(result, event);
-
               if (extern) {
                 data.result = extern;
               }

package/lib/dataflow/propagation/install/path/format.js

@@ -18,7 +18,7 @@
 const { primordials: { ArrayPrototypeJoin }, isString } = require('@contrast/common');
 const { createMergedTags, getAdjustedUntrackedValue } = require('../../../tag-utils');
 const { patchType } = require('../../common');
-const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
+const { createArgTagsInResult, excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -42,7 +42,7 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name: patchName, hooked, orig } = data;
+              const { args, result, name: patchName, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const pathProps = [];
@@ -92,12 +92,11 @@ module.exports = function(core) {
                 name: patchName,
                 moduleName: 'path',
                 methodName: 'format',
-                context: `path.format(${ArrayPrototypeJoin.call(eventArgs.map((a) => a.value))})`,
-                history,
-                object: {
-                  value: 'path',
-                  isTracked: false,
+                get context() {
+                  return `path.format(${ArrayPrototypeJoin.call(eventArgs.map((a) => a.value))})`;
                 },
+                history,
+                object,
                 args: eventArgs,
                 result: {
                   value: result,
@@ -108,14 +107,11 @@ module.exports = function(core) {
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
-
               if (!event) return;
 
               const { extern } = tracker.track(result, event);
-
               if (extern) {
                 data.result = extern;
               }

package/lib/dataflow/propagation/install/path/join-and-resolve.js

@@ -18,7 +18,7 @@
 const { isString, primordials: { ArrayPrototypeJoin } } = require('@contrast/common');
 const { createMergedTags } = require('../../../tag-utils');
 const { patchType } = require('../../common');
-const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
+const { createArgTagsInResult, excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -44,7 +44,7 @@ module.exports = function(core) {
               patchType,
               usePerf: 'sync',
               post(data) {
-                const { args: origArgs, result, hooked, orig } = data;
+                const { args: origArgs, result, hooked } = data;
 
                 if (!result || !getPropagatorContext()) return;
 
@@ -92,24 +92,18 @@ module.exports = function(core) {
                   name,
                   moduleName: 'path',
                   methodName: method,
-                  context: `path.${method}(${ArrayPrototypeJoin.call(args
-                    .map((a) => `'${a.value}'`), ',')})`,
-                  history,
-                  object: {
-                    value: 'path',
-                    isTracked: false,
+                  get context() {
+                    return `path.${method}(${ArrayPrototypeJoin.call(args.map((a) => `'${a.value}'`), ',')})`;
                   },
+                  history,
+                  object,
                   args,
-                  result: {
-                    value: result,
-                    tracked: true,
-                  },
+                  result: { value: result, tracked: true },
                   tags: fullTags,
                   source: 'P',
                   target: 'R',
                   stacktraceOpts: {
                     constructorOpt: hooked,
-                    prependFrames: [orig],
                   },
                 });
 

package/lib/dataflow/propagation/install/path/normalize.js

@@ -16,7 +16,7 @@
 'use strict';
 const { isString } = require('@contrast/common');
 const { patchType } = require('../../common');
-const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
+const { createArgTagsInResult, excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -40,7 +40,7 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name, hooked, orig } = data;
+              const { args, result, name, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const pathStr = args[0];
@@ -69,28 +69,18 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'normalize',
-                context: `path.normalize('${strInfo.value}')`,
-                history: [strInfo],
-                object: {
-                  value: 'path',
-                  isTracked: false,
-                },
-                args: [
-                  {
-                    value: strInfo.value,
-                    tracked: true,
-                  },
-                ],
-                result: {
-                  value: result,
-                  tracked: true,
+                get context() {
+                  return `path.normalize('${strInfo.value}')`;
                 },
+                history: [strInfo],
+                object,
+                args: [{ value: strInfo.value, tracked: true }],
+                result: { value: result, tracked: true },
                 tags: newTags,
                 source: 'P',
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
 

package/lib/dataflow/propagation/install/path/parse.js

@@ -17,7 +17,7 @@
 const { isString } = require('@contrast/common');
 const { createSubsetTags } = require('../../../tag-utils');
 const { patchType } = require('../../common');
-const { excludeExtensionDotFromTags } = require('./common');
+const { excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -42,7 +42,7 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name: patchName, hooked, orig } = data;
+              const { args, result, name: patchName, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const [path] = args;
@@ -67,28 +67,18 @@ module.exports = function(core) {
                   name: patchName,
                   moduleName: 'path',
                   methodName: 'parse',
-                  context: `path.parse('${strInfo.value}')`,
-                  history: [strInfo],
-                  object: {
-                    value: 'path',
-                    isTracked: false,
-                  },
-                  args: [
-                    {
-                      value: strInfo.value,
-                      tracked: true
-                    }
-                  ],
-                  result: {
-                    value: inspect(result),
-                    tracked: true,
+                  get context() {
+                    return `path.parse('${strInfo.value}')`;
                   },
+                  history: [strInfo],
+                  object,
+                  args: [{ value: strInfo.value, tracked: true }],
+                  result: { value: inspect(result), tracked: true },
                   tags: newTags,
                   source: 'P',
                   target: 'R',
                   stacktraceOpts: {
                     constructorOpt: hooked,
-                    prependFrames: [orig],
                   },
                 });
 

package/lib/dataflow/propagation/install/path/relative.js

@@ -17,7 +17,7 @@
 
 const { isString } = require('@contrast/common');
 const { patchType } = require('../../common');
-const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
+const { createArgTagsInResult, excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -41,15 +41,15 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name, hooked, orig } = data;
+              const { args, result, name, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const [fromStr, toStr] = args;
 
               if (!toStr || !isString(toStr)) return;
+
               const fromStrInfo = tracker.getData(fromStr);
               const toStrInfo = tracker.getData(toStr);
-
               if (!toStrInfo) return;
 
               let { newTags } = createArgTagsInResult({
@@ -70,12 +70,11 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'relative',
-                context: `path.relative('${fromStr}', '${toStr}')`,
-                history: [toStrInfo],
-                object: {
-                  value: 'path',
-                  isTracked: false,
+                get context() {
+                  return `path.relative('${fromStr}', '${toStr}')`;
                 },
+                history: [toStrInfo],
+                object,
                 args: [
                   {
                     value: fromStrInfo?.value || fromStr,
@@ -86,23 +85,17 @@ module.exports = function(core) {
                     tracked: !!toStrInfo,
                   }
                 ],
-                result: {
-                  value: result,
-                  tracked: true,
-                },
+                result: { value: result, tracked: true },
                 tags: newTags,
                 source: 'P',
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
-
               if (!event) return;
 
               const { extern } = tracker.track(result, event);
-
               if (extern) {
                 data.result = extern;
               }

package/lib/dataflow/propagation/install/path/toNamespacedPath.js

@@ -17,7 +17,7 @@
 
 const { isString } = require('@contrast/common');
 const { patchType } = require('../../common');
-const { createArgTagsInResult, excludeExtensionDotFromTags } = require('./common');
+const { createArgTagsInResult, excludeExtensionDotFromTags, pathObject: object } = require('./common');
 
 module.exports = function(core) {
   const {
@@ -40,16 +40,14 @@ module.exports = function(core) {
             patchType,
             usePerf: 'sync',
             post(data) {
-              const { args, result, name, hooked, orig } = data;
+              const { args, result, name, hooked } = data;
               if (!result || !getPropagatorContext()) return;
 
               const pathStr = args[0];
-
               if (!pathStr || !isString(pathStr)) return;
 
               const strInfo = tracker.getData(pathStr);
               const resultInfo = tracker.getData(result);
-
               if (!strInfo) return;
 
               let { tags } = strInfo;
@@ -75,18 +73,12 @@ module.exports = function(core) {
                 name,
                 moduleName: 'path',
                 methodName: 'toNamespacedPath',
-                context: `path.toNamespacedPath('${strInfo.value}')`,
-                history: [{ ...strInfo }],
-                object: {
-                  value: 'path',
-                  isTracked: false,
+                get context() {
+                  return `path.toNamespacedPath('${strInfo.value}')`;
                 },
-                args: [
-                  {
-                    value: strInfo.value,
-                    tracked: true,
-                  },
-                ],
+                history: [{ ...strInfo }],
+                object,
+                args: [{ value: strInfo.value, tracked: true }],
                 result: {
                   value: resultInfo ? resultInfo.value : result,
                   tracked: true,
@@ -96,10 +88,8 @@ module.exports = function(core) {
                 target: 'R',
                 stacktraceOpts: {
                   constructorOpt: hooked,
-                  prependFrames: [orig],
                 },
               });
-
               if (!event) return;
 
               if (resultInfo) {
@@ -107,7 +97,6 @@ module.exports = function(core) {
               }
 
               const { extern } = resultInfo || tracker.track(result, event);
-
               if (extern) {
                 data.result = extern;
               }

package/lib/dataflow/propagation/install/pug/index.js

@@ -17,7 +17,7 @@
 const { patchType } = require('../../common');
 
 /** @type {import('@contrast/rewriter').RewriteOpts} */
-const REWRITE_OPTS = { isModule: false, inject: false, wrap: false };
+const REWRITE_OPTS = { isModule: false, inject: false, wrap: false, minify: false };
 
 module.exports = function (core) {
   const store = { lock: true, name: 'assess:propagators:pug-compile' };