@contrast/agent-bundle 5.47.0 → 5.48.0

package/node_modules/@contrast/route-coverage/lib/install/{fastify.js → fastify/fastify.js}

@@ -14,12 +14,12 @@
  */
 'use strict';
 
-const { getFastifyMethods } = require('../utils/methods');
+const { getFastifyMethods } = require('../../utils/methods');
 const {
   primordials: { StringPrototypeToLowerCase, StringPrototypeSplit },
   RouteType,
 } = require('@contrast/common');
-const { patchType } = require('./../utils/route-info');
+const { patchType, formatHandler } = require('./../../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Fastify
 module.exports = function init(core) {
@@ -38,12 +38,12 @@ module.exports = function init(core) {
     return route?.[kRoutePrefix];
   }
 
-  function createRouteInfo(method, url, fullyDeclared, type) {
+  function createRouteInfo(method, url, fullyDeclared, type, handler) {
     method = StringPrototypeToLowerCase.call(method);
 
     const signature = fullyDeclared
-      ? `fastify.route({ method: '${method}', url: '${url}', handler: [Function] })`
-      : `fastify.${method}('${url}', [Function])`;
+      ? `fastify.route({ method: ${method}, url: ${url}, handler: ${formatHandler(handler)} })`
+      : `fastify.${method}(${url}, ${formatHandler(handler)})`;
 
     const routeInfo = {
       signature,
@@ -89,30 +89,30 @@ module.exports = function init(core) {
     }
   }
 
-  function discoverAndPatch(method, path, routeObj, handle, methods, fullyDeclared) {
+  function discoverAndPatch(method, path, routeObj, handle, handler, methods, fullyDeclared) {
     const type = routeObj?.options?.websocket ? RouteType.MESSAGE_BROKER : RouteType.HTTP;
 
     if (Array.isArray(method)) {
       // If all valid methods are included in `method` then .all shorthand was most likely used
       if (methods.every(m => method.includes(m))) {
-        const routeInfo = createRouteInfo('all', path, fullyDeclared, type);
+        const routeInfo = createRouteInfo('all', path, fullyDeclared, type, handler);
         routeCoverage.discover(routeInfo);
         patchHandler(routeObj, handle, routeInfo);
       } else {
         method.forEach((verb) => {
-          const routeInfo = createRouteInfo(verb, path, fullyDeclared, type);
+          const routeInfo = createRouteInfo(verb, path, fullyDeclared, type, handler);
           routeCoverage.discover(routeInfo);
           patchHandler(routeObj, handle, routeInfo);
         });
       }
     } else {
-      const routeInfo = createRouteInfo(method, path, fullyDeclared, type);
+      const routeInfo = createRouteInfo(method, path, fullyDeclared, type, handler);
       routeCoverage.discover(routeInfo);
       patchHandler(routeObj, handle, routeInfo);
     }
   }
 
-  return core.routeCoverage.fastify = {
+  return core.routeCoverage.fastifyCore = {
     install() {
       /**
        * There are some subtle differences between fastify minor versions the instrumentation must account for
@@ -158,7 +158,7 @@ module.exports = function init(core) {
                   let handle = 'handler';
                   if (!handler && typeof options === 'function') handle = 'options';
 
-                  discoverAndPatch(method, path, routeObj ? data.args[0] : data.args, handle, fastifyMethods, false);
+                  discoverAndPatch(method, path, routeObj ? data.args[0] : data.args, handle, options || handler, fastifyMethods, false);
                 }
               });
 
@@ -175,7 +175,7 @@ module.exports = function init(core) {
 
                   const prefix = getPrefix(data.obj);
                   const path = prefix ? prefix + url : url;
-                  discoverAndPatch(method, path, routeArgs, 'handler', fastifyMethods, true);
+                  discoverAndPatch(method, path, routeArgs, 'handler', handler, fastifyMethods, true);
                 }
               });
             }

package/node_modules/@contrast/route-coverage/lib/install/{express → fastify}/index.js

@@ -18,14 +18,15 @@
 const { callChildComponentMethodsSync } = require('@contrast/common');
 
 module.exports = function(core) {
-  const expressRouteCoverage = core.routeCoverage.express = {
+  const fastifyRouteCoverage = core.routeCoverage.fastify = {
     install() {
-      callChildComponentMethodsSync(expressRouteCoverage, 'install');
+      callChildComponentMethodsSync(fastifyRouteCoverage, 'install');
     },
   };
 
-  require('./express4')(core);
-  require('./express5')(core);
+  require('./fastify')(core);
+  require('./fastify-express')(core);
+  require('./fastify-middie')(core);
 
-  return expressRouteCoverage;
+  return fastifyRouteCoverage;
 };

package/node_modules/@contrast/route-coverage/lib/install/koa.js

@@ -15,28 +15,15 @@
 'use strict';
 
 const { METHODS } = require('./../utils/methods');
-const { isString, primordials: { StringPrototypeToLowerCase, StringPrototypeSplit } } = require('@contrast/common');
-const { createSignature, patchType } = require('./../utils/route-info');
+const { isString, RouteType, primordials: { StringPrototypeToLowerCase, StringPrototypeSplit } } = require('@contrast/common');
+const { patchType, formatHandler } = require('./../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Koa
 module.exports = function init(core) {
   const { patcher, depHooks, routeCoverage } = core;
-
-  function createRouteInfo(method, url) {
-    method = StringPrototypeToLowerCase.call(method);
-    const routeInfo = {
-      signature: createSignature(url, method),
-      url,
-      method,
-      normalizedUrl: url,
-      framework: 'koa'
-    };
-    return routeInfo;
-  }
-
   return core.routeCoverage.koa = {
     install() {
-      depHooks.resolve({ name: 'koa', version: '>=2.3.0 <4' }, (Koa) => {
+      depHooks.resolve({ name: 'koa', version: '>=2.3.0 <4' }, (Koa, pkgMeta) => {
         // Koa uses its own routing library @koa/router to define routes before
         // mounting them on the app with .use so instrumenting use and traversing
         // the constructed routes is the more technically correct approach than
@@ -48,40 +35,47 @@ module.exports = function init(core) {
             if (args?.length === 0) return;
             const [router] = args;
 
-            if (!router?.router) return;
+            if (!router?.router) {
+              core.logger.debug('no routes detected in koa router stack: %s@%s', pkgMeta.name, pkgMeta.version);
+              return;
+            }
 
             router.router.stack.forEach((Layer) => {
-              const { methods, path } = Layer;
-              if (!path || !isString(path)) return;
+              const { methods, path, stack } = Layer;
+              if (!path || !isString(path) || !stack || stack.length === 0) return;
 
-              let routeInfo;
-              if (methods.length === 0) {
-                routeInfo = createRouteInfo('use', path);
-                routeCoverage.discover(routeInfo);
-              } else if (METHODS.every(m => methods.includes(m))) {
-                // If a route was defined using .all this methods property will be an
-                // array of all methods supported by Koa
-                routeInfo = createRouteInfo('all', path);
+              const patchedMiddleware = [];
+              stack.forEach((handler) => {
+                const method = methods.length === 0 ? 'use' : METHODS.every(m => methods.includes(m)) ? 'all' : StringPrototypeToLowerCase.call(methods[methods.length - 1]);
+                if (method === 'use' && !core.config.getEffectiveValue('assess.report_middleware_routes')) return;
+                const routeInfo = {
+                  signature: `Router.${method}(${path}, ${formatHandler(handler)})`,
+                  method,
+                  url: path,
+                  normalizedUrl: path,
+                  framework: 'koa',
+                  type: method === 'use' ? RouteType.MIDDLEWARE : RouteType.HTTP
+                };
                 routeCoverage.discover(routeInfo);
-              } else {
-                methods.forEach((method) => {
-                  routeInfo = createRouteInfo(method, path);
-                  routeCoverage.discover(routeInfo);
-                });
-              }
+                const patchedHandler = patcher.patch(handler, {
+                  name: 'handler',
+                  patchType,
+                  pre(data) {
+                    const { request } = data.args[0];
+                    if (!request) return;
 
-              if (!Layer.stack || Layer.stack.length === 0) return;
-              async function observationMiddleware(ctx, next) {
-                if (!ctx.request) return;
-                const { url: reqUrl, method } = ctx.request;
-                const [url] = StringPrototypeSplit.call(reqUrl, /\?/);
-                routeCoverage.observe({ ...routeInfo, url, method: StringPrototypeToLowerCase.call(method) });
-                await next();
-              }
-              // If two routes share middleware, the same stack is used
-              // To add our observation middleware without adding them to all routes
-              // we need to create a shallow copy
-              Layer.stack = [observationMiddleware, ...Layer.stack];
+                    const { method, url } = request;
+                    if (!method | !url) return;
+                    routeCoverage.observe({
+                      ...routeInfo,
+                      method: StringPrototypeToLowerCase.call(method),
+                      url: StringPrototypeSplit.call(url, /\?/)[0]
+                    });
+                  }
+                });
+                patchedMiddleware.push(patchedHandler);
+              });
+              Layer.stack = patchedMiddleware;
             });
           }
         });

package/node_modules/@contrast/route-coverage/lib/utils/route-info.js

@@ -15,6 +15,8 @@
 'use strict';
 
 const patchType = 'route-coverage';
+const { funcInfo } = require('@contrast/fn-inspect');
+const { primordials: { StringPrototypeReplace, StringPrototypeSubstring } } = require('@contrast/common');
 
 /**
  * Creates a formatted "signature" for a route
@@ -28,4 +30,27 @@ function createSignature(path, method = '', obj = 'Router', handler = '[Function
   return `${obj}.${method}('${path}', ${handler})`;
 }
 
-module.exports = { createSignature, patchType };
+/**
+ * Creates a formatted handler signature for a route
+ * @param {function} handler
+ * @param {string} appDir
+ * @return {string} formatted handler
+ */
+function formatHandler(handler, appDir) {
+  const info = funcInfo(handler);
+  if (!info) return '[Function]';
+
+  let file = info.file ?
+    StringPrototypeReplace.call(info.file, appDir, '') :
+    '';
+  if (file.length > 30) {
+    file = `...${StringPrototypeSubstring.call(file, file.length - 40)}`;
+  }
+  const handlerName = info.method || handler.name || 'anonymous';
+  const formattedHandler = (file && Number.isFinite(info.lineNumber) && Number.isFinite(info.column)) ?
+    `[${handlerName} ${file} ${info.lineNumber}:${info.column}]` :
+    `[Function: ${handlerName}]`; // what util.inspect(handler) would return
+  return formattedHandler;
+}
+
+module.exports = { createSignature, patchType, formatHandler };

package/node_modules/@contrast/route-coverage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/route-coverage",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "description": "Handles route discovery and observation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@contrast/common": "1.38.0",
-    "@contrast/config": "1.54.0",
-    "@contrast/core": "1.59.0",
-    "@contrast/dep-hooks": "1.28.0",
+    "@contrast/config": "1.54.1",
+    "@contrast/core": "1.59.1",
+    "@contrast/dep-hooks": "1.28.1",
     "@contrast/fn-inspect": "^5.0.2",
-    "@contrast/logger": "1.32.0",
-    "@contrast/patcher": "1.31.0",
-    "@contrast/scopes": "1.29.0",
+    "@contrast/logger": "1.32.1",
+    "@contrast/patcher": "1.31.1",
+    "@contrast/scopes": "1.29.1",
     "semver": "^7.6.0"
   }
 }

package/node_modules/@contrast/scopes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/scopes",
-  "version": "1.29.0",
+  "version": "1.29.1",
   "description": "Handles AsyncLocalStorage scopes",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -20,9 +20,9 @@
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/core": "1.59.0",
-    "@contrast/dep-hooks": "1.28.0",
-    "@contrast/logger": "1.32.0",
-    "@contrast/patcher": "1.31.0"
+    "@contrast/core": "1.59.1",
+    "@contrast/dep-hooks": "1.28.1",
+    "@contrast/logger": "1.32.1",
+    "@contrast/patcher": "1.31.1"
   }
 }

package/node_modules/@contrast/sec-obs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/sec-obs",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Contrast service providing framework-agnostic Observability support",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -18,13 +18,13 @@
   },
   "dependencies": {
     "@contrast/common": "1.38.0",
-    "@contrast/config": "1.54.0",
-    "@contrast/core": "1.59.0",
-    "@contrast/dep-hooks": "1.28.0",
-    "@contrast/logger": "1.32.0",
-    "@contrast/patcher": "1.31.0",
-    "@contrast/rewriter": "1.36.0",
-    "@contrast/scopes": "1.29.0",
+    "@contrast/config": "1.54.1",
+    "@contrast/core": "1.59.1",
+    "@contrast/dep-hooks": "1.28.1",
+    "@contrast/logger": "1.32.1",
+    "@contrast/patcher": "1.31.1",
+    "@contrast/rewriter": "1.36.1",
+    "@contrast/scopes": "1.29.1",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.57.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.57.1",

package/node_modules/@contrast/sources/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/sources",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Instruments to have incoming messages run in async-local request scope.",
   "main": "lib/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@contrast/common": "1.38.0",
-    "@contrast/core": "1.59.0",
+    "@contrast/core": "1.59.1",
     "on-finished": "^2.4.1"
   }
 }

package/node_modules/@contrast/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/telemetry",
-  "version": "1.34.0",
+  "version": "1.34.1",
   "description": "Telemetry reporting for the Contrast Node.js agent.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@contrast/common": "1.38.0",
-    "@contrast/config": "1.54.0",
-    "@contrast/core": "1.59.0",
-    "@contrast/logger": "1.32.0",
+    "@contrast/config": "1.54.1",
+    "@contrast/core": "1.59.1",
+    "@contrast/logger": "1.32.1",
     "axios": "^1.12.2",
     "getmac": "^6.3.0"
   }