@contrast/agent 4.32.14 → 4.32.15

package/lib/agent.js

@@ -15,7 +15,7 @@ Copyright: 2023 Contrast Security, Inc
 'use strict';
 
 const contrastCluster = require('cluster');
-const findCacheDir = require('find-cache-dir');
+const findCacheDir = require('./util/find-cache-dir');
 const _ = require('lodash');
 const os = require('os');
 const path = require('path');

package/lib/telemetry.js

@@ -16,7 +16,7 @@ Copyright: 2023 Contrast Security, Inc
 
 const { default: axios } = require('axios');
 const { createHash } = require('crypto');
-const findCacheDir = require('find-cache-dir');
+const findCacheDir = require('./util/find-cache-dir');
 const { promises: fs } = require('fs');
 const { default: getMac } = require('getmac');
 const os = require('os');

package/lib/util/find-cache-dir.js

@@ -0,0 +1,91 @@
+/**
+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.
+*/
+/*
+ * MIT License
+ * Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+ * Copyright (c) James Talmage <james@talmage.io> (https://github.com/jamestalmage)
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+'use strict';
+const path = require('path');
+const fs = require('fs');
+const commonDir = require('commondir');
+const pkgDir = require('pkg-dir');
+const makeDir = require('make-dir');
+
+const { env, cwd } = process;
+
+const isWritable = path => {
+  try {
+    fs.accessSync(path, fs.constants.W_OK);
+    return true;
+  } catch (_) {
+    return false;
+  }
+};
+
+function useDirectory(directory, options) {
+  if (options.create) {
+    makeDir.sync(directory);
+  }
+
+  if (options.thunk) {
+    return (...arguments_) => path.join(directory, ...arguments_);
+  }
+
+  return directory;
+}
+
+function getNodeModuleDirectory(directory) {
+  const nodeModules = path.join(directory, 'node_modules');
+
+  if (
+    !isWritable(nodeModules) &&
+		(fs.existsSync(nodeModules) || !isWritable(path.join(directory)))
+  ) {
+    return;
+  }
+
+  return nodeModules;
+}
+
+module.exports = (options = {}) => {
+  if (env.CACHE_DIR && !['true', 'false', '1', '0'].includes(env.CACHE_DIR)) {
+    return useDirectory(path.join(env.CACHE_DIR, options.name), options);
+  }
+
+  let { cwd: directory = cwd() } = options;
+
+  if (options.files) {
+    directory = commonDir(directory, options.files);
+  }
+
+  directory = pkgDir.sync(directory);
+
+  if (!directory) {
+    return;
+  }
+
+  const nodeModules = getNodeModuleDirectory(directory);
+  if (!nodeModules) {
+    return undefined;
+  }
+
+  return useDirectory(path.join(directory, 'node_modules', '.cache', options.name), options);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "4.32.14",
+  "version": "4.32.15",
   "description": "Node.js security instrumentation by Contrast Security",
   "keywords": [
     "security",
@@ -93,11 +93,12 @@
     "big-integer": "^1.6.36",
     "builtin-modules": "^3.2.0",
     "commander": "^8.3.0",
+    "commondir": "^1.0.1",
     "content-security-policy-parser": "^0.2.0",
     "cookie": "^0.3.1",
     "crc-32": "^1.0.0",
+    "del": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
-    "find-cache-dir": "^3.3.2",
     "getmac": "^5.20.0",
     "ipaddr.js": "^1.8.1",
     "js-yaml": "^4.1.0",
@@ -109,8 +110,10 @@
     "on-finished": "^2.3.0",
     "parent-package-json": "^2.0.1",
     "parseurl": "^1.3.3",
+    "pkg-dir": "^4.1.0",
     "prom-client": "^12.0.0",
     "semver": "^7.5.3",
+    "tempy": "^0.4.0",
     "uuid": "^8.3.2",
     "winston": "^3.7.2",
     "winston-daily-rotate-file": "^4.7.1"