js-confuser 1.2.1 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,174 @@
+# `1.4.1`
+AntiDebug Fix
+
+- Fixed [#28](https://github.com/MichaelXF/js-confuser/issues/28)
+- - AntiDebug was causing syntax errors in some scenarios, fixed in this version.
+
+# `1.4.0`
+Confusing Control Flow
+
+- `Control Flow Flattening` overhaul, now flattens embedded control structures
+
+- - `If statements`
+- - `For statements`
+- - `While statements`
+- - `Switch statements`
+- - `Do While statements`
+
+- - Certain functions
+
+```js
+// Input
+console.log(1);
+console.log(2);
+console.log(Number("3"));
+
+for (var i = 4; i < 6; i++) {
+  console.log(i);
+}
+
+var i = 0;
+do {
+  console.log(i + 6);
+} while (i++ < 4);
+
+// Output
+var a = -123, b = 414, c = -191;
+while (a + b + c != 104) {
+    var d = (a + b + c) * -28 + 172;
+    switch (d) {
+    case -276:
+        !(a *= 138 > b ? 2 : 158, a -= -5 < c ? -90 : -152, b *= b + 206, b -= a + -539, c += b + -372);
+        break;
+    case -2628:
+        var e = (console['log'](-106 > c ? 1 : 182), console['log'](a + 125), console['log'](Number('3')), -87 < a ? -189 < a ? -133 : 93 : 107 < c ? 227 : 4);
+        ~(a *= (-114 > c ? -164 : -107) < c ? -164 : 2, a -= 188 > b ? b + -211 : -369, b += -62 > c ? 168 > c ? -539 : 56 : 26, c += (c + 362 > a ? 73 : -157) < b ? 207 : 341);
+        break;
+    case -4420:
+        +(a *= a + (a + 18), a -= 190 > a ? -344 : 71, b *= -206 < b ? c + -173 : -221, b -= b + 94, c += 89 > b ? -311 : 170);
+        break;
+    case -3972:
+        if (e < c + -144) {
+            !(a *= b + 127, a -= b + (b + 671), b += c + 82, c *= 61 < a ? -139 : 2, c -= b + -35);
+            break;
+        }
+        typeof (a *= c + -148, a -= c + 271, b += c + 184, c += -89 < c ? -42 : -114);
+        break;
+    case -3244:
+        +(a += a + 220, b += b + 317, c += b + -218);
+        break;
+    case -4308:
+        !(a += 134 < b ? -233 : 89, b += -79 < b ? -69 : -241, c *= -107 > a ? -97 : 2, c -= (56 < a ? -27 : -184) > c ? -163 : 231);
+        break;
+    case -3664:
+        ~(a += b + -362, b += -87 < b ? -666 : -172, c += c + 710);
+        break;
+    case -5344:
+        +(a *= c + (-165 < a ? -266 : 182) > c ? 124 : 2, a -= -154 > b ? c + 92 : -388, b += c + -193, c *= c + (c + -30), c -= a + -11);
+        break;
+    case -2572:
+        if (e++ < ((-125 < a ? -62 : 87) < c ? -112 : 4)) {
+            ~(a += c + -268, b += 215 < b ? 136 : 18 < b ? -233 : 536, c += b + -535);
+            break;
+        }
+        ~(a *= (123 > a ? -105 : 238) < b ? 216 : 2, a -= a + 57, b *= a + 59, b -= a + -369, c *= b + -236, c -= 200 > c ? -288 : -11);
+        break;
+    case -4784:
+        +(console['log'](e), a *= c + -223, a -= 7 > c ? -227 > b ? -4 : 192 : -157, b *= a + (-186 > b ? 211 : 17), b -= -127 > c ? 76 : 280, c *= -63 > c ? a + 264 : 2, c -= (119 < c ? -206 : 85) < a ? 215 : 179);
+        break;
+    case -724:
+        void (console['log'](e + (c + -246)), a *= -177 < c ? 2 : 207, a -= 152 > a ? 122 : -190, b *= c + -250, b -= b + 160, c += -141 < a ? a + 258 : 21);
+        break;
+    case -3804:
+        var e = -143 > a ? 0 : 24;
+        typeof (a += c + -9, b += c + 125, c += a + -261);
+        break;
+    case -1648:
+        ~(e++, a += a + 3, b *= c + 68, b -= 89 < b ? -173 > b ? -147 : 267 : -228 > c ? -80 : -216 > b ? 93 : 68, c += 65 > a ? b + 156 : 216);
+        break;
+    }
+}
+```
+
+- New encoding type `Hex Table`
+
+```js
+"{0x7E494534,0x688,0x7E6D53,0x401,0x7E584D4B,0x688,0x7E775853,0x688,0x7E5333,0x81}" 
+
+// => "Hello World"
+```
+
+- Improvements to renaming labels
+- Fixed [#24](https://github.com/MichaelXF/js-confuser/issues/24)
+- Fixed [#25](https://github.com/MichaelXF/js-confuser/issues/25)
+- Fixed [#26](https://github.com/MichaelXF/js-confuser/issues/26)
+
+# `1.3.0`
+String Splitting Improvement
+
+- `String Splitting` now supports percentages and a custom callback. ([#22](https://github.com/MichaelXF/js-confuser/issues/22))
+
+```js
+{
+  // percentage
+  stringSplitting: 0.75, // = 75%
+
+  // exclude certain strings
+  stringSplitting: (str)=>{
+    if ( str == "dont-split-string" ) {
+      return false;
+    }
+
+    return true;
+  },
+}
+```
+
+# `1.2.2`
+Global name fix
+
+- **Bug fix**: `Rename Variables` breaking access to global variables
+
+```js
+// Say `a` is a global library
+// Input
+function myFunction(param1){
+  a(param1);
+}
+
+// Output on 1.2.1
+function a(a){
+  a(a);
+}
+
+// Output on 1.2.2
+function b(b){
+  a(b);
+}
+```
+
+- **Bug fix**: `Flatten` to not accidentally remove function parameters
+- **Bug fix**: `Dispatcher` on function calls within classes
+- **Bug fix**: `Minify` fixed syntax error
+
+```js
+// Input
+var o = {Infinity: 0};
+
+// Output on 1.2.1
+var o = {1/0: 0};
+
+// Output on 1.2.2
+var o = {[1/0]: 0};
+```
+
+- Added `base32` encoding to `String Concealing`
+- `Minify` improvements
+- - `true` -> `!0`
+- - `false` -> `!1`
+- Subtle changes to `String Compression`
+- Updated presets
+
 # `1.2.1`
 Bug fixes
 

package/README.md

@@ -14,6 +14,7 @@ JS-Confuser is a JavaScript obfuscation tool to make your programs _impossible_
 ## Presets
 
 JS-Confuser comes with three presets built into the obfuscator.
+
 | Preset | Transforms | Performance Reduction | Sample |
 | --- | --- | --- | --- |
 | High | 21/22 | 98% | [Sample](https://github.com/MichaelXF/js-confuser/blob/master/samples/high.js) |
@@ -254,7 +255,9 @@ Use a number to control the percentage of strings.
 
 ### `stringSplitting`
 
-[String Splitting](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-splitting) splits your strings into multiple expressions. (`true/false`)
+[String Splitting](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-splitting) splits your strings into multiple expressions. (`true/false/0-1`)
+
+Use a number to control the percentage of strings.
 
 `"console"` -> `String.fromCharCode(99) + 'ons' + 'ole'`
 
@@ -539,11 +542,11 @@ function iVQoGQD(...iVQoGQD){
   renameVariables: true,
   renameGlobals: true,
   shuffle: { hash: 0.5, true: 0.5 },
+  stack: true,
   stringConcealing: true,
   stringCompression: true,
   stringEncoding: true,
   stringSplitting: 0.75,
-  stack: true,
 
   // Use at own risk
   eval: false,
@@ -563,7 +566,6 @@ function iVQoGQD(...iVQoGQD){
   deadCode: 0.025,
   dispatcher: 0.75,
   duplicateLiteralsRemoval: 0.5,
-  flatten: true,
   globalConcealing: true,
   identifierGenerator: "randomized",
   minify: true,
@@ -573,6 +575,7 @@ function iVQoGQD(...iVQoGQD){
   renameVariables: true,
   renameGlobals: true,
   shuffle: true,
+  stack: 0.5,
   stringConcealing: true,
   stringSplitting: 0.25
 }
@@ -591,8 +594,6 @@ function iVQoGQD(...iVQoGQD){
   deadCode: 0.01,
   dispatcher: 0.5,
   duplicateLiteralsRemoval: true,
-  flatten: true,
-  globalConcealing: true,
   identifierGenerator: "randomized",
   minify: true,
   movedDeclarations: true,
@@ -600,7 +601,7 @@ function iVQoGQD(...iVQoGQD){
   opaquePredicates: 0.1,
   renameVariables: true,
   renameGlobals: true,
-  stringConcealing: 0.25
+  stringConcealing: true
 }
 ```
 

package/dist/options.js

@@ -12,7 +12,7 @@ var _presets = _interopRequireDefault(require("./presets"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const validProperties = new Set(["preset", "target", "indent", "compact", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "nameRecycling", "controlFlowFlattening", "hideInitializingCode", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "eval", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "debugComments"]);
+const validProperties = new Set(["preset", "target", "indent", "compact", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "nameRecycling", "controlFlowFlattening", "hideInitializingCode", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "eval", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "globalVariables", "debugComments"]);
 const validOses = new Set(["windows", "linux", "osx", "ios", "android"]);
 const validBrowsers = new Set(["firefox", "chrome", "iexplorer", "edge", "safari", "opera"]);
 
@@ -105,6 +105,10 @@ async function correctOptions(options) {
 
   if (options.globalVariables && !(options.globalVariables instanceof Set)) {
     options.globalVariables = new Set(Object.keys(options.globalVariables));
+  }
+
+  if (options.lock && options.lock.selfDefending) {
+    options.compact = true; // self defending forcibly enables this
   } // options.globalVariables was never used.
   // GlobalConcealing implicitly determines a global to be a variable referenced but never defined or modified.
 

package/dist/parser.js

@@ -28,8 +28,7 @@ async function parseJS(code) {
     var parsed = parseSync(code);
     return parsed;
   } catch (e) {
-    console.error(e);
-    throw new Error("Failed to parse code.");
+    throw e;
   }
 }
 /**

package/dist/presets.js

@@ -50,11 +50,11 @@ const highPreset = {
     hash: 0.5,
     true: 0.5
   },
+  stack: true,
   stringConcealing: true,
   stringCompression: true,
   stringEncoding: true,
   stringSplitting: 0.75,
-  stack: true,
   // Use at own risk
   eval: false,
   rgf: false
@@ -73,7 +73,6 @@ const mediumPreset = {
   deadCode: 0.025,
   dispatcher: 0.75,
   duplicateLiteralsRemoval: 0.5,
-  flatten: true,
   globalConcealing: true,
   identifierGenerator: "randomized",
   minify: true,
@@ -83,6 +82,7 @@ const mediumPreset = {
   renameVariables: true,
   renameGlobals: true,
   shuffle: true,
+  stack: 0.5,
   stringConcealing: true,
   stringSplitting: 0.25
 };

package/dist/transforms/calculator.js

@@ -11,8 +11,6 @@ var _gen = require("../util/gen");
 
 var _insert = require("../util/insert");
 
-var _traverse = require("../traverse");
-
 var _random = require("../util/random");
 
 var _order = require("../order");
@@ -43,76 +41,66 @@ class Calculator extends _transform.default {
     this.gen = this.getGenerator();
   }
 
+  apply(tree) {
+    super.apply(tree);
+
+    if (Object.keys(this.ops).length == 0) {
+      return;
+    }
+
+    var opArg = this.getPlaceholder();
+    var leftArg = this.getPlaceholder();
+    var rightArg = this.getPlaceholder();
+    var switchCases = [];
+    Object.keys(this.ops).forEach(operator => {
+      var code = this.ops[operator];
+      var factory = operator == "&&" || operator == "||" ? _gen.LogicalExpression : _gen.BinaryExpression;
+      var body = [(0, _gen.ReturnStatement)(factory(operator, (0, _gen.Identifier)(leftArg), (0, _gen.Identifier)(rightArg)))];
+      switchCases.push((0, _gen.SwitchCase)((0, _gen.Literal)(code), body));
+    });
+    var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [opArg, leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(opArg), switchCases)]);
+    (0, _insert.prepend)(tree, func);
+  }
+
   match(object, parents) {
-    return object.type == "Program" || object.type == "BinaryExpression";
+    return object.type == "BinaryExpression";
   }
 
   transform(object, parents) {
-    if (object.type == "Program") {
-      return () => {
-        var block = (0, _traverse.getBlock)(object, parents);
-
-        if (Object.keys(this.ops).length == 0) {
-          return;
-        }
-
-        var opArg = this.getPlaceholder();
-        var leftArg = this.getPlaceholder();
-        var rightArg = this.getPlaceholder();
-        var switchCases = [];
-        Object.keys(this.ops).forEach(operator => {
-          var code = this.ops[operator];
-          var factory = operator == "&&" || operator == "||" ? _gen.LogicalExpression : _gen.BinaryExpression;
-          var body = [(0, _gen.ReturnStatement)(factory(operator, (0, _gen.Identifier)(leftArg), (0, _gen.Identifier)(rightArg)))];
-          switchCases.push((0, _gen.SwitchCase)((0, _gen.Literal)(code), body));
-        });
-        var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [opArg, leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(opArg), switchCases)]);
-        (0, _insert.prepend)(block, func);
-      };
-    }
-
-    if (object.type == "BinaryExpression") {
-      var operator = object.operator;
+    var operator = object.operator;
+    var allowedOperators = new Set(["+", "-", "*", "/"]);
 
-      if (!{
-        "+": 1,
-        "-": 1,
-        "*": 1,
-        "/": 1
-      }[object.operator]) {
-        return;
-      }
+    if (!allowedOperators.has(operator)) {
+      return;
+    }
 
-      var myPrecedence = _precedence.OPERATOR_PRECEDENCE[operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(operator) / 100;
-      var maxParentPrecedence = parents.map(x => x.type == "BinaryExpression" && _precedence.OPERATOR_PRECEDENCE[x.operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(x.operator) / 100).sort().pop(); // corrupt AST
+    var myPrecedence = _precedence.OPERATOR_PRECEDENCE[operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(operator) / 100;
+    var precedences = parents.map(x => x.type == "BinaryExpression" && _precedence.OPERATOR_PRECEDENCE[x.operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(x.operator) / 100); // corrupt AST
 
-      if (maxParentPrecedence && maxParentPrecedence > myPrecedence) {
-        return;
-      }
+    if (precedences.find(x => x >= myPrecedence)) {
+      return;
+    }
 
-      return () => {
-        if (parents.find(x => x.$dispatcherSkip)) {
-          return;
-        }
+    if (parents.find(x => x.$dispatcherSkip || x.type == "BinaryExpression")) {
+      return;
+    }
 
-        if (typeof this.ops[operator] !== "number") {
-          var newState;
+    return () => {
+      if (typeof this.ops[operator] !== "number") {
+        var newState;
 
-          do {
-            newState = (0, _random.getRandomInteger)(-1000, 1000 + Object.keys(this.ops).length * 5);
-          } while (this.statesUsed.has(newState));
+        do {
+          newState = (0, _random.getRandomInteger)(-1000, 1000 + Object.keys(this.ops).length * 5);
+        } while (this.statesUsed.has(newState));
 
-          (0, _assert.ok)(!isNaN(newState));
-          this.statesUsed.add(newState);
-          this.ops[operator] = newState;
-          this.log(operator, "calc(".concat(newState, ", left, right)"));
-        }
+        (0, _assert.ok)(!isNaN(newState));
+        this.statesUsed.add(newState);
+        this.ops[operator] = newState;
+        this.log(operator, "calc(".concat(newState, ", left, right)"));
+      }
 
-        this.replace(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [(0, _gen.Literal)(this.ops[operator]), { ...object.left
-        }, { ...object.right
-        }]));
-      };
-    }
+      this.replace(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [(0, _gen.Literal)(this.ops[operator]), object.left, object.right]));
+    };
   }
 
 }