@contrast/agent-bundle 5.42.0 → 5.45.1

package/node_modules/@contrast/common/lib/index.js

@@ -28,7 +28,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeURI = exports.safeConsoleWarn = exports.safeConsoleError = exports.set = exports.get = exports.groupResultsMap = exports.callChildComponentMethods = exports.callChildComponentMethodsSync = exports.traverseKeys = exports.traverseValues = exports.traverseKeysAndValues = exports.encodeString = exports.isNonEmptyObject = exports.isString = exports.empties = void 0;
+exports.empties = void 0;
+exports.isString = isString;
+exports.isNonEmptyObject = isNonEmptyObject;
+exports.encodeString = encodeString;
+exports.traverseKeysAndValues = traverseKeysAndValues;
+exports.traverseValues = traverseValues;
+exports.traverseKeys = traverseKeys;
+exports.callChildComponentMethodsSync = callChildComponentMethodsSync;
+exports.callChildComponentMethods = callChildComponentMethods;
+exports.groupResultsMap = groupResultsMap;
+exports.get = get;
+exports.set = set;
+exports.safeConsoleError = safeConsoleError;
+exports.safeConsoleWarn = safeConsoleWarn;
+exports.normalizeURI = normalizeURI;
 const constants_1 = require("./constants");
 const primordials_1 = require("./primordials");
 __exportStar(require("./constants"), exports);
@@ -49,16 +63,13 @@ exports.empties = {
 function isString(value) {
     return typeof value === 'string' || value instanceof String;
 }
-exports.isString = isString;
 function isNonEmptyObject(value) {
     return !!value && typeof value === 'object' && Object.keys(value).length > 0;
 }
-exports.isNonEmptyObject = isNonEmptyObject;
 /* c8 ignore next 3 */
 function encodeString(str) {
     return BufferPrototypeToString.call(BufferFrom(str), 'base64');
 }
-exports.encodeString = encodeString;
 function traverse(obj, cb, path, traverseValues, traverseKeys, depth = Infinity) {
     let shouldKeepTraversing = true;
     let reachedDepth = 0;
@@ -115,21 +126,18 @@ function traverseKeysAndValues(obj, cb, depth) {
     }
     traverse(obj, cb, [], true, true, depth);
 }
-exports.traverseKeysAndValues = traverseKeysAndValues;
 function traverseValues(obj, cb, depth) {
     if (typeof obj !== 'object' || obj === null) {
         return;
     }
     traverse(obj, cb, [], true, false, depth);
 }
-exports.traverseValues = traverseValues;
 function traverseKeys(obj, cb, depth) {
     if (typeof obj !== 'object' || obj === null) {
         return;
     }
     traverse(obj, cb, [], false, true, depth);
 }
-exports.traverseKeys = traverseKeys;
 function callChildComponentMethodsSync(parent, method, order) {
     const keys = order || Object.keys(parent);
     for (const key of keys) {
@@ -137,7 +145,6 @@ function callChildComponentMethodsSync(parent, method, order) {
         component?.[method]?.();
     }
 }
-exports.callChildComponentMethodsSync = callChildComponentMethodsSync;
 async function callChildComponentMethods(parent, method, order) {
     const keys = order || Object.keys(parent);
     for (const key of keys) {
@@ -145,7 +152,6 @@ async function callChildComponentMethods(parent, method, order) {
         await component?.[method]?.();
     }
 }
-exports.callChildComponentMethods = callChildComponentMethods;
 function groupResultsMap(resultsMap) {
     const result = {
         commonResultsMap: {},
@@ -184,7 +190,6 @@ function groupResultsMap(resultsMap) {
     }, result);
     return result;
 }
-exports.groupResultsMap = groupResultsMap;
 function get(obj, name) {
     let target = obj;
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -197,7 +202,6 @@ function get(obj, name) {
     }
     return target;
 }
-exports.get = get;
 function set(obj, name, value) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
@@ -210,21 +214,18 @@ function set(obj, name, value) {
     }
     obj[lastProp] = value;
 }
-exports.set = set;
 /** Suppresses output to stderr when installed by the universal agent */
 function safeConsoleError(...args) {
     if (CONTRAST_INSTALLATION_TOOL === 'NONE') {
         console.error(...args);
     }
 }
-exports.safeConsoleError = safeConsoleError;
 /** Suppresses output to stderr when installed by the universal agent */
 function safeConsoleWarn(...args) {
     if (CONTRAST_INSTALLATION_TOOL === 'NONE') {
         console.warn(...args);
     }
 }
-exports.safeConsoleWarn = safeConsoleWarn;
 function normalizeURI(uri) {
     let normalizedUri = uri;
     constants_1.URI_REGEXES.forEach(({ rx, rp }) => {
@@ -233,6 +234,5 @@ function normalizeURI(uri) {
     });
     return normalizedUri;
 }
-exports.normalizeURI = normalizeURI;
 ;
 //# sourceMappingURL=index.js.map

package/node_modules/@contrast/common/lib/primordials.d.ts

@@ -1,14 +1,10 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { inspect } from 'util';
 import fs from 'fs';
 export declare const primordials: {
-    ArrayPrototypeJoin: (separator?: string | undefined) => string;
-    ArrayPrototypeSlice: (start?: number | undefined, end?: number | undefined) => any[];
+    ArrayPrototypeJoin: (separator?: string) => string;
+    ArrayPrototypeSlice: (start?: number, end?: number) => any[];
     BufferFrom: typeof Buffer.from;
-    BufferPrototypeToString: (encoding?: BufferEncoding | undefined, start?: number | undefined, end?: number | undefined) => string;
+    BufferPrototypeToString: (encoding?: BufferEncoding, start?: number, end?: number) => string;
     StringPrototypeConcat: (...strings: string[]) => string;
     StringPrototypeMatch: {
         (regexp: string | RegExp): RegExpMatchArray | null;
@@ -16,7 +12,7 @@ export declare const primordials: {
             [Symbol.match](string: string): RegExpMatchArray | null;
         }): RegExpMatchArray | null;
     };
-    StringPrototypeMatchAll: (regexp: RegExp) => IterableIterator<RegExpMatchArray>;
+    StringPrototypeMatchAll: (regexp: RegExp) => RegExpStringIterator<RegExpExecArray>;
     StringPrototypeReplace: {
         (searchValue: string | RegExp, replaceValue: string): string;
         (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string;
@@ -31,30 +27,36 @@ export declare const primordials: {
         (searchValue: string | RegExp, replaceValue: string): string;
         (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string;
     };
-    StringPrototypeSlice: (start?: number | undefined, end?: number | undefined) => string;
+    StringPrototypeSlice: (start?: number, end?: number) => string;
     StringPrototypeSplit: {
-        (separator: string | RegExp, limit?: number | undefined): string[];
+        (separator: string | RegExp, limit?: number): string[];
         (splitter: {
-            [Symbol.split](string: string, limit?: number | undefined): string[];
-        }, limit?: number | undefined): string[];
+            [Symbol.split](string: string, limit?: number): string[];
+        }, limit?: number): string[];
     };
-    StringPrototypeSubstr: (from: number, length?: number | undefined) => string;
-    StringPrototypeSubstring: (start: number, end?: number | undefined) => string;
+    StringPrototypeSubstr: (from: number, length?: number) => string;
+    StringPrototypeSubstring: (start: number, end?: number) => string;
     StringPrototypeToLowerCase: () => string;
     StringPrototypeToUpperCase: () => string;
-    StringPrototypeToLocaleLowerCase: (locales?: string | string[] | undefined) => string;
-    StringPrototypeToLocaleUpperCase: (locales?: string | string[] | undefined) => string;
+    StringPrototypeToLocaleLowerCase: {
+        (locales?: string | string[]): string;
+        (locales?: Intl.LocalesArgument): string;
+    };
+    StringPrototypeToLocaleUpperCase: {
+        (locales?: string | string[]): string;
+        (locales?: Intl.LocalesArgument): string;
+    };
     StringPrototypeTrim: () => string;
     RegExpPrototypeTest: (string: string) => boolean;
     RegExpPrototypeExec: (string: string) => RegExpExecArray | null;
     FunctionPrototypeToString: () => string;
-    JSONParse: (text: string, reviver?: ((this: any, key: string, value: any) => any) | undefined) => any;
+    JSONParse: (text: string, reviver?: (this: any, key: string, value: any) => any) => any;
     JSONStringify: {
-        (value: any, replacer?: ((this: any, key: string, value: any) => any) | undefined, space?: string | number | undefined): string;
-        (value: any, replacer?: (string | number)[] | null | undefined, space?: string | number | undefined): string;
+        (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+        (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
     };
     UtilInspect: typeof inspect;
-    PathBasename: (path: string, ext?: string | undefined) => string;
+    PathBasename: (path: string, ext?: string) => string;
     FsOpen: typeof fs.open;
     FsOpenSync: typeof fs.openSync;
     FsReadFile: typeof fs.readFile;

package/node_modules/@contrast/common/lib/types.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { ServerResponse } from 'node:http';
 import { Event, ProtectRuleMode, Rule } from './constants';
@@ -152,9 +150,8 @@ export interface Result {
     mongoExpansionResult?: boolean;
     path?: string[];
     ruleId: Rule;
-    score: number;
+    score?: number;
     value: string;
-    sinkContext?: any;
 }
 export interface SemanticAnalysisResult extends Result {
     ruleId: SemanticAnalysisRules;
@@ -232,6 +229,7 @@ export interface SourceInfo {
     contentType?: string;
     ip: string;
     httpVersion: string;
+    getHeader(name: string): string | null;
 }
 /**
  * this is known as RequestStore even though, in the future, instrumentation
@@ -348,6 +346,20 @@ export interface RouteInfo {
      */
     normalizedUrl: string;
 }
+export interface ProtectFindingEventArg {
+    store: RequestStore;
+    result: Result;
+    sinkContext?: {
+        name: string;
+        value: any;
+        stacktraceOpts?: {
+            constructorOpt: any;
+            prependFrames: any[];
+        };
+        stack?: any[];
+    };
+    findings?: any;
+}
 /**
  * Agent event emitter for messaging to/from external systems. Use cases are
  * reporting agent findings and broadcasting settings updates.
@@ -360,7 +372,7 @@ export interface Messages extends EventEmitter {
     emit(event: Event.ASSESS_DATAFLOW_FINDING, msg: any): boolean;
     emit(event: Event.LIBRARY, msg: Library): boolean;
     emit(event: Event.LIBRARY_USAGE, msg: LibraryUsage): boolean;
-    emit(event: Event.PROTECT, msg: RequestStore): boolean;
+    emit(event: Event.PROTECT_FINDING, msg: ProtectFindingEventArg): boolean;
     emit(event: Event.ROUTE_COVERAGE_DISCOVERY_FINISHED, routes: RouteInfo[]): boolean;
     emit(event: Event.ROUTE_COVERAGE_OBSERVATION, route: RouteInfo): boolean;
     emit(event: Event.SERVER_SETTINGS_UPDATE, msg: Record<string, any>): boolean;
@@ -371,7 +383,7 @@ export interface Messages extends EventEmitter {
     on(event: Event.ASSESS_DATAFLOW_FINDING, listenter: (msg: any) => void): this;
     on(event: Event.LIBRARY, listener: (msg: Library) => void): this;
     on(event: Event.LIBRARY_USAGE, listener: (msg: LibraryUsage) => void): this;
-    on(event: Event.PROTECT, listener: (msg: RequestStore) => void): this;
+    on(event: Event.PROTECT_FINDING, listener: (msg: ProtectFindingEventArg) => void): this;
     on(event: Event.ROUTE_COVERAGE_DISCOVERY_FINISHED, listener: (routes: RouteInfo[]) => void): this;
     on(event: Event.ROUTE_COVERAGE_OBSERVATION, listener: (route: RouteInfo) => void): this;
     on(event: Event.SERVER_SETTINGS_UPDATE, listener: (msg: Record<string, any>) => void): this;

package/node_modules/@contrast/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/common",
-  "version": "1.35.0",
+  "version": "1.37.0",
   "description": "Shared constants and utilities for all Contrast Agent modules",
   "license": "UNLICENSED",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,7 +14,7 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "build": "tsc --build src/",

package/node_modules/@contrast/config/lib/options.js

@@ -23,6 +23,31 @@ const path = require('path');
 const { Rule, primordials: { BufferFrom, BufferPrototypeToString, StringPrototypeReplace, StringPrototypeReplaceAll, StringPrototypeSplit, StringPrototypeToLowerCase, StringPrototypeToUpperCase, JSONParse } } = require('@contrast/common');
 const { ConfigSource: { DEFAULT_VALUE } } = require('./common');
 
+const CMD_IGNORE_LIST_DEFAULTS = [
+  '**/npm',
+  '**/npx',
+  '**/yarn',
+  '**/pnpm',
+
+  '**/.bin/next',
+  '**/node_modules/**/next/**',
+  '**/.bin/nuxi', // nuxt
+  '**/.bin/vite',
+  '**/.bin/astro',
+  '**/.bin/sv', // svelte
+  '**/.bin/webpack',
+  '**/node_modules/**/webpack-cli/**',
+  '**/.bin/rollup',
+  '**/.bin/parcel',
+  '**/@parcel/workers/**',
+  '**/.bin/babel',
+  '**/.bin/gulp',
+  '**/.bin/grunt',
+
+  '**/Visual Studio Code*/**',
+  '**/.vscode/**',
+];
+
 /**
  * Takes strings "true"|"t" or "false"|"f" (case insensitive) and return the appropriate boolean.
  * @param {boolean | string} value passed arg; never undefined or the function isn't called
@@ -160,7 +185,7 @@ const options = [
     name: 'api.token',
     arg: '<token>',
     desc: 'base64 encoded JSON object containing the `url`, `api_key`, `service_key`, and `user_name` config options, allowing them all to be set in a single variable.',
-    fn(value, cfg, source) {
+    fn: (value, cfg, source) => {
       try {
         // parse the base64 encoded value
         const parsed = JSONParse(BufferPrototypeToString.call(BufferFrom(value, 'base64'), 'utf8'));
@@ -470,14 +495,14 @@ Example - \`/opt/Contrast/contrast.log\` creates a log in the \`/opt/Contrast\`
     name: 'agent.node.cmd_ignore_list',
     arg: '<commands>',
     default: '',
-    fn: (arg) => StringPrototypeSplit.call(arg, ',').filter((v) => v),
-    desc: 'comma-separated list of commands that will not startup the agent if agent is required; npm* will ignore all npm executables but not your application\'s scripts'
+    fn: (arg) => [...CMD_IGNORE_LIST_DEFAULTS, ...StringPrototypeSplit.call(arg, /,(?![^{]*}|[^[]*\])/g).filter((v) => v)],
+    desc: "Comma-separated list of glob patterns that will prevent instrumentation when matched in node's arguments."
   },
   {
     // SEE NODE-2886
     name: 'agent.node.exclusive_entrypoint',
     arg: '<entrypoint.js>',
-    desc: 'an entrypoint for an application that, when specified, will prevent the agent instrumenting on anything else'
+    desc: 'An entrypoint for an application that, when specified, will force the agent to instrument and prevent the agent instrumenting anything else. Resolved relative to `app_root` if set or the current working directory otherwise.'
   },
   {
     name: 'agent.node.rewrite.enable',

package/node_modules/@contrast/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/config",
-  "version": "1.50.0",
+  "version": "1.52.1",
   "description": "An API for discovering Contrast agent configuration data",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,14 +14,14 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/core": "1.55.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/core": "1.57.1",
     "deepmerge": "^4.3.1",
     "yaml": "^2.2.2"
   }

package/node_modules/@contrast/core/lib/app-info.js

@@ -20,7 +20,8 @@ const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
 const process = require('process');
-const { IntentionalError, primordials: { ArrayPrototypeJoin } } = require('@contrast/common');
+const { minimatch } = require('minimatch');
+const { IntentionalError } = require('@contrast/common');
 const { findPackageJsonSync } = require('@contrast/find-package-json');
 
 /**
@@ -35,10 +36,8 @@ module.exports = function (core) {
   const { app_root, cmd_ignore_list, exclusive_entrypoint } = config.agent.node;
 
   checkPreLoadFlag();
-  const cmd = getCommand();
   const pkgInfo = getPackageInfo();
-  const entrypoint = getEntrypoint();
-  const name = getApplicationName();
+  const { cmd, indexFile } = parseArgv();
 
   core.appInfo = {
     // dedupe this? - it's already in systemInfo
@@ -50,15 +49,15 @@ module.exports = function (core) {
     },
     cmd,
     hostname: os.hostname(),
-    indexFile: entrypoint,
+    indexFile,
     path: pkgInfo.packageFile,
     pkg: pkgInfo.packageData,
-    name,
+    name: getApplicationName(),
     app_dir: pkgInfo.dir,
-    version: config.application.version || pkgInfo.packageData.version,
+    version: config.application.version ?? pkgInfo.packageData.version,
     serverVersion: config.server.version,
     nodeVersion: process.version,
-    appPath: config.application.path || pkgInfo.dir,
+    appPath: config.application.path ?? pkgInfo.dir,
     serverName: config.server.name,
     serverType: config.server.type,
     serverEnvironment: config.server.environment,
@@ -76,13 +75,12 @@ module.exports = function (core) {
     } = process;
     [
       { range: '>=18.19.0', flags: ['--import'] },
-      { range: '>=16.17.0 <18.19.0', flags: ['--loader'] },
-      { range: '<16.17.0', flags: ['-r', '--require'] }
+      { range: '>=16.17.0 <18.19.0', flags: ['--loader'] }
     ].forEach(({ range, flags }) => {
       if (
         semver.satisfies(version, range) &&
         (execArgv.some((el, idx) => el === '@contrast/agent' && !flags.includes(execArgv[idx - 1])) ||
-        NODE_OPTIONS?.includes('@contrast/agent') && !flags.some(flag => NODE_OPTIONS.includes(flag)))
+          NODE_OPTIONS?.includes('@contrast/agent') && !flags.some(flag => NODE_OPTIONS.includes(flag)))
       ) {
         logger.warn(
           'For Node LTS %s, use %s command to run the agent. See: https://docs.contrastsecurity.com/en/install-node-js.html',
@@ -94,84 +92,69 @@ module.exports = function (core) {
   }
 
   /**
-   * Generates a command string based on ARGV and process.argv0, which will be used
-   * for the `appInfo.cmd` field. This function will throw if any of the config's
-   * cmd_ignore_list values match the command.
-   * @returns {string} the issued command that started the current node process
+   * Parse and process the process.argv array to construct `appInfo.cmd` and
+   * resolve the application entry point.
+   * Throws if the running process should not be instrumented per the
+   * `cmd_ignore_list` and `exclusive_entrypoint` config options.
    * @throws {IntentionalError} when command should be is ignored by Contrast
+   * @returns {{ cmd: string, indexFile: string }} stringified command and resolved entrypoint file
    */
-  function getCommand() {
-    const args = [process.argv0, ...process.argv].map((a) => path.basename(a));
-    const cmd = ArrayPrototypeJoin.call(Array.from(new Set(args)), ' ');
-    const message = 'application command matches cmd_ignore_list config option';
-
-    if (cmd_ignore_list) {
-      let err;
-      for (const ignoreCommand of cmd_ignore_list) {
-
-        if (ignoreCommand === 'npm*') {
-          if (cmd.includes('npm ')) err = new IntentionalError(message);
-        } else {
-          if (cmd.includes(ignoreCommand)) err = new IntentionalError(message);
-        }
-        if (err) {
-          logger.trace({ cmd_ignore_list, cmd }, message);
-          throw err;
-        }
-      }
-    }
-
-    return cmd;
-  }
-
-  /**
-   * Returns the entrypoint file. If none is found, or the one discovered doesn't match the
-   * config's `agent.node.exclusive_entrypoint` value, this will throw.
-   * @returns {string} entrypoint file name
-   * @throws {Error|IntentionalError} if no entrypoint is found or we're supposed to ignore the app
-   */
-  function getEntrypoint() {
-    let entrypoint = process.argv[1];
-    const { packageData } = pkgInfo;
+  function parseArgv() {
+    const args = new Set([process.argv0, ...process.argv]);
+    let indexFile = path.normalize(process.argv[1]);
 
     try {
-      if (entrypoint && fs.statSync(entrypoint).isDirectory()) {
-        const main = path.join(entrypoint, packageData.main || 'index.js');
+      if (indexFile && fs.statSync(indexFile).isDirectory()) {
+        const main = path.join(indexFile, pkgInfo.packageData.main ?? 'index.js');
         try {
           if (fs.statSync(main)) {
-            entrypoint = main;
+            indexFile = main;
           }
         } catch (err) {
-          entrypoint = null;
+          indexFile = null;
         }
       }
-    } catch (err) {} // eslint-disable-line no-empty
+    } catch (err) {
+      // use default process.argv[1]
+    }
 
-    if (!entrypoint) {
+    if (!indexFile) {
       logger.error('no entrypoint found for application');
       throw new Error('No entrypoint found');
     }
 
+    let isExclusiveEntrypoint = false;
     if (exclusive_entrypoint) {
-      const expectedEntrypoint = path.resolve(app_root || process.cwd(), exclusive_entrypoint);
-      if (entrypoint !== expectedEntrypoint) {
-        const message = 'application does not match exclusive_entrypoint config option';
-        logger.trace({
-          entrypoint,
-          exclusive_entrypoint: expectedEntrypoint,
-        }, message);
+      const expectedEntrypoint = path.resolve(app_root ?? process.cwd(), exclusive_entrypoint);
+      if (indexFile !== expectedEntrypoint) {
+        const message = 'Skipping instrumentation because application does not match the `exclusive_entrypoint` config option.';
+        logger.info({ entrypoint: indexFile, exclusive_entrypoint: expectedEntrypoint }, message);
         throw new IntentionalError(message);
       }
+      isExclusiveEntrypoint = true;
+    }
+
+    const cmd = process.argv.map((arg) => path.basename(arg)).join(' ');
+
+    if (!isExclusiveEntrypoint) {
+      for (const arg of args) {
+        for (const pattern of cmd_ignore_list) {
+          if (minimatch(arg, pattern, { dot: true })) {
+            const message = 'Skipping instrumentation because application command matches the `cmd_ignore_list` config option.';
+            logger.info({ cmd_ignore_list, cmd, arg, pattern }, message);
+            throw new IntentionalError(message);
+          }
+        }
+      }
     }
 
-    return entrypoint;
+    return { cmd, indexFile };
   }
 
   /**
    * Will try to read the `package.json` file of the app. This will use find-pacakge-json
    * starting first from entrypoint, then from CWD.
    * NOTE: If the `app_root` value is specified, this will check only there and then throw if not found.
-   * @param {string} entrypoint app entrypoint
    * @returns {PackageInfo} dir, packageData, and packageFile
    * @throws {Error} if package can't be found or parsed
    */
@@ -196,15 +179,14 @@ module.exports = function (core) {
         packageFile = process.env.npm_package_json ?? findPackageJsonSync({ cwd: dir });
         packageData = require(packageFile);
         break;
-      } catch (err) {} // eslint-disable-line no-empty
+      } catch (err) {
+        // packageData stays undefined, throws below.
+      }
     }
 
     if (!packageData) {
-      const message = 'unable to locate application package.json';
-      logger.error({
-        app_root,
-        paths: Array.from(dirs),
-      }, message);
+      const message = "Unable to locate application's package.json";
+      logger.error({ app_root, paths: Array.from(dirs) }, message);
       throw new Error(message);
     }
 
@@ -220,12 +202,9 @@ module.exports = function (core) {
    * @throws {Error} if there is no name identified
    */
   function getApplicationName() {
-    const name = config.application.name || pkgInfo.packageData.name;
+    const name = config.application.name ?? pkgInfo.packageData.name;
     if (!name) {
-      throw new Error(
-        'The application\'s name was not identified. ' +
-        'Please provide name in package.json field or with the agent\'s application.name config option.'
-      );
+      throw new Error("The application's name was not identified. Please provide `name` in package.json field or with the agent's `application.name` config option.");
     }
 
     return name;

package/node_modules/@contrast/core/lib/index.d.ts

@@ -44,9 +44,25 @@ export interface Core {
 
   messages: Messages;
 
-  sensitiveDataMasking: any;
+  sensitiveDataMasking: SensitiveDataMasking;
 
   getSystemInfo(): Promise<SystemInfo>;
   getBuildId(): Promse<number | void>;
   Perf: any;
 }
+
+export interface SensitiveDataMasking {
+  policy: any;
+  idMap: Map<Set, string>;
+  keywordSets: Set<string>[];
+  maskHttpBody: boolean;
+  maskAttackVector: boolean;
+  createMasker(): Masker;
+  getRedactedText(key: string, value: string): string;
+  traverseAndMask(target: Record<string, string>, p: Masker | Set<string>): void;
+}
+
+export interface Masker {
+  unmasked?: Set<string>;
+  getMaskedValue(key: string, value: string): string;
+}