fix: debug-protection outdated scope (#87)

j4k0xb · Jun 4, 2024 · e86c35d · e86c35d
1 parent 67918d7
commit e86c35d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/webcrack/src/ast-utils/transform.ts b/packages/webcrack/src/ast-utils/transform.ts
@@ -24,7 +24,6 @@ export function applyTransform<TOptions>(
   ast: Node,
   transform: Transform<TOptions>,
   options?: TOptions,
-  noScopeOverride?: boolean,
 ): TransformState {
   logger(`${transform.name}: started`);
   const state: TransformState = { changes: 0 };
@@ -34,7 +33,7 @@ export function applyTransform<TOptions>(
     const visitor = transform.visitor(
       options,
     ) as TraverseOptions<TransformState>;
-    visitor.noScope = noScopeOverride || !transform.scope;
+    visitor.noScope = !transform.scope;
     traverse(ast, visitor, undefined, state);
   }
 

diff --git a/packages/webcrack/src/deobfuscate/debug-protection.ts b/packages/webcrack/src/deobfuscate/debug-protection.ts
@@ -90,9 +90,9 @@ export default {
 
         const binding = path.scope.getBinding(
           debugProtectionFunctionName.current!,
-        )!;
+        );
 
-        binding.referencePaths.forEach((ref) => {
+        binding?.referencePaths.forEach((ref) => {
           if (intervalCall.match(ref.parent)) {
             findParent(ref, iife)?.remove();
           }

diff --git a/packages/webcrack/src/index.ts b/packages/webcrack/src/index.ts
@@ -137,14 +137,14 @@ export async function webcrack(
 
   const stages = [
     () => {
-      return (ast = parse(code, {
+      ast = parse(code, {
         sourceType: 'unambiguous',
         allowReturnOutsideFunction: true,
         plugins: ['jsx'],
-      }));
+      });
     },
     () => {
-      return applyTransforms(
+      applyTransforms(
         ast,
         [blockStatements, sequence, splitVariableDeclarations, varFunctions],
         { name: 'prepare' },
@@ -160,14 +160,13 @@ export async function webcrack(
     // TODO: Also merge unminify visitor (breaks selfDefending/debugProtection atm)
     (options.deobfuscate || options.jsx) &&
       (() => {
-        return applyTransforms(
+        applyTransforms(
           ast,
           [
             // Have to run this after unminify to properly detect it
             options.deobfuscate ? [selfDefending, debugProtection] : [],
             options.jsx ? [jsx, jsxNew] : [],
           ].flat(),
-          { noScope: true },
         );
       }),
     options.deobfuscate && (() => applyTransform(ast, mergeObjectAssignments)),