@contrast/agent 4.27.0 → 4.27.2

package/config-diagnostics.js

@@ -16,88 +16,80 @@ Copyright: 2022 Contrast Security, Inc
 'use strict';
 
 const { exec } = require('child_process');
+const path = require('path');
+
+const HELP_MESSAGE = `
+Description:
+  The read-contrast-config utility returns the current effective node agent configuration.
+
+Usage:
+  npx -p @contrast/agent read-contrast-config <path/to/entry/script> [options]
+  npx -p @contrast/agent read-contrast-config --help
+
+Options:
+  --quiet      -q     Prevents output of the report to the console.
+  --output     -o     The directory to write the report in. Defaults to the current directory.
+`;
+
+const diagnostics = {
+  parseArgv(argv) {
+    const args = {
+      help: false,
+      output: 'contrast_effective_config.json',
+      quiet: false,
+    };
+
+    for (let i = 0; i < argv.length; i++) {
+      const arg = argv[i];
+      switch (arg) {
+        case '--help':
+          args.help = true;
+          return args;
+        case '-o':
+        case '--output': {
+          // grab the next value and skip in the next loop
+          const output = argv[++i];
+          if (!output) {
+            throw new Error('Expected a value to be provided after --output');
+          }
+          args.output = output;
+          break;
+        }
+        case '-q':
+        case '--quiet':
+          args.quiet = true;
+          break;
+        default:
+          if (!arg.startsWith('-')) {
+            args.entry = arg;
+          }
+          break;
+      }
+    }
 
-function handleDependentParameter(args, currParameter, nextParameter) {
-  switch (currParameter) {
-    case '--output':
-    case '-o':
-      args.output = nextParameter;
-      break;
-    default:
-      throw new Error(`Invalid parameter ${currParameter}`);
-  }
-}
+    if (!args.entry) {
+      throw new Error('No entry point provided');
+    }
 
-function handleIndependentParameter(args, parameter) {
-  switch (parameter) {
-    case '--help':
-      args.help = true;
-      break;
-    case '--quiet':
-    case '-q':
-      args.quiet = true;
-      break;
-    default:
-      throw new Error(`Invalid parameter ${parameter}`);
-  }
-}
+    return args;
+  },
 
-function printHelpMessage() {
-  console.log(
-    '\nDescription:\n' +
-      'The config-diagnostics utility returns the current effective node agent configuration\n' +
-    '\nUsage:\n' +
-      'npx -p @contrast/agent config-diagnostics <path/to/entry/script> [options]\n' +
-      'npx -p @contrast/agent config-diagnostics --help\n' +
-    '\nOptions:\n' +
-      '--quiet      -q     Prevents output of the report to the console.\n' +
-      '--output     -o     The directory to write the report in. Defaults to the current directory.\n'
-  );
-}
+  executeNodeAgent(args) {
+    let agentEnvArgs =
+      'CONTRAST__SHOW__BANNER=false CONTRAST__AGENT__DIAGNOSTICS__ENABLE=true';
 
-function parseArgv() {
-  const argv = process.argv.slice(2);
-  const args = {
-    output: 'contrast_effective_config.json',
-    quiet: false,
-    help: false,
-  };
-  let currParameter = null;
-
-  for (let i = 0; i < argv.length; i++) {
-    if (!currParameter) {
-      currParameter = argv[i];
-    }
-    if (!(currParameter.startsWith('--') || currParameter.startsWith('-'))) {
-      currParameter = null;
-      continue;
+    if (!args.quiet) {
+      agentEnvArgs = `${agentEnvArgs} CONTRAST__AGENT__DIAGNOSTICS__QUIET=false`;
     }
 
-    if (i + 1 == argv.length || argv[i + 1].startsWith('--') || argv[i + 1].startsWith('-')) {
-      handleIndependentParameter(args, currParameter);
-      currParameter = null;
-    } else {
-      handleDependentParameter(args, currParameter, argv[i + 1]);
-      currParameter = null;
+    if (args.output) {
+      agentEnvArgs = `${agentEnvArgs} CONTRAST__AGENT__DIAGNOSTICS__REPORT_PATH=${args.output}`;
     }
-  }
 
-  return args;
-}
+    const bootstrap = path.join(__dirname, 'bootstrap.js');
+    const command = `${agentEnvArgs} node -r ${bootstrap} ${args.entry}`;
 
-function executeNodeAgent(args) {
-  let agentEnvArgs = 'CONTRAST__SHOW__BANNER=false CONTRAST__AGENT__DIAGNOSTICS__ENABLE=true';
-  const entry = process.argv.slice(2).shift();
-
-  if (!args.quiet) {
-    agentEnvArgs = agentEnvArgs.concat(' CONTRAST__AGENT__DIAGNOSTICS__QUIET=false');
-  }
-  if (args.output) {
-    agentEnvArgs = agentEnvArgs.concat(` CONTRAST__AGENT__DIAGNOSTICS__REPORT_PATH=${args.output}`);
-  }
-
-  exec(`${agentEnvArgs} node -r ./node_modules/@contrast/agent/bootstrap.js ${entry}`,
-    (error, stdout, stderr) => {
+    exec(command, (error, stdout, stderr) => {
       if (error && !args.quiet) {
         console.log(`error: ${error.message}`);
         return;
@@ -112,19 +104,23 @@ function executeNodeAgent(args) {
       if (!args.quiet) {
         console.log(stdout);
       }
-    }
-  );
-}
+    });
+  },
 
-function fetchAgentConfig(args) {
-  if (process.argv.slice(2).length == 1 && args.help) {
-    printHelpMessage();
-  } else {
-    executeNodeAgent(args);
-  }
-}
+  fetchAgentConfig(args) {
+    if (args.help) {
+      console.log(HELP_MESSAGE);
+    } else {
+      this.executeNodeAgent(args);
+    }
+  },
+};
 
+module.exports = diagnostics;
 
-fetchAgentConfig(parseArgv());
-// exporting this stuff for testing purposes only
-module.exports = { printHelpMessage, parseArgv, executeNodeAgent, fetchAgentConfig };
+// only run if this file is being executed as an entry script
+// istanbul ignore next
+if (require.main === module) {
+  const args = diagnostics.parseArgv(process.argv.slice(2));
+  diagnostics.fetchAgentConfig(args);
+}

package/lib/hooks/patcher.js

@@ -93,9 +93,11 @@ Object.defineProperty(Function.prototype, '__isContrastHooked', {
   }
 });
 
-Function.prototype._contrast_toString = function() {
-  return Reflect.apply(functionToString, this, arguments);
-};
+Object.defineProperty(Function.prototype, '_contrast_toString', {
+  value: function _contrast_toString() {
+    return Reflect.apply(functionToString, this, arguments);
+  }
+});
 
 function runHooks(type, data, thisTarget, fnHooks) {
   fnHooks.forEach((hook, key) => {

package/package.json

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