@contrast/cli 1.25.0 → 1.26.1

package/lib/rewrite.js

@@ -90,20 +90,28 @@ class RewriteVisitor extends Visitor {
   }
 
   /**
-   * Visit `import ... from 'source'`, recursively rewriting the resolved path
-   * of `source`.
-   * @param {swc.ImportDeclaration} n
+   * Visit the String Literal argument of either `import` or `require`, trying
+   * to rewrite the arg if it's a valid (i.e., absolute) path.
+   * @param {swc.StringLiteral} n
    */
-  visitImportDeclaration(n) {
+  visitImportOrRequireString(n) {
     try {
-      const filename = this.require.resolve(n.source.value);
+      const filename = this.require.resolve(n.value);
       if (path.isAbsolute(filename)) {
         rewriteFile(filename);
       }
     } catch (err) {
-      logger.debug({ n, err }, 'unable to resolve %s', n.source.value);
+      logger.debug({ n, err }, 'unable to resolve %s', n.value);
     }
+  }
 
+  /**
+   * Visit `import ... from 'source'`, recursively rewriting the resolved path
+   * of `source`.
+   * @param {swc.ImportDeclaration} n
+   */
+  visitImportDeclaration(n) {
+    this.visitImportOrRequireString(n.source);
     return super.visitImportDeclaration(n);
   }
 
@@ -116,14 +124,7 @@ class RewriteVisitor extends Visitor {
     if (n.callee.type === 'Import' || (n.callee.type === 'Identifier' && n.callee.value === 'require')) {
       const { expression } = n.arguments[0];
       if (expression.type === 'StringLiteral') {
-        try {
-          const filename = this.require.resolve(expression.value);
-          if (path.isAbsolute(filename)) {
-            rewriteFile(filename);
-          }
-        } catch (err) {
-          logger.debug({ n, err }, 'unable to resolve %s', expression.value);
-        }
+        this.visitImportOrRequireString(expression);
       }
     }
 
@@ -164,11 +165,14 @@ async function rewriteFile(filename) {
  * @param {string} filename
  * @param {object} opts
  * @param {boolean=} opts.assess
+ * @param {boolean=} opts.protect
  */
 async function action(filename, opts) {
-  if (config.assess.enable || opts.assess) rewriter.install('assess');
-  // If we're rewriting, we're always at least in protect mode.
-  rewriter.install('protect');
+  if (!opts.protect && (config.assess.enable || opts.assess)) {
+    rewriter.install('assess');
+  } else {
+    rewriter.install('protect');
+  }
 
   logger.info(
     'Caching rewriter results to %s',
@@ -187,7 +191,10 @@ if (require.main === module) {
     .version(version)
     .description('Rewrites application files, caching them so that rewriting does not need to occur when the application runs.')
     .argument('<entrypoint>', 'The entrypoint for the application', entrypoint => path.resolve(entrypoint))
-    .option('-a, --assess', 'enable assess mode')
+    .option('-a, --assess', 'rewrite in assess mode')
+    .option('-p, --protect', 'rewrite in protect mode')
     .action(action)
     .parse(process.argv);
 }
+
+module.exports.action = action;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/cli",
-  "version": "1.25.0",
+  "version": "1.26.1",
   "description": "A collection of agent related CLI utilities",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,19 +14,19 @@
   },
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 14.15.0"
+    "node": ">= 14.18.0"
   },
   "scripts": {
     "test": "../scripts/test.sh"
   },
   "dependencies": {
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/rewriter": "1.7.0",
-    "@contrast/config": "1.27.0",
-    "@contrast/core": "1.31.0",
-    "@contrast/logger": "1.8.0",
-    "@contrast/reporter": "1.26.0",
-    "@contrast/scopes": "^1.4.0",
+    "@contrast/rewriter": "1.7.1",
+    "@contrast/config": "1.27.1",
+    "@contrast/core": "1.31.1",
+    "@contrast/logger": "1.8.1",
+    "@contrast/reporter": "1.26.1",
+    "@contrast/scopes": "1.4.1",
     "@swc/core": "1.3.39",
     "commander": "^9.4.1"
   }