@contrast/protect 1.50.0 → 1.52.0

package/lib/error-handlers/init-domain.js

@@ -15,47 +15,12 @@
 
 'use strict';
 
-const process = require('process');
-const semver = require('semver');
+const { Domain } = require('async-hook-domain');
 
 module.exports = function(core) {
-  const {
-    logger,
-    protect: { errorHandlers }
-  } = core;
+  const { protect: { errorHandlers } } = core;
 
-  Object.assign(errorHandlers, initSupportedDomainPackage());
-
-  return errorHandlers.initDomain = function(req, res) {
-    const { AsyncHookDomain, Domain } = errorHandlers;
-
-    if (AsyncHookDomain) {
-      new AsyncHookDomain(errorHandlers.commonHandler);
-    } else {
-      const domain = new Domain();
-      domain.add(req);
-      domain.add(res);
-      domain.on('error', errorHandlers.commonHandler);
-      return domain;
-    }
+  return errorHandlers.initDomain = function initDomain() {
+    return new Domain(errorHandlers.commonHandler);
   };
-
-  function initSupportedDomainPackage() {
-    let AsyncHookDomain, Domain;
-
-    if (semver.lt(process.version, '16.0.0')) {
-      logger.info(
-        '%s. %s. %s.',
-        'falling back to deprecated \'domain\' module for async SecurityException handling',
-        'upgrade to Node 16 LTS or above to allow use of \'async-hook-domain\' modern alternative',
-        'upgrading will resolve any deprecation warnings and prevent the logging of this message'
-      );
-
-      Domain = require('domain').Domain;
-    } else {
-      AsyncHookDomain = require('async-hook-domain');
-    }
-
-    return { AsyncHookDomain, Domain };
-  }
 };

package/lib/error-handlers/init-domain.test.js

@@ -5,30 +5,18 @@ const sinon = require('sinon');
 const { initProtectFixture } = require('@contrast/test/fixtures');
 
 describe('protect error-handlers init-domain', function () {
-  let core, errorHandlers, initDomain;
+  let core;
 
   beforeEach(function () {
     ({ core } = initProtectFixture());
 
     sinon.stub(core.protect.errorHandlers, 'commonHandler');
-
-    errorHandlers = core.protect.errorHandlers;
-    initDomain = errorHandlers.initDomain;
   });
 
   describe('domain integration', function () {
-    beforeEach(function () {
-      sinon.stub(errorHandlers, 'AsyncHookDomain');
-    });
-
-    it('initializes correct domain', function () {
-      expect(core.protect.errorHandlers.AsyncHookDomain).to.be.a('function');
-      expect(core.protect.errorHandlers.Domain).to.be.undefined;
-    });
-
     it('instantiates async-hook-domain with common error handler', function () {
-      initDomain();
-      expect(errorHandlers.AsyncHookDomain).to.have.been.calledWith(errorHandlers.commonHandler);
+      const d = core.protect.errorHandlers.initDomain();
+      expect(d.onerror).to.equal(core.protect.errorHandlers.commonHandler);
     });
   });
 });

package/lib/index.d.ts

@@ -17,7 +17,7 @@ import { ReqData, ProtectMessage, ResultMap, ProtectRuleMode } from '@contrast/c
 import { IncomingMessage, ServerResponse } from 'node:http';
 import * as http from 'node:http';
 import * as https from 'node:https';
-import { Domain } from 'domain';
+import { Domain } from 'async-hook-domain';
 
 type Http = typeof http;
 type Https = typeof https;
@@ -114,7 +114,7 @@ export interface Protect {
   }
   errorHandlers: {
     commonHandler: (err: Error) => void;
-    initDomain: () => void | Domain;
+    initDomain: () => Domain;
     fastify3ErrorHandler: {
       _userHandler: null | ((...args: any[]) => any),
       defaultErrorHandler: (error: Error, request: IncomingMessage, reply: ServerResponse) => void,

package/lib/input-analysis/install/http.js

@@ -15,6 +15,7 @@
 
 'use strict';
 
+const onFinished = require('on-finished');
 const { Event, primordials: { StringPrototypeToLowerCase, ArrayPrototypeSlice } } = require('@contrast/common');
 const { patchType } = require('../constants');
 
@@ -51,15 +52,8 @@ module.exports = function (core) {
 
     function callNext() {
       setImmediate(() => {
-        const domain = initDomain(req, res);
-
-        if (domain) {
-          domain.run(() => {
-            next.call(data.obj, ...data.args);
-          });
-        } else {
-          next.call(data.obj, ...data.args);
-        }
+        initDomain();
+        next.call(data.obj, ...data.args);
       });
     }
 
@@ -85,7 +79,7 @@ module.exports = function (core) {
         resData,
       } = store.protect;
 
-      res.on('finish', () => {
+      onFinished(res, (/* err, req */) => {
         resData.statusCode = res.statusCode;
         inputAnalysis.handleRequestEnd(store.protect);
         messages.emit(Event.PROTECT, store);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/protect",
-  "version": "1.50.0",
+  "version": "1.52.0",
   "description": "Contrast service providing framework-agnostic Protect support",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -18,20 +18,19 @@
   },
   "dependencies": {
     "@contrast/agent-lib": "^7.0.1",
-    "@contrast/common": "1.27.0",
-    "@contrast/config": "1.37.0",
-    "@contrast/core": "1.42.0",
-    "@contrast/dep-hooks": "1.11.0",
-    "@contrast/esm-hooks": "2.16.0",
-    "@contrast/instrumentation": "1.21.0",
-    "@contrast/logger": "1.15.0",
-    "@contrast/patcher": "1.14.0",
-    "@contrast/rewriter": "1.18.0",
-    "@contrast/scopes": "1.12.0",
+    "@contrast/common": "1.29.0",
+    "@contrast/config": "1.39.0",
+    "@contrast/core": "1.44.0",
+    "@contrast/dep-hooks": "1.13.0",
+    "@contrast/esm-hooks": "2.18.0",
+    "@contrast/instrumentation": "1.23.0",
+    "@contrast/logger": "1.17.0",
+    "@contrast/patcher": "1.16.0",
+    "@contrast/rewriter": "1.20.0",
+    "@contrast/scopes": "1.14.0",
+    "async-hook-domain": "^4.0.1",
     "ipaddr.js": "^2.0.1",
+    "on-finished": "^2.4.1",
     "semver": "^7.6.0"
-  },
-  "optionalDependencies": {
-    "async-hook-domain": "^3.0.2"
   }
 }