@contrast/agentify 1.4.1 → 1.5.1

package/lib/index.js

@@ -41,7 +41,6 @@ const defaultOpts = {
 module.exports = function(core) {
   // compose add'l local services
   require('./sources')(core);
-  require('./contrast-methods')(core);
   require('./function-hooks')(core);
   require('./rewrite-hooks')(core);
 
@@ -137,18 +136,12 @@ class Agent {
   }
 
   logDiagnosticFiles() {
-    const { agentName, agentVersion, config, getEffectiveConfig, getSystemInfo } = this.core;
+    const { config, getEffectiveConfig, getSystemInfo } = this.core;
 
     if (config.agent.diagnostics.enable !== false) {
-      const effectiveConfig = JSON.stringify(getEffectiveConfig(), null, 2).concat('\n\n');
+      const effectiveConfig = JSON.stringify(getEffectiveConfig(), null, 2);
+      const systemInfo = JSON.stringify(getSystemInfo(), null, 2);
 
-      let systemInfo = getSystemInfo();
-      systemInfo.Contrast.Agent = {
-        Name: agentName,
-        Version: agentVersion,
-      };
-
-      systemInfo = JSON.stringify(systemInfo, null, 2).concat('\n\n');
       if (!config.agent.diagnostics.quiet) {
         fs.writeFileSync(1, effectiveConfig, 'utf8');
         fs.writeFileSync(1, systemInfo, 'utf8');

package/lib/sources.js

@@ -32,43 +32,15 @@ module.exports = function(core) {
   }
 
   function install() {
-    [{
-      moduleName: 'http'
-    },
-    {
-      moduleName: 'https'
-    },
-    {
-      moduleName: 'spdy'
-    },
-    {
-      moduleName: 'http2',
-      patchObjectsProps: [
-        {
-          methods: ['createServer', 'createSecureServer'],
-          patchType,
-          patchObjects: [
-            {
-              name: 'Server.prototype',
-              methods: ['emit'],
-              patchType,
-              around: aroundHook('http2')
-            }
-          ]
-        }
-      ]
-    }].forEach(({ moduleName, patchObjectsProps }) => {
-      const patchObjects = patchObjectsProps || [
-        {
+    ['http', 'https', 'spdy', 'http2'].forEach((moduleName) => {
+      instrument({
+        moduleName,
+        patchObjects: [{
           name: 'Server.prototype',
           methods: ['emit'],
           patchType,
           around: aroundHook(moduleName)
-        }
-      ];
-      instrument({
-        moduleName,
-        patchObjects
+        }]
       });
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "Configures Contrast agent services and instrumentation within an application",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",

package/lib/contrast-methods.js

@@ -1,169 +0,0 @@
-/*
- * Copyright: 2022 Contrast Security, Inc
- * Contact: support@contrastsecurity.com
- * License: Commercial
-
- * NOTICE: This Software and the patented inventions embodied within may only be
- * used as part of Contrast Security’s commercial offerings. Even though it is
- * made available through public repositories, use of this Software is subject to
- * the applicable End User Licensing Agreement found at
- * https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
- * between Contrast Security and the End User. The Software may not be reverse
- * engineered, modified, repackaged, sold, redistributed or otherwise used in a
- * way not consistent with the End User License Agreement.
- */
-
-'use strict';
-
-module.exports = function (core) {
-  const { logger, patcher } = core;
-
-  const getOrig = (v) => patcher.unwrap(v);
-  const slice = patcher.unwrap(String.prototype.slice);
-  const toUntrackedString = (v) => slice.call(` ${v}`, 1);
-
-  /**
-   * Components e.g. Assess, Protect, can
-   * 1) configure rewriter to add desired ContrastMethod functions to source code
-   * 2) patch those functions on `contrastMethods.api` in order to add instrumentation
-   */
-  const contrastMethods = {
-    api: {
-      eval(v) {
-        return v;
-      },
-
-      // Binary Operators
-      add(left, right) {
-        const ret = getOrig(left) + getOrig(right);
-        return ret;
-      },
-      eqEq(left, right) {
-        left = getOrig(left);
-        right = getOrig(right);
-
-        return left == right;
-      },
-      eqEqEq(left, right) {
-        left = getOrig(left);
-        right = getOrig(right);
-
-        return left === right;
-      },
-      notEqEq(left, right) {
-        left = getOrig(left);
-        right = getOrig(right);
-
-        return left !== right;
-      },
-      notEq(left, right) {
-        left = getOrig(left);
-        right = getOrig(right);
-
-        return left != right;
-      },
-
-      // Computed Properties
-      // Used to force a copy of handle:
-      // https://stackoverflow.com/a/31733628
-      // This is a workaround for CONTRAST-30333, in which something we
-      // suspect is a v8 bug means that handle will otherwise be clobbered
-      // and if it was externalized, we will lose the data associated with it
-      forceCopy(handle) {
-        if (typeof handle === 'string') {
-          handle = toUntrackedString(handle);
-        }
-        return handle;
-      },
-
-      // Switch Case
-      cast(val) {
-        return getOrig(val);
-      },
-
-      /**
-       * Tagged Templates
-       * The first argument received by the tag function is an array of strings.
-       * For any template literal, its length is equal to the number of
-       * substitutions (occurrences of ${...}) plus one, and is therefore always
-       * non-empty.
-       * see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates
-       * @param {string[]} strings length n+1
-       * @param {string[]} args length n
-       * @returns {string}
-       */
-      tag(strings, ...args) {
-        const [first, ...rest] = strings;
-
-        return rest.reduce(
-          (result, str, i) => result.concat(args[i], str),
-          first,
-        );
-      },
-
-      // Import Statements
-      importDefault(...args) {
-        // noop
-      },
-
-      importStarAs(...args) {
-        // noop
-      },
-
-      importNamed(...args) {
-        // noop
-      },
-
-      // Injections
-      Function: core.patcher.patch(global.Function, {
-        name: 'global.Function',
-        patchType: 'rewrite-injection',
-      }),
-      JSON: core.patcher.patch(global.JSON, {
-        name: 'global.JSON',
-        patchType: 'rewrite-injection',
-      }),
-      Number: core.patcher.patch(global.Number, {
-        name: 'global.Number',
-        patchType: 'rewrite-injection',
-      }),
-      Object: core.patcher.patch(global.Object, {
-        name: 'global.Object',
-        patchType: 'rewrite-injection',
-      }),
-      String: core.patcher.patch(global.String, {
-        name: 'global.String',
-        patchType: 'rewrite-injection',
-      }),
-    },
-
-    installed: false,
-
-    getGlobal() {
-      return global;
-    },
-  };
-
-  contrastMethods.install = function () {
-    if (contrastMethods.installed) {
-      return;
-    }
-
-    const global = contrastMethods.getGlobal();
-
-    try {
-      Object.defineProperty(global, 'ContrastMethods', {
-        enumerable: true,
-        configurable: false,
-        value: contrastMethods.api,
-      });
-      contrastMethods.installed = true;
-    } catch (err) {
-      // We should never expect this since the installation process is well
-      // controlled, but still we should have the defensive code.
-      logger.error({ err }, 'Unable to inject global.ContrastMethods');
-    }
-  };
-
-  return (core.contrastMethods = contrastMethods);
-};