@contrast/assess 1.27.2 → 1.28.1

package/lib/index.js

@@ -15,9 +15,12 @@
 
 'use strict';
 
+const { inspect } = require('util');
 const { callChildComponentMethodsSync } = require('@contrast/common');
 
 module.exports = function assess(core) {
+  const { scopes: { instrumentation } } = core;
+
   const assess = core.assess = {
     install() {
       if (!core.config.getEffectiveValue('assess.enable')) {
@@ -30,6 +33,16 @@ module.exports = function assess(core) {
     },
   };
 
+  // todo: this is temporary fix for using inspect during creation of event
+  // data. once all uses of inspect are refactored out of remaining sinks and
+  // propagators etc, this can also be removed.
+  const store = { lock: true, name: 'assess.inspect' };
+  assess.inspect = function(val, opts) {
+    return instrumentation.isLocked() ?
+      inspect(val, opts) :
+      instrumentation.run(store, inspect, val, opts);
+  };
+
   require('./rule-scopes')(core);
   require('./get-policy')(core);
   require('./make-source-context')(core);

package/lib/session-configuration/install/express-session.js

@@ -14,7 +14,6 @@
  */
 'use strict';
 
-const util = require('util');
 const { toLowerCase } = require('@contrast/common');
 const { patchType } = require('../common');
 
@@ -27,6 +26,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
+      inspect, // todo: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {
@@ -40,8 +40,6 @@ module.exports = function (core) {
 
   const expressSession = core.assess.sessionConfiguration.expressSession = {};
 
-  const inspect = patcher.unwrap(util.inspect);
-
   expressSession.install = function () {
     return depHooks.resolve({ name: 'express-session' }, (session) => {
       // Return the hooked function as the export.

package/lib/session-configuration/install/fastify-cookie.js

@@ -14,7 +14,6 @@
  */
 'use strict';
 
-const { inspect } = require('util');
 const { toLowerCase } = require('@contrast/common');
 const { patchType } = require('../common');
 
@@ -27,6 +26,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
+      inspect, // todo: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {

package/lib/session-configuration/install/hapi.js

@@ -14,12 +14,12 @@
  */
 'use strict';
 
-const util = require('util');
 const { patchType } = require('../common');
 
 module.exports = function (core) {
   const {
     assess: {
+      inspect, // todo: remove
       eventFactory: { createSessionEvent },
       sessionConfiguration: {
         handleHttpOnly,
@@ -33,8 +33,6 @@ module.exports = function (core) {
 
   const hapiSession = core.assess.sessionConfiguration.hapiSession = {};
 
-  const inspect = patcher.unwrap(util.inspect);
-
   hapiSession.install = function () {
     return depHooks.resolve({ name: '@hapi/hapi', version: '>=18 <22' }, (hapi) => {
       ['server', 'Server'].forEach((server) => {

package/lib/session-configuration/install/koa.js

@@ -14,7 +14,6 @@
  */
 'use strict';
 
-const { inspect } = require('util');
 const { patchType } = require('../common');
 
 /**
@@ -26,6 +25,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
+      inspect, // todo: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/assess",
-  "version": "1.27.2",
+  "version": "1.28.1",
   "description": "Contrast service providing framework-agnostic Assess support",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -17,7 +17,7 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.20.1",
+    "@contrast/common": "1.21.0",
     "@contrast/distringuish": "^4.4.0",
     "@contrast/scopes": "1.4.1"
   }