@newrelic/security-agent 2.1.1 → 2.3.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+### v2.3.0 (2025-02-03)
+#### Features
+* Added Support for VM module
+* IAST support for Next.js
+* Support for Insecure settings i.e crypto, hash and random modules 
+
+#### Bug fixes
+* Fix for special characters in ws header
+* Fix for getting transaction in graphql instrumentation 
+* Fix for mongodb unit tests 
+
+#### Miscellaneous chores
+* deps-dev: bump undici from v5.28.4 to v5.28.5
+* Updated axios to v1.7.9 
+
+### v2.2.0 (2024-12-18)
+#### Features
+* Support for express 5.x 
+* IAST support for GraphQL
+* Added support for trustboundary security events
+
+#### Bug fixes
+* Fix for empty route in fastify
+
 ### v2.1.1 (2024-11-07)
 #### Bug fixes
 * Fix for assignment to logger constant 

package/THIRD_PARTY_NOTICES.md

@@ -18,6 +18,7 @@ code, the source code can be found at [https://github.com/newrelic/csec-node-age
 * [check-disk-space](#check-disk-space)
 * [content-type](#content-type)
 * [cron](#cron)
+* [docker-cli-js](#docker-cli-js)
 * [fast-safe-stringify](#fast-safe-stringify)
 * [find-package-json](#find-package-json)
 * [hash.js](#hashjs)
@@ -79,7 +80,7 @@ code, the source code can be found at [https://github.com/newrelic/csec-node-age
 
 ### axios
 
-This product includes source derived from [axios](https://github.com/axios/axios) ([v1.7.4](https://github.com/axios/axios/tree/v1.7.4)), distributed under the [MIT License](https://github.com/axios/axios/blob/v1.7.4/LICENSE):
+This product includes source derived from [axios](https://github.com/axios/axios) ([v1.7.9](https://github.com/axios/axios/tree/v1.7.9)), distributed under the [MIT License](https://github.com/axios/axios/blob/v1.7.9/LICENSE):
 
 ```
 # Copyright (c) 2014-present Matt Zabriskie & Collaborators
@@ -165,6 +166,36 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+```
+
+### docker-cli-js
+
+This product includes source derived from [docker-cli-js](https://github.com/Quobject/docker-cli-js) ([v2.10.0](https://github.com/Quobject/docker-cli-js/tree/v2.10.0)), distributed under the [MIT License](https://github.com/Quobject/docker-cli-js/blob/v2.10.0/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2016 Matthias Ludwig (mludwig@quobject.io)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ```
 
 ### fast-safe-stringify
@@ -259,7 +290,7 @@ THE SOFTWARE.
 
 ### https-proxy-agent
 
-This product includes source derived from [https-proxy-agent](https://github.com/TooTallNate/proxy-agents) ([v7.0.4](https://github.com/TooTallNate/proxy-agents/tree/v7.0.4)), distributed under the [MIT License](https://github.com/TooTallNate/proxy-agents/blob/v7.0.4/LICENSE):
+This product includes source derived from [https-proxy-agent](https://github.com/TooTallNate/proxy-agents) ([v7.0.6](https://github.com/TooTallNate/proxy-agents/tree/v7.0.6)), distributed under the [MIT License](https://github.com/TooTallNate/proxy-agents/blob/v7.0.6/LICENSE):
 
 ```
 (The MIT License)
@@ -512,7 +543,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### semver
 
-This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.5.4](https://github.com/npm/node-semver/tree/v7.5.4)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.5.4/LICENSE):
+This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.6.3](https://github.com/npm/node-semver/tree/v7.6.3)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.6.3/LICENSE):
 
 ```
 The ISC License
@@ -1876,7 +1907,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### mongodb-memory-server
 
-This product includes source derived from [mongodb-memory-server](https://github.com/nodkz/mongodb-memory-server) ([v8.13.0](https://github.com/nodkz/mongodb-memory-server/tree/v8.13.0)), distributed under the [MIT License](https://github.com/nodkz/mongodb-memory-server/blob/v8.13.0/LICENSE.md):
+This product includes source derived from [mongodb-memory-server](https://github.com/nodkz/mongodb-memory-server) ([v8.11.2](https://github.com/nodkz/mongodb-memory-server/tree/v8.11.2)), distributed under the [MIT License](https://github.com/nodkz/mongodb-memory-server/blob/v8.11.2/LICENSE.md):
 
 ```
 The MIT License (MIT)

package/lib/instrumentation-security/core/event-constants.js

@@ -14,14 +14,15 @@ const EVENT_TYPE = {
     HTTP_REQUEST: 'HTTP_REQUEST',
     CODE_INJECTION: 'CODE_INJECTION',
     XXE: 'XXE',
-    CIPHER: 'CIPHER',
     HASH: 'HASH',
     RANDOM: 'RANDOM',
     UNVALIDATED_REDIRECT: 'UNVALIDATED_REDIRECT',
     REFLECTED_XSS: 'REFLECTED_XSS',
     XPATH: 'XPATH',
     LDAP: 'LDAP',
-    SECURE_COOKIE: 'SECURE_COOKIE'
+    SECURE_COOKIE: 'SECURE_COOKIE',
+    TRUSTBOUNDARY: 'TRUSTBOUNDARY',
+    CRYPTO: 'CRYPTO',
 }
 const EVENT_CATEGORY = {
     MYSQL: 'MYSQL',
@@ -42,7 +43,9 @@ const EVENT_CATEGORY = {
     REFLECTED_XSS: 'REFLECTED_XSS',
     XPATH: 'XPATH',
     LDAP: 'LDAP',
-    SECURE_COOKIE: 'SECURE_COOKIE'
+    SECURE_COOKIE: 'SECURE_COOKIE',
+    TRUSTBOUNDARY: 'TRUSTBOUNDARY',
+    CIPHER: 'CIPHER',
 }
 
 module.exports = {

package/lib/instrumentation-security/hooks/crypto/nr-crypto.js

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier:  New Relic Software License v1.0
+ */
+
+module.exports = initialize
+const requestManager = require('../../core/request-manager');
+const secUtils = require("../../core/sec-utils");
+const API = require("../../../nr-security-api");
+const securityMetaData = require('../../core/security-metadata');
+const { EVENT_TYPE, EVENT_CATEGORY } = require('../../core/event-constants');
+const { NR_CSEC_FUZZ_REQUEST_ID } = require('../../core/constants');
+const logger = API.getLogger();
+const NRLIB = 'newrelic/lib';
+const SALIB = 'security-agent/lib'
+
+/**
+ * Entry point of crypto module hook
+ * @param {*} shim 
+ * @param {*} mod 
+ * @param {*} moduleName 
+ */
+function initialize(shim, mod, moduleName) {
+    if (API && API.getNRAgent() && API.getNRAgent().config.security.exclude_from_iast_scan.iast_detection_category.insecure_settings) {
+        logger.warn('insecure_settings detection is disabled');
+        return;
+    }
+    logger.info('Instrumenting ' + moduleName)
+    cryptoCipherHooks(shim, mod, 'createCipheriv', moduleName);
+    cryptoHashHmacHooks(shim, mod, 'createHash', moduleName);
+    cryptoHashHmacHooks(shim, mod, 'createHmac', moduleName);
+    cryptoRandomHooks(shim, Math, 'random', "Math");
+}
+/**
+ * wrapper to hook crypto cipher methods
+ * @param {*} shim 
+ * @param {*} mod 
+ * @param {*} methodName 
+ * @param {*} moduleName 
+ */
+function cryptoCipherHooks(shim, mod, methodName, moduleName) {
+    shim.wrap(mod, methodName, function makeWrapper(shim, fn) {
+        logger.debug(`Instrumenting ${moduleName}.${methodName}`);
+        return function wrapper() {
+            const interceptedArgs = [arguments[0]];
+            shim.interceptedArgs = interceptedArgs;
+            const request = requestManager.getRequest(shim);
+            if (request && API.getSecAgent() && API.getSecAgent().status && API.getSecAgent().status.getStatus() === 'active') {
+                const traceObject = secUtils.getTraceObject(shim);
+                const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), EVENT_TYPE.CRYPTO, EVENT_CATEGORY.CIPHER)
+                if (secMetadata.traceObject && secMetadata.traceObject.stacktrace && (secMetadata.traceObject.stacktrace[0].includes(NRLIB) || secMetadata.traceObject.stacktrace[0].includes(SALIB))) {
+                    //do nothing
+                }
+                else {
+                    const secEvent = API.generateSecEvent(secMetadata);
+                    this.secEvent = secEvent;
+                    API.sendEvent(secEvent);
+                }
+            }
+            const result = fn.apply(this, arguments);
+
+            if (result && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
+                API.generateExitEvent(this.secEvent);
+                delete this.secEvent
+            }
+            return result;
+        }
+    })
+}
+
+
+/**
+ * wrapper to hook crypto hash and mac methods
+ * @param {*} shim 
+ * @param {*} mod 
+ * @param {*} methodName 
+ * @param {*} moduleName 
+ */
+function cryptoHashHmacHooks(shim, mod, methodName, moduleName) {
+    shim.wrap(mod, methodName, function makeWrapper(shim, fn) {
+        logger.debug(`Instrumenting ${moduleName}.${methodName}`);
+        return function wrapper() {
+            const interceptedArgs = [arguments[0]];
+            shim.interceptedArgs = interceptedArgs;
+            const request = requestManager.getRequest(shim);
+
+            if (request && arguments[0] !== 'sha256' && API.getSecAgent() && API.getSecAgent().status && API.getSecAgent().status.getStatus() === 'active') {
+                const traceObject = secUtils.getTraceObject(shim);
+                const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), EVENT_TYPE.HASH, EVENT_CATEGORY.HASH)
+                if (secMetadata.traceObject && secMetadata.traceObject.stacktrace && (secMetadata.traceObject.stacktrace[0].includes(NRLIB) || secMetadata.traceObject.stacktrace[0].includes(SALIB))) {
+                    //do nothing
+                }
+                else {
+                    const secEvent = API.generateSecEvent(secMetadata);
+                    this.secEvent = secEvent;
+                    API.sendEvent(secEvent);
+                }
+            }
+            const result = fn.apply(this, arguments);
+            if (result && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID] && arguments[0] !== 'sha256') {
+                API.generateExitEvent(this.secEvent);
+                delete this.secEvent
+            }
+            return result;
+        }
+    })
+}
+/**
+ * Wrapper for random hooks
+ * @param {*} shim 
+ * @param {*} mod 
+ * @param {*} methodName 
+ * @param {*} moduleName 
+ */
+function cryptoRandomHooks(shim, mod, methodName, moduleName) {
+    shim.wrap(mod, methodName, function makeWrapper(shim, fn) {
+        logger.debug(`Instrumenting ${moduleName}.${methodName}`);
+        return function wrapper() {
+            const interceptedArgs = ["Math.random"];
+            shim.interceptedArgs = interceptedArgs;
+            const request = requestManager.getRequest(shim);
+            if (request && API.getSecAgent() && API.getSecAgent().status && API.getSecAgent().status.getStatus() === 'active') {
+                const traceObject = secUtils.getTraceObject(shim);
+                const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), EVENT_TYPE.RANDOM, EVENT_CATEGORY.WEAKRANDOM)
+                if (secMetadata.traceObject && secMetadata.traceObject.stacktrace && secMetadata.traceObject.stacktrace[0] && (secMetadata.traceObject.stacktrace[0].includes(NRLIB) || secMetadata.traceObject.stacktrace[0].includes(SALIB))) {
+                    //do nothing
+                }
+                else {
+                    const secEvent = API.generateSecEvent(secMetadata);
+                    this.secEvent = secEvent;
+                    API.sendEvent(secEvent);
+                }
+
+            }
+            const result = fn.apply(this, arguments);
+            if (result && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
+                API.generateExitEvent(this.secEvent);
+                delete this.secEvent
+            }
+            return result;
+        }
+    })
+}
+
+

package/lib/instrumentation-security/hooks/express/nr-express.js

@@ -30,12 +30,14 @@ module.exports = function initialize(shim, express) {
 
   if (express.Router.use) {
     wrapExpress4(shim, express)
-  } 
+  }
+  else if (express.Router.prototype) {
+    wrapExpress5(shim, express)
+  }
   if(API && API.getNRAgent() && !API.getNRAgent().config.security.exclude_from_iast_scan.iast_detection_category.invalid_file_access){
     expressFileHook(shim, express && express.response, 'download')
     expressFileHook(shim, express && express.response, 'sendFile')
   }
-  
 }
 
 /**
@@ -121,7 +123,7 @@ function extractParams(shim, req) {
  * @param {*} mod 
  * @param {*} fun 
  */
-function expressFileHook(shim, mod, fun){
+function expressFileHook(shim, mod, fun) {
   shim.wrap(mod, fun, function makeFAWrapper(shim, fn) {
     if (!shim.isFunction(fn)) {
       return fn
@@ -149,4 +151,70 @@ function expressFileHook(shim, mod, fun){
   });
 }
 
+/**
+ * Wrapper to hook express version 5.x route method
+ * @param {*} shim 
+ * @param {*} express 
+ */
+function wrapExpress5(shim, express) {
+  shim.wrap(express.Router.prototype, 'route', function wrapRoute(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
+    logger.debug('Instrumenting express.Router.prototype.route');
+    return function wrappedRoute() {
+      try {
+        const stakTrace = secUtils.traceElementForRoute();
+        const splittedStack = stakTrace[0].split(DOUBLE_DOLLAR);
+        const key = lodash.upperCase(splittedStack[1]) + ATTHERATE + arguments[0];
+        routeManager.setRoute(key, splittedStack[0]);
+      } catch (error) {
+
+      }
+      const route = fn.apply(this, arguments)
+      return route;
+    }
+  })
+
+}
+
+module.exports.wrapRouter = function wrapExpress5Router(shim, mod) {
+  let layer = shim.require('./lib/layer');
+  shim.wrap(layer.prototype, 'match', function wrapParam(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
+    logger.debug('Instrumenting router.layer.match');
+    return function wrappedParam() {
+      const route = fn.apply(this, arguments);
+
+      try {
+        const uri = this.route.path;
+        const params = this.params;
+        const transaction = shim.tracer.getTransaction();
+        if (transaction) {
+          let request = requestManager.getRequestFromId(transaction.id);
+          if (params && request) {
+            Object.keys(params).forEach(function (key) {
+              if (params[key]) {
+                if (!request.parameterMap[key]) {
+                  request.parameterMap[key] = new Array(params[key].toString());
+                  requestManager.setRequest(transaction.id, request);
+                }
+              }
+            });
+          }
+          if (uri && request) {
+            request.uri = uri;
+            requestManager.setRequest(transaction.id, request);
+          }
+        }
+      } catch (error) {
+        logger.debug("Error while getting path params via router module", error);
+      }
+
+      return route
+    }
+  })
+}
 

package/lib/instrumentation-security/hooks/fastify/nr-fastify.js

@@ -10,7 +10,6 @@ const { ATTHERATE, DOUBLE_DOLLAR } = require('../../core/constants');
 const lodash = require('lodash');
 const routeManager = require('../../core/route-manager');
 const semver = require('semver')
-const url = require('url');
 const API = require("../../../nr-security-api");
 const logger = API.getLogger();
 
@@ -119,12 +118,10 @@ function setupExports(original, wrappedExport) {
  */
 function extractParams(shim, req) {
   try {
-    const reqURL = req.url || req.raw.url;
-    const parsedURI = url.parse(reqURL).pathname;
     const transaction = shim.tracer.getTransaction();
     if (transaction) {
       let request = requestManager.getRequestFromId(transaction.id);
-      if (req.params && segment && request) {
+      if (req.params && request) {
         Object.keys(req.params).forEach(function (key) {
           if (req.params[key]) {
             if (!request.parameterMap[key]) {
@@ -144,9 +141,9 @@ function extractParams(shim, req) {
           }
         });
       }
-      let method = request.method.toUpperCase();
-      if (parsedURI && request && requestManager.requestMap[method + ATTHERATE + parsedURI]) {
-        request.uri = parsedURI;
+      const txInfo = lodash.get(req, Object.getOwnPropertySymbols(req).find(symbol => symbol.toString() === 'Symbol(fastify.context)'));
+      if (request && txInfo && txInfo.config && txInfo.config.url) {
+        request.uri = txInfo.config.url;
         requestManager.setRequest(transaction.id, request);
       }
     }

package/lib/instrumentation-security/hooks/graphql/nr-graphql.js

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: New Relic Software License v1.0
+ */
+
+'use strict'
+
+/**
+ * Express middleware generates traces where middleware are considered siblings
+ * (ended on 'next' invocation) and not nested. Middlware are nested below the
+ * routers they are mounted to.
+ */
+
+const requestManager = require("../../core/request-manager");
+const { QUESTIONMARK } = require('../../core/constants');
+const API = require("../../../nr-security-api");
+const logger = API.getLogger();
+const { APPLICATION_JSON } = require('../../core/constants');
+let querystring = require('querystring');
+
+
+module.exports = function initialize(shim, mod) {
+  logger.info("Instrumenting graphql");
+
+  shim.wrap(mod, 'execute', function wrapExecute(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn;
+    }
+    return function wrappedExecute() {
+      const transaction = shim.tracer.getTransaction();
+      try {
+        if (transaction) {
+          let request = requestManager.getRequestFromId(transaction.id);
+          let customDataType = {};
+          //check for query parms
+          if (request.headers['x-apollo-operation-name']) {
+            const queryString = request.url.split(QUESTIONMARK)[1];
+            const parsedQueryString = querystring.parse(queryString);
+            let allValues = Object.values(parsedQueryString);
+            for (let index = 0; index < allValues.length; index++) {
+              const element = allValues[index];
+              if (element.startsWith('query')) {
+                customDataType['*.query'] = 'GRAPHQL_QUERY';
+              }
+              if (element.startsWith('variables')) {
+                customDataType['*.variables'] = 'GRAPHQL_VARIABLE';
+              }
+            }
+            request.customDataType = customDataType;
+            requestManager.setRequest(transaction.id, request);
+          }
+
+          //check for body
+          if (request.headers['content-type'] === APPLICATION_JSON) {
+            const requestBody = JSON.parse(request.body);
+            if (requestBody.query) {
+              customDataType['*.query'] = 'GRAPHQL_QUERY';
+            }
+            if (requestBody.variables) {
+              customDataType['*.variables'] = 'GRAPHQL_VARIABLE';
+            }
+            request.customDataType = customDataType;
+            requestManager.setRequest(transaction.id, request);
+          }
+        }
+
+      } catch (error) {
+        logger.debug("Error while processing graphql http request", error);
+      }
+
+      return fn.apply(this, arguments);
+    }
+  })
+}
+

package/lib/instrumentation-security/hooks/http/nr-http.js

@@ -5,7 +5,7 @@
 
 module.exports = initialize
 const requestManager = require('../../core/request-manager');
-const { NR_CSEC_FUZZ_REQUEST_ID, QUESTION_MARK, EMPTY_STRING, UTF8, CONTENT_TYPE, TEXT_HTML, APPLICATION_JSON, APPLICATION_XML, APPLICATION_XHTML, TEXT_PLAIN, APPLICATION_X_FORM_URLENCODED, MULTIPART_FORM_DATA, COMMA, SEMI_COLON, EQUAL, SECURE, HTTPONLY, SAMESITE, STRICT } = require('../../core/constants');
+const { NR_CSEC_FUZZ_REQUEST_ID, QUESTION_MARK, EMPTY_STRING, UTF8, CONTENT_TYPE, TEXT_HTML, APPLICATION_JSON, APPLICATION_XML, APPLICATION_XHTML, TEXT_PLAIN, APPLICATION_X_FORM_URLENCODED, MULTIPART_FORM_DATA, COMMA, SEMI_COLON, EQUAL, SECURE, HTTPONLY, SAMESITE, STRICT, OBJECT } = require('../../core/constants');
 const ARRAY_TYPE = 'Array';
 const STRING_TYPE = 'string';
 const BUFFER_TYPE = 'Buffer';
@@ -446,6 +446,9 @@ function responseHook(resp, req, shim) {
       }
       try {
         secureCookieCheck(response, shim);
+        if (response && response.req && response.req.session) {
+          trustBoundaryCheck(response.req.session, shim)
+        }
       } catch (error) {
         logger.debug("Error while generating secure cookie event");
       }
@@ -456,8 +459,8 @@ function responseHook(resp, req, shim) {
       const policy = API.getPolicy();
       const dynamicScanningFlag = policy.data ? (policy.data.vulnerabilityScan?.enabled && policy.data.vulnerabilityScan.iastScan.enabled) : false;
       const type = response.getHeader(CONTENT_TYPE);
-      let isUnsupportedType = isUnsupportedContentType(type);
-
+      let isUnsupportedType = isUnsupportedContentType(type, response);
+      
       if (request && (construct || dynamicScanningFlag) && !isUnsupportedType) {
         const args = [];
         args.push(construct);
@@ -478,8 +481,11 @@ function responseHook(resp, req, shim) {
  * @param {*} conType 
  * @returns 
  */
-function isUnsupportedContentType(conType) {
+function isUnsupportedContentType(conType, response) {
   try {
+    if(response.getHeaders()['etag']){
+      return false;
+    }
     if (!conType) {
       return true;
     }
@@ -531,7 +537,7 @@ function isUnsupportedContentType(conType) {
 function responseBodyCompute(response, args) {
   let encoding = UTF8;
   const type = response.getHeader(CONTENT_TYPE);
-  let isUnsupportedType = isUnsupportedContentType(type);
+  let isUnsupportedType = isUnsupportedContentType(type, response);
   if (isUnsupportedType) {
     return;
   }
@@ -730,3 +736,32 @@ function truncateStringToBytes(inputString, maxBytes) {
   return truncatedString;
 }
 
+/**
+ * Utility to generate trustboundary events.
+ * @param {*} sessionObject 
+ * @param {*} shim 
+ */
+function trustBoundaryCheck(sessionObject, shim) {
+  try {
+    const request = requestManager.getRequest(shim);
+    let params = [];
+    Object.keys(sessionObject).forEach(key => {
+      if (sessionObject[key] && typeof sessionObject[key] != OBJECT) {
+        params.push(String(key));
+        params.push(String(sessionObject[key]));
+      }
+    });
+    if (!lodash.isEmpty(params)) {
+      const traceObject = secUtils.getTraceObject(shim);
+      const secMetadata = securityMetaData.getSecurityMetaData(request, params, traceObject, secUtils.getExecutionId(), EVENT_TYPE.TRUSTBOUNDARY, EVENT_CATEGORY.TRUSTBOUNDARY)
+      const secEvent = API.generateSecEvent(secMetadata);
+      API.sendEvent(secEvent);
+    }
+
+  } catch (error) {
+    logger.debug("Error while processing trustboundary", error);
+
+  }
+
+}
+

package/lib/instrumentation-security/hooks/native/nr-vm.js

@@ -0,0 +1,46 @@
+module.exports = initialize;
+const requestManager = require("../../core/request-manager");
+const secUtils = require("../../core/sec-utils");
+const API = require("../../../nr-security-api");
+const securityMetaData = require('../../core/security-metadata');
+const { NR_CSEC_FUZZ_REQUEST_ID } = require('../../core/constants');
+const logger = API.getLogger();
+
+function initialize(shim, vm, moduleName) {
+  logger.info('Instrumenting', moduleName);
+  vmHooks(shim, vm, 'runInNewContext', moduleName);
+  vmHooks(shim, vm, 'runInThisContext', moduleName);
+  vmHooks(shim, vm, 'runInContext', moduleName);
+}
+
+/**
+ * Wrapper to hook vm methods
+ * @param {*} shim 
+ * @param {*} vm 
+ * @param {*} method 
+ * @param {*} moduleName 
+ */
+function vmHooks(shim, vm, method, moduleName) {
+  shim.wrap(vm, method, function makeWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.${method}`);
+    return function wrapper() {
+      const interceptedArgs = [arguments[0]];
+      shim.interceptedArgs = interceptedArgs;
+      const request = requestManager.getRequest(shim);
+      if (request) {
+        const traceObject = secUtils.getTraceObject(shim);
+        const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), "JAVASCRIPT_INJECTION", "JAVASCRIPT_INJECTION")
+        const secEvent = API.generateSecEvent(secMetadata);
+        this.secEvent = secEvent;
+        API.sendEvent(secEvent);
+      }
+
+      const result = fn.apply(this, arguments);
+      if (result && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
+        API.generateExitEvent(this.secEvent);
+        delete this.secEvent
+      }
+      return result;
+    };
+  });
+}

package/lib/instrumentation-security/hooks/nextjs/nr-next.js

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: New Relic Pre-Release
+ */
+
+'use strict'
+const requestManager = require("../../core/request-manager");
+const API = require("../../../nr-security-api");
+const logger = API.getLogger();
+
+const semver = require('semver')
+
+module.exports = function initialize(shim, nextjs) {
+  const nextVersion = shim.require('./package.json').version
+  logger.info("Instrumenting nextjs", nextVersion);
+
+  const nextServer = nextjs.default;
+  hookRunAPI(shim, nextServer.prototype, nextVersion);
+}
+
+/**
+ * Wrapper for Server.prototype.runApi
+ * @param {*} shim 
+ * @param {*} mod 
+ * @param {*} nextVersion 
+ */
+function hookRunAPI(shim, mod, nextVersion) {
+  shim.wrap(mod, 'runApi', function wrapRunApi(shim, originalFn) {
+    if (!shim.isFunction(originalFn)) {
+      return originalFn
+    }
+    logger.debug("Instrumenting Server.prototype.runApi");
+    return function wrappedRunApi() {
+      try {
+        const { page, params } = extractAttrs(arguments, nextVersion)
+        extractParams(shim, page, params);
+      } catch (error) {
+        logger.debug("Error while processing path paramters");
+      }
+
+      return originalFn.apply(this, arguments)
+    }
+  })
+}
+
+/**
+ * Extracts the page and params from an API request
+ *
+ * @param {object} args arguments to runApi
+ * @param {string} version next.js version
+ * @returns {object} { page, params }
+ */
+function extractAttrs(args, version) {
+  let params
+  let page
+  if (semver.gte(version, '13.4.13')) {
+    const [, , , match] = args
+    page = match?.definition?.pathname
+    params = { ...match?.params }
+  } else {
+    ;[, , , params, page] = args
+  }
+
+  return { params, page }
+}
+
+/**
+ * Utility to extract path params
+ * @param {*} page 
+ * @param {*} params 
+ */
+function extractParams(shim, page, params) {
+  try {
+    const transaction = shim.tracer.getTransaction();
+    if (transaction) {
+      let request = requestManager.getRequestFromId(transaction.id);
+      Object.keys(params).forEach(function (key) {
+        if (params[key]) {
+          if (!request.parameterMap[key]) {
+            request.parameterMap[key] = new Array(params[key].toString());
+            requestManager.setRequest(transaction.id, request);
+          }
+        }
+      });
+      if (request && page) {
+        request.uri = page;
+        requestManager.setRequest(transaction.id, request);
+      }
+    }
+  } catch (error) {
+  }
+}
+

package/lib/instrumentation-security/index.js

@@ -235,3 +235,46 @@ newrelic.instrument({
   }
 })
 
+newrelic.instrument({
+  moduleName: 'graphql/execution/execute',
+  isEsm: true,
+  onRequire: require('./hooks/graphql/nr-graphql'),
+  onError: function intrumentErrorHandler(err) {
+    logger.error(err.message, err.stack)
+  }
+})
+
+newrelic.instrument({
+  moduleName: 'router',
+  isEsm: true,
+  onRequire: require('./hooks/express/nr-express').wrapRouter,
+  onError: function intrumentErrorHandler(err) {
+    logger.error(err.message, err.stack)
+  }
+})
+
+newrelic.instrument({
+  moduleName: 'crypto',
+  onRequire: require('./hooks/crypto/nr-crypto'),
+  onError: function intrumentErrorHandler(err) {
+    logger.error(err.message, err.stack)
+  }
+})
+
+newrelic.instrumentWebframework({
+  moduleName: 'next/dist/server/next-server',
+  isEsm: true,
+  onRequire: require('./hooks/nextjs/nr-next'),
+  onError: function intrumentErrorHandler(err) {
+    logger.error(err.message, err.stack)
+  }
+})
+
+newrelic.instrument({
+  moduleName: 'vm',
+  isEsm: true,
+  onRequire: require('./hooks/native/nr-vm'),
+  onError: function intrumentErrorHandler(err) {
+    logger.error(err.message, err.stack)
+  }
+})

package/lib/nr-security-agent/lib/core/Auth-headers.js

@@ -36,7 +36,8 @@ function AuthHeaders() {
         authHeaders['NR-ACCOUNT-ID'] = NRAgent.config.account_id;
         authHeaders['NR-LICENSE-KEY'] = NRAgent ? NRAgent.config.license_key : '';
         authHeaders["NR-CSEC-IAST-DATA-TRANSFER-MODE"] = "PULL";
-        authHeaders['NR-CSEC-ENTITY-NAME'] = metadata['entity.name'] ? metadata['entity.name'] : '';
+        const entityName = metadata['entity.name'] ? metadata['entity.name'] : '';
+        authHeaders['NR-CSEC-ENTITY-NAME'] = encodeURIComponent(entityName);
         authHeaders['NR-CSEC-ENTITY-GUID'] = metadata['entity.guid'] ? metadata['entity.guid'] : '';
         let instanceCount = parseInt(NRAgent.config.security.scan_controllers.scan_instance_count);
         if (isNaN(instanceCount)) {

package/lib/nr-security-agent/lib/core/event.js

@@ -12,6 +12,7 @@ const API = require('../../../nr-security-api');
 const NRAgent = API.getNRAgent();
 const lodash = require('lodash');
 const commonUtils = require('./commonUtils');
+const crypto = require('crypto');
 /**
 * BasicInfo Structure, which is applicatble to each
 * Event generated from agent.
@@ -99,7 +100,7 @@ function SecEvent(fileName, funcName, lineNumber, argument, eid, applicationInfo
     const dynamicScanning = vulnerabilityScan.enabled && vulnerabilityScan.iastScan.enabled;
     this.isIASTEnable = dynamicScanning;
     if (this.isIASTEnable) {
-        this.id = eid + Math.floor(Math.random() * (100000 - 1) + 1);
+        this.id = eid + Math.floor(crypto.randomInt(100) * (100000 - 1) + 1);
     } else {
         this.id = eid;
     }

package/lib/nr-security-agent/lib/core/sec-util.js

@@ -29,6 +29,10 @@ const initLogger = logs.getInitLogger();
 
 const NODE_SER = 'node-serialize/lib/serialize.js';
 const SECURE_COOKIE = 'SECURE_COOKIE';
+const TRUSTBOUNDARY = 'TRUSTBOUNDARY';
+const HASH = "HASH";
+const CRYPTO = "CRYPTO";
+const RANDOM = "RANDOM";
 
 const insecureSettingApiIdSet = new Set();
 
@@ -110,7 +114,7 @@ function generateSecEvent(securityMetadata) {
 
         let apiId = shaUtil.getSHA256ForData(traceObject.stacktrace.join('|') + uri);
         apiId = securityMetadata.eventType + HYPHEN + apiId;
-        if (securityMetadata.eventType == SECURE_COOKIE) {
+        if (securityMetadata.eventType == SECURE_COOKIE || securityMetadata.eventType == CRYPTO || securityMetadata.eventType == HASH || securityMetadata.eventType == RANDOM) {
             if (insecureSettingApiIdSet.has(apiId)) {
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/security-agent",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "New Relic Security Agent for Node.js",
   "main": "index.js",
   "jsonVersion": "1.2.9",
@@ -39,10 +39,11 @@
     "url": "https://github.com/newrelic/csec-node-agent.git"
   },
   "dependencies": {
-    "axios": "^1.7.4",
+    "axios": "^1.7.9",
     "check-disk-space": "^3.4.0",
     "content-type": "^1.0.5",
     "cron": "^3.1.7",
+    "docker-cli-js": "^2.10.0",
     "fast-safe-stringify": "^2.1.1",
     "find-package-json": "^1.2.0",
     "hash.js": "^1.1.7",