@contrast/agent 4.10.3 → 4.10.4

package/lib/core/express/index.js

@@ -26,7 +26,7 @@ const { isString } = require('../../util/is-string');
 const { emitSendEvent } = require('../../hooks/frameworks/common');
 const {
   prototype: { decorateRequest },
-  setFrameworkRequest
+  setFrameworkRequest,
 } = require('../../hooks/frameworks/base');
 const ExpressRequest = require('../../reporter/models/frameworks/express-request');
 
@@ -40,7 +40,7 @@ const {
   INPUT_TYPES,
   SINK_TYPES,
   MW_PATH,
-  LAYER_STACK
+  LAYER_STACK,
 } = constants;
 const { EVENTS } = Helpers;
 
@@ -111,14 +111,14 @@ class ExpressFramework {
         agentEmitter.emit(
           EVENTS.REQUEST_SEND,
           data.args[0],
-          SINK_TYPES.RESPONSE_BODY
+          SINK_TYPES.RESPONSE_BODY,
         );
 
-        const body = data.args[0];
+        const [body] = data.args;
         if (isString(body)) {
           emitSendEvent(body.valueOf());
         }
-      }
+      },
     });
 
     patcher.patch(express.response, 'push', {
@@ -128,14 +128,14 @@ class ExpressFramework {
         agentEmitter.emit(
           EVENTS.REQUEST_SEND,
           data.args[0],
-          SINK_TYPES.RESPONSE_BODY
+          SINK_TYPES.RESPONSE_BODY,
         );
 
-        const body = data.args[0];
+        const [body] = data.args;
         if (isString(body)) {
           emitSendEvent(body.valueOf());
         }
-      }
+      },
     });
 
     patcher.patch(express.response, 'end', {
@@ -145,9 +145,9 @@ class ExpressFramework {
         agentEmitter.emit(
           EVENTS.REQUEST_SEND,
           data.args[0],
-          SINK_TYPES.RESPONSE_BODY
+          SINK_TYPES.RESPONSE_BODY,
         );
-      }
+      },
     });
 
     patcher.patch(express.Router, 'use', {
@@ -157,7 +157,7 @@ class ExpressFramework {
       pre: self.injectContrastMiddleware.bind(self),
       post: (wrapCtx) => {
         agentEmitter.emit(EVENTS.ROUTER_USE, self, wrapCtx);
-      }
+      },
     });
 
     patcher.patch(express.Router, 'route', {
@@ -166,7 +166,7 @@ class ExpressFramework {
       alwaysRun: true,
       post: (wrapCtx) => {
         agentEmitter.emit(EVENTS.ROUTER_ROUTE, self, wrapCtx);
-      }
+      },
     });
 
     LC_HTTP_VERBS.forEach((verb) => {
@@ -177,7 +177,7 @@ class ExpressFramework {
         pre: self.injectContrastMiddleware.bind(self),
         post: (wrapCtx) => {
           agentEmitter.emit(EVENTS.ROUTER_METHOD, self, wrapCtx, verb);
-        }
+        },
       });
     });
 
@@ -188,7 +188,7 @@ class ExpressFramework {
       pre: self.injectContrastMiddleware.bind(self),
       post: (wrapCtx) => {
         agentEmitter.emit(EVENTS.ROUTER_METHOD, self, wrapCtx, 'all');
-      }
+      },
     });
 
     patcher.patch(express.application, 'use', {
@@ -198,7 +198,7 @@ class ExpressFramework {
       pre: self.injectContrastMiddleware.bind(self),
       post: (wrapCtx) => {
         agentEmitter.emit(EVENTS.APP_USE, self, wrapCtx);
-      }
+      },
     });
 
     LC_HTTP_VERBS.forEach((verb) => {
@@ -209,7 +209,7 @@ class ExpressFramework {
         pre: self.injectContrastMiddleware.bind(self),
         post: (wrapCtx) => {
           agentEmitter.emit(EVENTS.APP_METHOD, self, wrapCtx, verb);
-        }
+        },
       });
     });
 
@@ -220,7 +220,7 @@ class ExpressFramework {
       pre: self.injectContrastMiddleware.bind(self),
       post: (wrapCtx) => {
         agentEmitter.emit(EVENTS.APP_METHOD, self, wrapCtx, 'all');
-      }
+      },
     });
 
     agentEmitter.on(HTTP_EVENTS.SERVER_CREATE, this.onServerCreate.bind(this));
@@ -238,7 +238,7 @@ class ExpressFramework {
     if (!app || !app.defaultConfiguration) {
       logger.error(
         `non-express application mistakenly registered`,
-        new Error().stack
+        new Error().stack,
       );
       return;
     }
@@ -305,7 +305,7 @@ class ExpressFramework {
         EVENTS.REQUEST_READY,
         req,
         res,
-        INPUT_TYPES.QUERYSTRING
+        INPUT_TYPES.QUERYSTRING,
       );
       next();
     }, 'query');
@@ -322,6 +322,14 @@ class ExpressFramework {
       next();
     }, 'rawParser');
 
+    // ... bodyParser in Sails Framework ............................
+    this.useAfter(function ContrastBodyParsed(req, res, next) {
+      if (req._sails && req.body) {
+        agentEmitter.emit(EVENTS.BODY_PARSED, req, res, INPUT_TYPES.BODY);
+      }
+      next();
+    }, '_parseHTTPBody');
+
     this.useAfter(function ContrastTextBodyParsed(req, res, next) {
       agentEmitter.emit(EVENTS.BODY_PARSED, req, res, INPUT_TYPES.BODY);
       next();
@@ -329,7 +337,7 @@ class ExpressFramework {
 
     this.useAfter(function ContrastBodyParsed(req, res, next) {
       agentEmitter.emit(EVENTS.BODY_PARSED, req, res, {
-        type: INPUT_TYPES.BODY
+        type: INPUT_TYPES.BODY,
       });
       next();
     }, 'urlencodedParser');
@@ -345,7 +353,7 @@ class ExpressFramework {
         EVENTS.COOKIES_PARSED,
         req,
         res,
-        INPUT_TYPES.COOKIE_VALUE
+        INPUT_TYPES.COOKIE_VALUE,
       );
 
       next();
@@ -395,7 +403,7 @@ class ExpressFramework {
             patchType: PATCH_TYPES.SOURCE,
             pre(data) {
               req[LAYER_STACK].pop();
-            }
+            },
           });
           if (req.query) {
             decorateRequest({ query: req.query });
@@ -406,11 +414,11 @@ class ExpressFramework {
               EVENTS.PARAM_PARSED,
               req,
               res,
-              INPUT_TYPES.URL_PARAMETER
+              INPUT_TYPES.URL_PARAMETER,
             );
 
             decorateRequest({
-              parameters: req.params
+              parameters: req.params,
             });
           }
 
@@ -425,20 +433,15 @@ class ExpressFramework {
            */
           if (req.body) {
             decorateRequest({ body: req.body });
-
-            // BODY_PARSED event is emitted to support Sails framework
-            if (req._sails) {
-              agentEmitter.emit(EVENTS.BODY_PARSED, req, res, req.body);
-            }
           }
-        }
+        },
       });
     }
   }
 
   useAfter(fn, after) {
     this.handlers[after] = {
-      post: fn
+      post: fn,
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "4.10.3",
+  "version": "4.10.4",
   "description": "Node.js security instrumentation by Contrast Security",
   "keywords": [
     "security",