Merge pull request #73 from MichaelXF/dev

1.5.8

Author: MichaelXF

CHANGELOG.md

@@ -1,3 +1,17 @@
+# `1.5.8`
+Several fixes
+
+- Fixed [#46](https://github.com/MichaelXF/js-confuser/issues/46)
+- - Updated the validation on `lock` options
+
+- Fixed [#68](https://github.com/MichaelXF/js-confuser/issues/68)
+- - Name Recycling fixed to not break certain function declarations
+
+- Fixed [#69](https://github.com/MichaelXF/js-confuser/issues/69), [#70](https://github.com/MichaelXF/js-confuser/issues/70) and [#71](https://github.com/MichaelXF/js-confuser/issues/71)
+- - Import statements to be properly handled
+
+- Slight improvements to String Concealing
+
 # `1.5.7`
 Countermeasures function fixes
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",
@@ -22,7 +22,7 @@
   "author": "MichaelXF",
   "license": "MIT",
   "dependencies": {
-    "acorn": "^8.7.0",
+    "acorn": "^8.8.2",
     "escodegen": "^2.0.0"
   },
   "devDependencies": {

package.json

@@ -770,7 +770,10 @@ export function validateOptions(options: ObfuscateOptions) {
 
   if (options.lock) {
     // Validate browser-lock option
-    if (typeof options.lock.browserLock !== "undefined") {
+    if (
+      options.lock.browserLock &&
+      typeof options.lock.browserLock !== "undefined"
+    ) {
       ok(
         Array.isArray(options.lock.browserLock),
         "browserLock must be an array"
@@ -783,20 +786,23 @@ export function validateOptions(options: ObfuscateOptions) {
       );
     }
     // Validate os-lock option
-    if (typeof options.lock.osLock !== "undefined") {
+    if (options.lock.osLock && typeof options.lock.osLock !== "undefined") {
       ok(Array.isArray(options.lock.osLock), "osLock must be an array");
       ok(
         !options.lock.osLock.find((osName) => !validOses.has(osName)),
         'Invalid OS name. Allowed: "windows", "linux", "osx", "ios", "android"'
       );
     }
     // Validate domain-lock option
-    if (typeof options.lock.domainLock !== "undefined") {
+    if (
+      options.lock.domainLock &&
+      typeof options.lock.domainLock !== "undefined"
+    ) {
       ok(Array.isArray(options.lock.domainLock), "domainLock must be an array");
     }
 
     // Validate context option
-    if (typeof options.lock.context !== "undefined") {
+    if (options.lock.context && typeof options.lock.context !== "undefined") {
       ok(Array.isArray(options.lock.context), "context must be an array");
     }
 

src/options.ts

@@ -47,6 +47,7 @@ import ChoiceFlowObfuscation from "./choiceFlowObfuscation";
 import ControlFlowObfuscation from "./controlFlowObfuscation";
 import ExpressionObfuscation from "./expressionObfuscation";
 import SwitchCaseObfuscation from "./switchCaseObfuscation";
+import { isModuleSource } from "../string/stringConcealing";
 
 var flattenStructures = new Set([
   "IfStatement",
@@ -226,6 +227,13 @@ export default class ControlFlowFlattening extends Transform {
         fnNames.delete(illegal);
       });
 
+      var importDeclarations = [];
+      for (var stmt of body) {
+        if (stmt.type === "ImportDeclaration") {
+          importDeclarations.push(stmt);
+        }
+      }
+
       var fraction = 0.9;
       if (body.length > 20) {
         fraction /= Math.max(1.2, body.length - 18);
@@ -285,6 +293,7 @@ export default class ControlFlowFlattening extends Transform {
             if (
               o.type == "Literal" &&
               typeof o.value == "string" &&
+              !isModuleSource(o, p) &&
               !o.regex &&
               Math.random() / (Object.keys(stringBank).length / 2 + 1) > 0.5
             ) {
@@ -318,7 +327,10 @@ export default class ControlFlowFlattening extends Transform {
         };
 
         body.forEach((stmt, i) => {
-          if (functionDeclarations.has(stmt)) {
+          if (
+            functionDeclarations.has(stmt) ||
+            stmt.type === "ImportDeclaration"
+          ) {
             return;
           }
 
@@ -1045,6 +1057,9 @@ export default class ControlFlowFlattening extends Transform {
       var discriminant = Template(`${stateVars.join("+")}`).single().expression;
 
       body.length = 0;
+      for (var importDeclaration of importDeclarations) {
+        body.push(importDeclaration);
+      }
 
       if (functionDeclarations.size) {
         functionDeclarations.forEach((x) => {

src/transforms/controlFlowFlattening/controlFlowFlattening.ts

@@ -97,8 +97,6 @@ export default class NameRecycling extends Transform {
                 return;
               }
 
-              lastReferenceMap.set(o.name, i);
-
               var comparingContext = info.spec.isDefined
                 ? getDefiningContext(o, p)
                 : getReferencingContexts(o, p).find((x) => isVarContext(x));
@@ -114,7 +112,18 @@ export default class NameRecycling extends Transform {
                 }
 
                 if (info.spec.isDefined) {
-                  if (defined.has(o.name) || getBlock(o, p) !== object) {
+                  // Function Declarations can be used before they're defined, if so, don't change this
+                  if (
+                    info.isFunctionDeclaration &&
+                    lastReferenceMap.has(o.name)
+                  ) {
+                    illegal.add(o.name);
+                  }
+                  if (
+                    defined.has(o.name) ||
+                    getBlock(o, p) !== object ||
+                    info.isImportSpecifier
+                  ) {
                     illegal.add(o.name);
                   }
                   defined.add(o.name);
@@ -123,6 +132,8 @@ export default class NameRecycling extends Transform {
                   referencedHere.add(o.name);
                 }
               }
+
+              lastReferenceMap.set(o.name, i);
             };
           }
         });

src/transforms/identifier/nameRecycling.ts

@@ -10,6 +10,7 @@ import {
   isContext,
   isLexContext,
   getDefiningContext,
+  clone,
 } from "../../util/insert";
 import { isValidIdentifier } from "../../util/compare";
 import Transform from "../transform";
@@ -185,6 +186,24 @@ export default class RenameVariables extends Transform {
             return;
           }
 
+          // Strange behavior where the `local` and `imported` objects are the same
+          if (info.isImportSpecifier) {
+            var importSpecifierIndex = p.findIndex(
+              (x) => x.type === "ImportSpecifier"
+            );
+            if (
+              importSpecifierIndex != -1 &&
+              p[importSpecifierIndex].imported ===
+                (p[importSpecifierIndex - 1] || o) &&
+              p[importSpecifierIndex].imported &&
+              p[importSpecifierIndex].imported.type === "Identifier"
+            ) {
+              p[importSpecifierIndex].imported = clone(
+                p[importSpecifierIndex - 1] || o
+              );
+            }
+          }
+
           // console.log(o.name, "->", newName);
           o.name = newName;
           o.$renamed = true;

src/transforms/identifier/renameVariables.ts

@@ -62,7 +62,7 @@ export default class AntiDebug extends Transform {
         IfStatement(
           Identifier(isDevName),
           this.options.lock.countermeasures
-            ? this.lock.getCounterMeasuresCode()
+            ? this.lock.getCounterMeasuresCode(tree.body, [tree])
             : [
                 WhileStatement(Identifier(isDevName), [
                   ExpressionStatement(