js-confuser 1.5.1 → 1.5.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# `1.5.3`
+Shuffle fix
+
+- Fixed [#48](https://github.com/MichaelXF/js-confuser/issues/48)
+- - Shuffle was re-assigning `const` variables, fixed in this version.
+
+# `1.5.2`
+Mini fixes
+
+- Fixed [#41](https://github.com/MichaelXF/js-confuser/issues/41)
+- - Obfuscator mishandled switch statements with a `default` case
+
+- Fixed [#43](https://github.com/MichaelXF/js-confuser/issues/43)
+- - Obfuscator mishandled variable destructuring in for-loops
+
 # `1.5.1`
 Object Extraction Fix
 

package/dist/transforms/controlFlowFlattening/switchCaseObfuscation.js

@@ -28,7 +28,7 @@ class SwitchCaseObfuscation extends _transform.default {
   }
 
   match(object, parents) {
-    return object.type == "SwitchStatement" && !object.cases.find(x => !(x.test.type == "Literal" && typeof x.test.value === "number" && Math.abs(x.test.value) < 100000));
+    return object.type == "SwitchStatement" && !object.cases.find(x => !(x.test && typeof x.test === "object" && x.test.type == "Literal" && typeof x.test.value === "number" && Math.abs(x.test.value) < 100000));
   }
 
   transform(object, parents) {

package/dist/transforms/minify.js

@@ -457,7 +457,7 @@ class Minify extends _transform.default {
       } // check for redundant patterns
 
 
-      if (object.id.type == "ArrayPattern" && object.init.type == "ArrayExpression") {
+      if (object.id.type == "ArrayPattern" && object.init && typeof object.init === "object" && object.init.type == "ArrayExpression") {
         if (object.id.elements.length == 1 && object.init.elements.length == 1) {
           object.id = object.id.elements[0];
           object.init = object.init.elements[0];

package/dist/transforms/shuffle.js

@@ -126,7 +126,7 @@ class Shuffle extends _transform.default {
         if (varDeclarator.type == "VariableDeclarator") {
           var varDec = parents[2];
 
-          if (varDec.type == "VariableDeclaration") {
+          if (varDec.type == "VariableDeclaration" && varDec.kind !== "const") {
             var body = parents[3];
 
             if (varDec.declarations.length == 1 && Array.isArray(body) && varDeclarator.id.type === "Identifier" && varDeclarator.init === object) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",

package/src/transforms/controlFlowFlattening/switchCaseObfuscation.ts

@@ -27,6 +27,8 @@ export default class SwitchCaseObfuscation extends Transform {
       !object.cases.find(
         (x) =>
           !(
+            x.test &&
+            typeof x.test === "object" &&
             x.test.type == "Literal" &&
             typeof x.test.value === "number" &&
             Math.abs(x.test.value) < 100_000

package/src/transforms/minify.ts

@@ -595,6 +595,8 @@ export default class Minify extends Transform {
       // check for redundant patterns
       if (
         object.id.type == "ArrayPattern" &&
+        object.init &&
+        typeof object.init === "object" &&
         object.init.type == "ArrayExpression"
       ) {
         if (

package/src/transforms/shuffle.ts

@@ -149,7 +149,7 @@ export default class Shuffle extends Transform {
         var varDeclarator = parents[0];
         if (varDeclarator.type == "VariableDeclarator") {
           var varDec = parents[2];
-          if (varDec.type == "VariableDeclaration") {
+          if (varDec.type == "VariableDeclaration" && varDec.kind !== "const") {
             var body = parents[3];
             if (
               varDec.declarations.length == 1 &&

package/test/transforms/controlFlowFlattening/switchCaseObfuscation.test.ts

@@ -74,3 +74,47 @@ it("should not obfuscate switch statements with complex discriminants (SwitchCas
 
   eval(output);
 });
+
+// https://github.com/MichaelXF/js-confuser/issues/41
+it("Not apply to switch statements with default cases", async ()=>{
+
+    var code = `
+    var array = [];
+
+    function runOnce(stateParam){
+      switch(stateParam){
+        case 1: array.push(1, 2, 3); break;
+        case 2: array.push(4, 5, 6); break;
+        case 3: array.push(7, 8, 9); break;
+        default: array.push(10); break;
+      }
+    }
+
+    runOnce(1);
+    runOnce(2);
+    runOnce(3);
+    runOnce(-1); // default case
+
+    input(array);
+  `;
+
+  var output = await JsConfuser(code, {
+    target: "browser",
+    controlFlowFlattening: true,
+  });
+
+  expect(
+    output.includes("case 1:") &&
+      output.includes("case 2:") &&
+      output.includes("case 3:") 
+  ).toStrictEqual(true);
+
+  function input(array) {
+    expect(array).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+  }
+
+  eval(output);
+
+
+
+});

package/test/transforms/minify.test.ts

@@ -299,3 +299,25 @@ test("Variant #15: Removing implied 'return'", async () => {
 
   expect(output2).toContain("return");
 });
+
+// https://github.com/MichaelXF/js-confuser/issues/43
+test("Variant #16: Handle deconstructuring in for loop", async ()=>{
+// Valid
+var output = await JsConfuser(
+    `
+    for(const [a] of [[1]]) {
+        input(a);
+    }
+  `,
+    { target: "node", minify: true }
+  );
+
+  var value;
+  function input(valueIn){
+    value = valueIn;
+  }
+
+  eval(output);
+
+  expect(value).toStrictEqual(1);
+})

package/test/transforms/shuffle.test.ts

@@ -89,3 +89,29 @@ it("should shuffle arrays based on hash and unshuffle incorrect if changed", asy
 
   expect(different).toStrictEqual(true);
 });
+
+// https://github.com/MichaelXF/js-confuser/issues/48
+it("Should properly apply to const variables", async () => {
+    var code = `
+      const TEST_ARRAY = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  
+      input(TEST_ARRAY);
+    `;
+
+    var output = await JsConfuser(code, {
+      target: "browser",
+      shuffle: true,
+    });
+
+    expect(output).toContain("TEST_ARRAY=function");
+    expect(output).not.toContain("1,2,3,4,5,6,7,8,9");
+  
+    var value;
+    function input(valueIn) {
+      value = valueIn;
+    }
+  
+    eval(output);
+  
+    expect(value).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+  });