@contrast/core 1.21.0 → 1.23.0

package/lib/app-info.js

@@ -20,7 +20,7 @@ const path = require('path');
 const fs = require('fs');
 const process = require('process');
 
-const MAX_ATTEMPTS = 5;
+const MAX_ATTEMPTS = 10; // temporary until test dir is flattened a bit
 
 module.exports = function (core) {
   const { logger, config } = core;

package/lib/index.js

@@ -18,23 +18,26 @@
 const EventEmitter = require('events');
 
 module.exports = function init(core = {}) {
-  core.messages = new EventEmitter();
   core.events = {
     lifecycle: new EventEmitter(),
-    // messages: new EventEmitter(),
   };
-  require('./agent-info')(core);
+  core.messages = new EventEmitter(); // merge
+
   require('@contrast/config')(core);
-  require('./logger-factory')(core);
-  require('./effective-config')(core);
+  require('@contrast/logger').default(core);
+
+  require('./agent-info')(core);
   require('./system-info')(core);
-  require('./sensitive-data-masking')(core);
   require('./app-info')(core);
+  require('./sensitive-data-masking')(core);
   require('./is-agent-path')(core);
-  require('./capture-stacktrace')(core);
+  require('./capture-stacktrace')(core); // @contrast/info
+
   require('@contrast/patcher')(core);
-  require('./contrast-methods')(core);
-  require('@contrast/rewriter')(core);
+
+  require('@contrast/rewriter')(core); // merge contrast-methods?
+  require('./contrast-methods')(core); // can we remove dependency on patcher?
+
   require('@contrast/dep-hooks')(core);
   require('@contrast/scopes')(core);
   require('@contrast/deadzones')(core);

package/lib/system-info/index.js

@@ -21,7 +21,7 @@ const os = require('os');
 
 function isUsingPM2() {
   const used = !!process.env.pmx;
-  let version = null;
+  let version;
 
   for (const pathVar of ['npm_package_json', 'PWD']) {
     const packagePath = process.env[pathVar];
@@ -35,7 +35,7 @@ function isUsingPM2() {
     if (version) break;
   }
 
-  return { used, version };
+  return { used, ...(version && { version }) };
 }
 
 function isDocker() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/core",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "description": "Preconfigured Contrast agent core services and models",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -17,17 +17,17 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/agentify": "1.12.0",
-    "@contrast/common": "1.14.0",
-    "@contrast/config": "1.16.0",
+    "@contrast/agentify": "1.13.0",
+    "@contrast/common": "1.15.0",
+    "@contrast/config": "1.18.0",
     "@contrast/deadzones": "1.1.0",
     "@contrast/dep-hooks": "1.2.0",
-    "@contrast/fn-inspect": "^3.3.0",
-    "@contrast/instrumentation": "1.1.2",
-    "@contrast/logger": "1.4.0",
+    "@contrast/fn-inspect": "^3.4.0",
+    "@contrast/instrumentation": "1.2.0",
+    "@contrast/logger": "1.5.0",
     "@contrast/patcher": "1.7.0",
-    "@contrast/reporter": "1.19.0",
+    "@contrast/reporter": "1.20.0",
     "@contrast/rewriter": "1.4.2",
     "@contrast/scopes": "1.4.0"
   }
-}
+}

package/lib/effective-config/index.js

@@ -1,91 +0,0 @@
-/*
- * Copyright: 2023 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';
-
-const REDACTED_KEYS = ['api.api_key', 'api.service_key'];
-const { Event, featureReaders, settingsReaders, mergeRemoteData } = require('@contrast/common');
-const { configOptions } = require('@contrast/config/lib/options');
-
-module.exports = function(core) {
-  const { config, messages } = core;
-  const effectiveConfig = createEffectiveConfig({ config, remoteData: {} });
-  let status = '';
-
-  messages.on(Event.SERVER_SETTINGS_UPDATE, (msg) => {
-    if (!status) {
-      status = 'Success';
-    }
-
-    mergeRemoteData(config, msg, featureReaders, setterFn, effectiveConfig);
-    mergeRemoteData(config, msg, settingsReaders, setterFn, effectiveConfig);
-  });
-
-  core.getEffectiveConfig = function (tsFriendly = false) {
-    return formatEffectiveConfig(effectiveConfig, tsFriendly);
-  };
-
-  return;
-
-  function setterFn(target, name, value) {
-    let remoteValue = value;
-    if (typeof value === 'string') remoteValue = remoteValue.toLowerCase();
-    target.set(name, {
-      canonical_name: name,
-      name,
-      value: remoteValue,
-      source: 'CONTRAST_UI',
-    });
-  }
-
-  function createEffectiveConfig({ config }) {
-    return new Map(configOptions.map(({ name }) => [name, {
-      canonical_name: name,
-      name,
-      value: config._flat[name],
-      source: config._sources[name]
-    }]));
-  }
-
-  function formatEffectiveConfig(configMap, tsFriendly = false) {
-    const effective_config = [], environment_variable = [], contrast_ui = [];
-    Array.from(configMap.values()).forEach((v) => {
-      if (v.value != undefined) {
-        if (tsFriendly) {
-          const value = REDACTED_KEYS.includes(v.name)
-            ? `contrast-redacted-${v.name}`
-            : v.value.toString();
-          effective_config.push({ ...v, value });
-        } else {
-          effective_config.push(v);
-        }
-      }
-      if (v.source === 'ENVIRONMENT_VARIABLE') environment_variable.push(v);
-      if (v.source === 'CONTRAST_UI') contrast_ui.push(v);
-    });
-
-    const content = {
-      report_create: new Date(),
-      config: {
-        status,
-        effective_config,
-        environment_variable,
-        contrast_ui,
-      }
-    };
-
-    return content;
-  }
-};

package/lib/logger-factory.js

@@ -1,62 +0,0 @@
-/*
- * Copyright: 2023 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';
-const noop = () => { };
-const { Event } = require('@contrast/common');
-
-module.exports = function (core) {
-  const { messages, config } = core;
-  const cfgLogLevel = config.agent.logger.level;
-  core.logger = {
-    pino: require('@contrast/logger').default(core),
-    children: [],
-    child(opts) {
-      const child = {
-        pino: this.pino.child(opts),
-        setLogLevel: this.setLogLevel
-      };
-      child.setLogLevel(this.pino.level);
-      this.children.push(child);
-      return child;
-    },
-    setLogLevel(level) {
-      this.level = level;
-      this.pino.level = level;
-
-      const { levelVal, levels: { values } } = this.pino;
-      for (const key in values) {
-        if (levelVal > values[key]) {
-          this[key] = noop;
-        } else {
-          this[key] = (...args) => this.pino[key](...args);
-        }
-      }
-    }
-  };
-
-  core.logger.setLogLevel(cfgLogLevel || 'info');
-
-  messages.on(Event.SERVER_SETTINGS_UPDATE, (settingsMsg) => {
-    const tsLogLevel = settingsMsg?.logger?.level.toLowerCase();
-    if (!cfgLogLevel && tsLogLevel && tsLogLevel !== core.logger.level) {
-      core.logger.setLogLevel(tsLogLevel);
-      core.logger.children.forEach((child) => {
-        child.setLogLevel(tsLogLevel);
-      });
-      core.logger.info('Received new log level: %s from server-features', tsLogLevel);
-    }
-  });
-};