@contrast/assess 1.36.0 → 1.38.0

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

@@ -42,7 +42,7 @@ module.exports = function(core) {
     depHooks,
     patcher,
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSinkEvent },
       dataflow: {

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

@@ -41,7 +41,7 @@ module.exports = function (core) {
     patcher,
     config,
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSinkEvent },
       dataflow: {

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

@@ -57,7 +57,7 @@ module.exports = function (core) {
     depHooks,
     patcher,
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSinkEvent },
       dataflow: {

package/lib/sampler.js

@@ -71,9 +71,9 @@ module.exports = function assess(core) {
         assess.sampler = SamplerFactory[strategy](opts);
       }
     } else {
+      if (assess.sampler) logger.info('assess sampling disabled');
       // disable sampling by setting sampler to null
       assess.sampler = null;
-      logger.info('assess sampling disabled');
     }
   }
 

package/lib/sampler.test.js

@@ -4,6 +4,7 @@ const { EventEmitter } = require('events');
 const { expect } = require('chai');
 const { Event } = require('@contrast/common');
 const mocks = require('@contrast/test/mocks');
+const { devNull } = require('node:os');
 
 const TRIALS = 1000;
 const ZSCORE = 3.891; // 99.99% confidence
@@ -135,7 +136,11 @@ describe('assess sampler', function() {
 
   it('sampler behavior adjusts to series of TS updates', function() {
     // setup
+    const cfgPath = process.env.CONTRAST_CONFIG_PATH;
+    process.env.CONTRAST_CONFIG_PATH = devNull;
     const core = initMockCore();
+    process.env.CONTRAST_CONFIG_PATH = cfgPath;
+
     core.config.setValue('assess.enable', true, 'CONTRAST_UI');
     core.config.setValue('assess.probabilistic_sampling.enable', false, 'DEFAULT_VALUE');
     core.config.setValue('assess.probabilistic_sampling.base_probability', 0.50, 'CONTRAST_UI');
@@ -193,8 +198,6 @@ describe('assess sampler', function() {
 
     // test logging throughout init/updates
     expect(core.logger.info.getCalls().map(c => c.args)).to.deep.equal([
-      // when initialized
-      ['assess sampling disabled'],
       // update 1: env=PRODUCTION enables sampling
       [
         { strategy: 'probabilistic', opts: { base_probability: 0.5 } },
@@ -218,11 +221,11 @@ describe('assess sampler', function() {
 
 function initMockCore() {
   const { CONTRAST_CONFIG_PATH } = process.env;
+  process.env.CONTRAST_CONFIG_PATH = devNull;
+
   let core;
 
   try {
-    // ensure default config if devs use this
-    process.env.CONTRAST_CONFIG_PATH = '';
     core = {
       // sampler needs this namespace to exist
       assess: {},
@@ -235,12 +238,14 @@ function initMockCore() {
     require('@contrast/config')(core);
     core.config.setValue('assess.enable', true, 'CONTRAST_UI');
   } catch (err) {
+    process.env.CONTRAST_CONFIG_PATH = CONTRAST_CONFIG_PATH;
+
     console.dir(err);
     throw err;
   }
 
   // reset to orig value
-  if (CONTRAST_CONFIG_PATH) process.env.CONTRAST_CONFIG_PATH = CONTRAST_CONFIG_PATH;
+  process.env.CONTRAST_CONFIG_PATH = CONTRAST_CONFIG_PATH;
 
   return core;
 }

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

@@ -26,7 +26,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {

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

@@ -26,7 +26,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {

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

@@ -19,7 +19,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       eventFactory: { createSessionEvent },
       sessionConfiguration: {
         handleHttpOnly,

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

@@ -25,7 +25,7 @@ const { patchType } = require('../common');
 module.exports = function (core) {
   const {
     assess: {
-      inspect, // todo: remove
+      inspect, // TODO NODE-3455: remove
       getSourceContext,
       eventFactory: { createSessionEvent },
       sessionConfiguration: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/assess",
-  "version": "1.36.0",
+  "version": "1.38.0",
   "description": "Contrast service providing framework-agnostic Assess support",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "@contrast/common": "1.26.0",
-    "@contrast/config": "1.34.0",
-    "@contrast/core": "1.38.0",
-    "@contrast/dep-hooks": "1.6.0",
+    "@contrast/config": "1.35.0",
+    "@contrast/core": "1.40.0",
+    "@contrast/dep-hooks": "1.8.0",
     "@contrast/distringuish": "^5.1.0",
-    "@contrast/instrumentation": "1.16.0",
-    "@contrast/logger": "1.11.0",
-    "@contrast/patcher": "1.10.0",
-    "@contrast/rewriter": "1.14.0",
-    "@contrast/scopes": "1.7.0",
+    "@contrast/instrumentation": "1.18.0",
+    "@contrast/logger": "1.13.0",
+    "@contrast/patcher": "1.12.0",
+    "@contrast/rewriter": "1.16.0",
+    "@contrast/scopes": "1.9.0",
     "semver": "^7.6.0"
   }
 }