js-confuser 1.2.1 → 1.4.1

package/dist/transforms/identifier/renameVariables.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.VariableAnalysis = void 0;
+exports.default = void 0;
 
 var _assert = require("assert");
 
@@ -15,107 +15,23 @@ var _identifiers = require("../../util/identifiers");
 
 var _insert = require("../../util/insert");
 
-var _compare = require("../../util/compare");
-
 var _transform = _interopRequireDefault(require("../transform"));
 
 var _constants = require("../../constants");
 
 var _probability = require("../../probability");
 
+var _variableAnalysis = _interopRequireDefault(require("./variableAnalysis"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-/**
- * Keeps track of what identifiers are defined and referenced in each context.
- */
-class VariableAnalysis extends _transform.default {
-  /**
-   * Node being the context.
-   */
-  constructor(o) {
-    super(o);
-
-    _defineProperty(this, "defined", void 0);
-
-    _defineProperty(this, "references", void 0);
-
-    this.defined = new Map();
-    this.references = new Map();
-  }
-
-  match(object, parents) {
-    return (0, _insert.isContext)(object);
-  }
-
-  transform(object, parents) {
-    (0, _traverse.walk)(object, parents, (o, p) => {
-      if (o.type == "Identifier") {
-        var name = o.name;
-        (0, _assert.ok)(typeof name === "string");
-
-        if (!(0, _compare.isValidIdentifier)(name)) {
-          return;
-        }
-
-        if (_constants.reservedIdentifiers.has(name)) {
-          return;
-        }
-
-        if (this.options.globalVariables.has(name)) {
-          return;
-        }
-
-        var info = (0, _identifiers.getIdentifierInfo)(o, p);
-
-        if (!info.spec.isReferenced) {
-          return;
-        }
-
-        if (info.spec.isExported) {
-          return;
-        }
-
-        var definingContexts = info.spec.isDefined ? [(0, _insert.getDefiningContext)(o, p)] : [(0, _insert.getVarContext)(o, p), (0, _insert.getLexContext)(o, p)];
-        (0, _assert.ok)(definingContexts.length);
-        var isDefined = info.spec.isDefined;
-        definingContexts.forEach(definingContext => {
-          (0, _assert.ok)((0, _insert.isContext)(definingContext), "".concat(definingContext.type, " is not a context"));
-
-          if (isDefined) {
-            // Add to defined Map
-            if (!this.defined.has(definingContext)) {
-              this.defined.set(definingContext, new Set());
-            }
-
-            this.defined.get(definingContext).add(name);
-            this.references.has(definingContext) && this.references.get(definingContext).delete(name);
-          } else {
-            // Add to references Map
-            if (!this.defined.has(definingContext) || !this.defined.get(definingContext).has(name)) {
-              if (!this.references.has(definingContext)) {
-                this.references.set(definingContext, new Set());
-              }
-
-              this.references.get(definingContext).add(name);
-            }
-          }
-        });
-      }
-    });
-  }
-
-}
 /**
  * Rename variables to randomly generated names.
  *
  * - Attempts to re-use already generated names in nested scopes.
  */
-
-
-exports.VariableAnalysis = VariableAnalysis;
-
 class RenameVariables extends _transform.default {
   // Generator object
   // Names already used
@@ -133,7 +49,8 @@ class RenameVariables extends _transform.default {
     _defineProperty(this, "variableAnalysis", void 0);
 
     this.changed = new Map();
-    this.before.push(this.variableAnalysis = new VariableAnalysis(o));
+    this.variableAnalysis = new _variableAnalysis.default(o);
+    this.before.push(this.variableAnalysis);
     this.gen = this.getGenerator();
     this.generated = [];
   }
@@ -195,16 +112,23 @@ class RenameVariables extends _transform.default {
 
     defined.forEach(name => {
       if ((isGlobal && !name.startsWith("__p_") ? (0, _probability.ComputeProbabilityMap)(this.options.renameGlobals, x => x, name) : true) && (0, _probability.ComputeProbabilityMap)(this.options.renameVariables, x => x, name, isGlobal)) {
-        if (possible.size) {
-          var first = possible.values().next().value;
-          possible.delete(first);
-          newNames[name] = first;
-        } else {
-          // Fix 1. Use `generateIdentifier` over `gen.generate()` so Integrity can get unique variable names
-          var g = this.generateIdentifier();
-          newNames[name] = g;
-          this.generated.push(g);
-        }
+        // Fix 2. Ensure global names aren't overridden
+        var newName;
+
+        do {
+          if (possible.size) {
+            var first = possible.values().next().value;
+            possible.delete(first);
+            newName = first;
+          } else {
+            // Fix 1. Use `generateIdentifier` over `gen.generate()` so Integrity can get unique variable names
+            var g = this.generateIdentifier();
+            newName = g;
+            this.generated.push(g);
+          }
+        } while (this.variableAnalysis.globals.has(newName));
+
+        newNames[name] = newName;
       } else {
         newNames[name] = name;
       }

package/dist/transforms/identifier/variableAnalysis.js

@@ -0,0 +1,133 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _assert = require("assert");
+
+var _constants = require("../../constants");
+
+var _traverse = require("../../traverse");
+
+var _compare = require("../../util/compare");
+
+var _identifiers = require("../../util/identifiers");
+
+var _insert = require("../../util/insert");
+
+var _transform = _interopRequireDefault(require("../transform"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/**
+ * Keeps track of what identifiers are defined and referenced in each context.
+ */
+class VariableAnalysis extends _transform.default {
+  /**
+   * Node being the context.
+   */
+
+  /**
+   * Context->Nodes referenced (does not include nested)
+   */
+
+  /**
+   * Set of global identifiers to never be redefined
+   */
+
+  /**
+   * Set of identifers that are defined within the program
+   */
+  constructor(o) {
+    super(o);
+
+    _defineProperty(this, "defined", void 0);
+
+    _defineProperty(this, "references", void 0);
+
+    _defineProperty(this, "globals", void 0);
+
+    _defineProperty(this, "notGlobals", void 0);
+
+    this.defined = new Map();
+    this.references = new Map();
+    this.globals = new Set();
+    this.notGlobals = new Set();
+  }
+
+  match(object, parents) {
+    return (0, _insert.isContext)(object);
+  }
+
+  transform(object, parents) {
+    (0, _traverse.walk)(object, parents, (o, p) => {
+      if (o.type == "Identifier") {
+        var name = o.name;
+        (0, _assert.ok)(typeof name === "string");
+
+        if (!(0, _compare.isValidIdentifier)(name)) {
+          return;
+        }
+
+        if (_constants.reservedIdentifiers.has(name)) {
+          return;
+        }
+
+        if (this.options.globalVariables.has(name)) {
+          return;
+        }
+
+        var info = (0, _identifiers.getIdentifierInfo)(o, p);
+
+        if (!info.spec.isReferenced) {
+          return;
+        }
+
+        if (info.spec.isExported) {
+          return;
+        }
+
+        var isDefined = info.spec.isDefined; // Keep track of defined names within the program
+
+        if (isDefined) {
+          this.notGlobals.add(o.name);
+          this.globals.delete(o.name);
+        } else if (!this.notGlobals.has(o.name)) {
+          this.globals.add(o.name);
+        }
+
+        var definingContexts = info.spec.isDefined ? [(0, _insert.getDefiningContext)(o, p)] : (0, _insert.getReferencingContexts)(o, p, info);
+        (0, _assert.ok)(definingContexts.length);
+        definingContexts.forEach(definingContext => {
+          (0, _assert.ok)((0, _insert.isContext)(definingContext), "".concat(definingContext.type, " is not a context"));
+
+          if (isDefined) {
+            // Add to defined Map
+            if (!this.defined.has(definingContext)) {
+              this.defined.set(definingContext, new Set());
+            }
+
+            this.defined.get(definingContext).add(name);
+            this.references.has(definingContext) && this.references.get(definingContext).delete(name);
+          } else {
+            // Add to references Map
+            if (!this.defined.has(definingContext) || !this.defined.get(definingContext).has(name)) {
+              if (!this.references.has(definingContext)) {
+                this.references.set(definingContext, new Set());
+              }
+
+              this.references.get(definingContext).add(name);
+            }
+          }
+        });
+      }
+    });
+  }
+
+}
+
+exports.default = VariableAnalysis;

package/dist/transforms/label.js

@@ -27,7 +27,7 @@ class Label extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _compare.isLoop)(object);
+    return (0, _compare.isLoop)(object) || object.type == "BlockStatement" && parents[0] && parents[0].type == "LabeledStatement" && parents[0].body === object;
   }
 
   transform(object, parents) {
@@ -36,7 +36,16 @@ class Label extends _transform.default {
       var label = currentLabel || this.getPlaceholder();
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "BreakStatement" || o.type == "ContinueStatement") {
-          var loop = p.find(x => (0, _compare.isLoop)(x));
+          function isContinuableStatement(x) {
+            return (0, _compare.isLoop)(x) && x.type !== "SwitchStatement";
+          }
+
+          function isBreakableStatement(x) {
+            return (0, _compare.isLoop)(x) || o.label && x.type == "BlockStatement";
+          }
+
+          var fn = o.type == "ContinueStatement" ? isContinuableStatement : isBreakableStatement;
+          var loop = p.find(fn);
 
           if (object == loop) {
             if (!o.label) {

package/dist/transforms/lock/antiDebug.js

@@ -23,20 +23,31 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var DevToolsDetection = (0, _template.default)("\n  function $jsc_debug(){\n    var startTime = new Date();\n    debugger;\n    var endTime = new Date();\n    var isDev = endTime-startTime > 600;\n  \n    while (isDev) {\n      debugger;\n      (function () {}). constructor (\"debugger\") ()\n    }\n  \n  }\n  try {\n    if ( setInterval ) {\n      setInterval(()=>{\n        $jsc_debug();\n      }, 4000);\n    }\n  } catch ( e ) {\n\n  }\n \n");
+var DevToolsDetection = (0, _template.default)("\n  try {\n    if ( setInterval ) {\n      setInterval(()=>{\n        {functionName}();\n      }, 4000);\n    }\n  } catch ( e ) {\n\n  }\n");
 
 class AntiDebug extends _transform.default {
-  constructor(o) {
+  constructor(o, lock) {
     super(o, _order.ObfuscateOrder.Lock);
 
     _defineProperty(this, "made", void 0);
 
+    _defineProperty(this, "lock", void 0);
+
+    this.lock = lock;
     this.made = 0;
   }
 
   apply(tree) {
     super.apply(tree);
-    tree.body.unshift(...DevToolsDetection.compile());
+    var fnName = this.getPlaceholder();
+    var startTimeName = this.getPlaceholder();
+    var endTimeName = this.getPlaceholder();
+    var isDevName = this.getPlaceholder();
+    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode() : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName)))])], null)]);
+    tree.body.unshift(...DevToolsDetection.compile({
+      functionName: fnName
+    }));
+    tree.body.push(functionDeclaration);
   }
 
   match(object, parents) {
@@ -44,17 +55,25 @@ class AntiDebug extends _transform.default {
   }
 
   transform(object, parents) {
-    var body = (0, _insert.getBlockBody)(object.body);
-    [...body].forEach(stmt => {
-      if (Math.random() < 0.1 / (this.made || 1)) {
-        var index = (0, _random.getRandomInteger)(0, body.length);
-
-        if (body[index].type != "DebuggerStatement") {
-          body.splice(index, 0, (0, _gen.DebuggerStatement)());
-          this.made++;
+    return () => {
+      var body = (0, _insert.getBlockBody)(object.body);
+      [...body].forEach((stmt, i) => {
+        var addDebugger = Math.random() < 0.1 / (this.made || 1);
+
+        if (object.type == "Program" && i == 0) {
+          addDebugger = true;
+        }
+
+        if (addDebugger) {
+          var index = (0, _random.getRandomInteger)(0, body.length);
+
+          if (body[index].type != "DebuggerStatement") {
+            body.splice(index, 0, (0, _gen.DebuggerStatement)());
+            this.made++;
+          }
         }
-      }
-    });
+      });
+    };
   }
 
 }

package/dist/transforms/lock/lock.js

@@ -62,7 +62,7 @@ class Lock extends _transform.default {
     }
 
     if (this.options.lock.antiDebug) {
-      this.before.push(new _antiDebug.default(o));
+      this.before.push(new _antiDebug.default(o, this));
     }
 
     this.made = 0;
@@ -104,7 +104,7 @@ class Lock extends _transform.default {
       });
 
       if (!this.counterMeasuresNode) {
-        throw new Error("Countermeasures function named '" + this.options.lock.countermeasures + "' was not found. Names found: " + Array.from(defined).slice(0, 100).join(", "));
+        throw new Error("Countermeasures function named '" + this.options.lock.countermeasures + "' was not found.");
       }
     }
 
@@ -204,6 +204,10 @@ class Lock extends _transform.default {
       choices.push("osLock");
     }
 
+    if (this.options.lock.selfDefending) {
+      choices.push("selfDefending");
+    }
+
     if (!choices.length) {
       return;
     }
@@ -231,6 +235,13 @@ class Lock extends _transform.default {
       var offset = 0;
 
       switch (type) {
+        case "selfDefending":
+          // A very simple mechanism inspired from https://github.com/javascript-obfuscator/javascript-obfuscator/blob/master/src/custom-code-helpers/self-defending/templates/SelfDefendingNoEvalTemplate.ts
+          // regExp checks for a newline, formatters add these
+          var callExpression = (0, _template.default)("\n            (\n              function(){\n                // Breaks JSNice.org, beautifier.io\n                var namedFunction = function(){\n                  const test = function(){\n                    const regExp=new RegExp('\\n');\n                    return regExp['test'](namedFunction)\n                  };\n                  return test()\n                }\n\n                return namedFunction();\n              }\n            )()\n            ").single().expression;
+          nodes.push((0, _gen.IfStatement)(callExpression, this.getCounterMeasuresCode() || [], null));
+          break;
+
         case "nativeFunction":
           var set = this.options.lock.nativeFunctions;