tools: update crypo check rule

This commit updates the custom crypto-check ESLint rule to detect require() calls that come before any hasCrypto checks. PR-URL: #25399 Refs: #25388 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]>
nodejs · Jan 14, 2019 · 2a85cc7 · 2a85cc7
1 parent 46ec26f
commit 2a85cc7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/test/parallel/test-eslint-crypto-check.js b/test/parallel/test-eslint-crypto-check.js
@@ -22,6 +22,14 @@ new RuleTester().run('crypto-check', rule, {
     `
   ],
   invalid: [
+    {
+      code: 'require("common")\n' +
+            'require("crypto")\n' +
+            'if (!common.hasCrypto) {\n' +
+            '  common.skip("missing crypto");\n' +
+            '}',
+      errors: [{ message }]
+    },
     {
       code: 'require("common")\n' +
             'require("crypto")',

diff --git a/tools/eslint-rules/crypto-check.js b/tools/eslint-rules/crypto-check.js
@@ -66,6 +66,22 @@ module.exports = function(context) {
 
   function reportIfMissingCheck() {
     if (hasSkipCall) {
+      // There is a skip, which is good, but verify that the require() calls
+      // in question come after at least one check.
+      if (missingCheckNodes.length > 0) {
+        requireNodes.forEach((requireNode) => {
+          const beforeAllChecks = missingCheckNodes.every((checkNode) => {
+            return requireNode.start < checkNode.start;
+          });
+
+          if (beforeAllChecks) {
+            context.report({
+              node: requireNode,
+              message: msg
+            });
+          }
+        });
+      }
       return;
     }