Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

still run other deobfuscator even if no string array is found #160

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

still run other deobfuscator even if no string array is found #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions packages/webcrack/src/deobfuscate/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,39 @@ export default {
? `String Array: ${stringArray.originalName}, length ${stringArray.length}`
: 'String Array: no',
);
if (!stringArray) return;

const rotator = findArrayRotator(stringArray);
logger(`String Array Rotate: ${rotator ? 'yes' : 'no'}`);
if (stringArray) {
const rotator = findArrayRotator(stringArray);
logger(`String Array Rotate: ${rotator ? 'yes' : 'no'}`);

const decoders = findDecoders(stringArray);
logger(
`String Array Decoders: ${decoders
.map((d) => d.originalName)
.join(', ')}`,
);
const decoders = findDecoders(stringArray);
logger(
`String Array Decoders: ${decoders
.map((d) => d.originalName)
.join(', ')}`,
);

state.changes += applyTransform(ast, inlineObjectProps).changes;
state.changes += applyTransform(ast, inlineObjectProps).changes;

for (const decoder of decoders) {
state.changes += applyTransform(
ast,
inlineDecoderWrappers,
decoder.path,
).changes;
}
for (const decoder of decoders) {
state.changes += applyTransform(
ast,
inlineDecoderWrappers,
decoder.path,
).changes;
}

const vm = new VMDecoder(sandbox, stringArray, decoders, rotator);
state.changes += (
await applyTransformAsync(ast, inlineDecodedStrings, { vm })
).changes;
const vm = new VMDecoder(sandbox, stringArray, decoders, rotator);
state.changes += (
await applyTransformAsync(ast, inlineDecodedStrings, { vm })
).changes;

if (decoders.length > 0) {
stringArray.path.remove();
rotator?.remove();
decoders.forEach((decoder) => decoder.path.remove());
state.changes += 2 + decoders.length;
if (decoders.length > 0) {
stringArray.path.remove();
rotator?.remove();
decoders.forEach((decoder) => decoder.path.remove());
state.changes += 2 + decoders.length;
}
}

state.changes += applyTransforms(
Expand Down