Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
65 changes: 37 additions & 28 deletions crates/untwist-deobfuscate/src/control_flow_object/assembled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ impl<'p> Assembled<'p> {
self.base
}

pub(super) fn adds_keys(&self) -> bool {
!self.added.is_empty()
}

pub(super) fn reaches_its_receiver(&self) -> bool {
let mut scan = ThisFree { found: false };
scan.visit_object_expression(self.object);
Expand Down Expand Up @@ -284,36 +288,41 @@ impl<'a> VisitJs<'a> for AliasUses<'_, '_, '_> {
self.live = true;
}
}
match it {
Expression::CallExpression(call) => {
let callee = call.callee.without_parentheses();
if let Some((id, assembled)) = self.receiver(callee) {
let safe = member_parts(callee)
.and_then(|(_, name)| assembled.property(&name))
.is_some_and(this_free_function);
if !safe {
self.risky.insert(address_of(id));
}
}
}
Expression::TaggedTemplateExpression(tagged) => {
if let Some((id, _)) = self.receiver(tagged.tag.without_parentheses()) {
self.risky.insert(address_of(id));
}
}
Expression::UnaryExpression(unary) if unary.operator == UnaryOperator::Delete => {
if let Some((id, _)) = self.receiver(unary.argument.without_parentheses()) {
self.risky.insert(address_of(id));
}
}
_ => {}
}
walk_js::walk_expression(self, it);
if dead {
self.depth -= 1;
}
}

fn visit_call_expression(&mut self, it: &CallExpression<'a>) {
let callee = it.callee.without_parentheses();
if let Some((id, assembled)) = self.receiver(callee) {
let safe = member_parts(callee)
.and_then(|(_, name)| assembled.property(&name))
.is_some_and(this_free_function);
if !safe {
self.risky.insert(address_of(id));
}
}
walk_js::walk_call_expression(self, it);
}

fn visit_tagged_template_expression(&mut self, it: &TaggedTemplateExpression<'a>) {
if let Some((id, _)) = self.receiver(it.tag.without_parentheses()) {
self.risky.insert(address_of(id));
}
walk_js::walk_tagged_template_expression(self, it);
}

fn visit_unary_expression(&mut self, it: &UnaryExpression<'a>) {
if it.operator == UnaryOperator::Delete {
if let Some((id, _)) = self.receiver(it.argument.without_parentheses()) {
self.risky.insert(address_of(id));
}
}
walk_js::walk_unary_expression(self, it);
}

fn visit_identifier_reference(&mut self, it: &IdentifierReference<'a>) {
if self.depth > 0 || self.live {
return;
Expand All @@ -340,10 +349,10 @@ pub(super) fn aliases_mutated_only_in_dead<'k, 'p>(
where
'p: 'k,
{
let mut objects = FxHashMap::default();
for (alias, assembled) in used {
objects.insert(alias, assembled);
objects.insert(assembled.base, assembled);
let used: Vec<(SymbolId, &'k Assembled<'p>)> = used.collect();
let mut objects: FxHashMap<SymbolId, &'k Assembled<'p>> = used.iter().copied().collect();
for (_, assembled) in &used {
objects.entry(assembled.base).or_insert(*assembled);
}
let mut roots: Vec<&FunctionBody<'_>> = Vec::new();
let mut whole = false;
Expand Down
15 changes: 12 additions & 3 deletions crates/untwist-deobfuscate/src/control_flow_object/dead.rs
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ pub(super) struct Branches<'p> {
objects: FxHashMap<SymbolId, &'p ObjectExpression<'p>>,
assembled: FxHashMap<SymbolId, Assembled<'p>>,
optimistic: FxHashMap<SymbolId, Assembled<'p>>,
rebuilt: FxHashSet<SymbolId>,
hazard: bool,
program: Option<&'p Program<'p>>,
readonly: RefCell<FxHashMap<SymbolId, Option<ObjectUses>>>,
Expand Down Expand Up @@ -563,9 +564,13 @@ impl<'p> VisitJs<'p> for BranchScan<'_, 'p> {
let Some(root) = self.bodies.last().copied() else {
break;
};
let found = assembled_alias(&it[start..], self.scoping)
.filter(|(_, assembled)| !assembled.reaches_its_receiver());
if let Some((alias, assembled)) = found {
let Some((alias, assembled)) = assembled_alias(&it[start..], self.scoping) else {
continue;
};
if assembled.adds_keys() {
self.found.rebuilt.insert(assembled.base());
}
if !assembled.reaches_its_receiver() {
self.found
.assembled
.insert(alias, assembled.within(Some(root)));
Expand Down Expand Up @@ -624,6 +629,10 @@ pub(super) fn predicate_branches<'p>(program: &'p Program<'p>, scoping: &Scoping
!writes.may_write(*alias) && !writes.may_write(assembled.base())
});
}
for base in std::mem::take(&mut scan.found.rebuilt) {
scan.found.objects.remove(&base);
scan.found.optimistic.remove(&base);
}
scan.found.program = Some(program);
scan.found.hazard = untwist_core::semantic::scope_hazard(scoping).is_some();
scan.found
Expand Down
9 changes: 9 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-a6.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
if (m.kkkkk === "x") { console.log("live"); } else { d.abcde = "changed"; }
console.log(d.abcde, d.fghij(1, 1), v.kkkkk);
}
f();
8 changes: 8 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-a7.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
if (m.kkkkk === "x") { console.log("live"); } else { d.abcde = "changed"; }
console.log(d.abcde, d.fghij(1, 1));
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-computed.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m["kkkkk"] = "y";
const v = m;
if (m["kkkkk"] === "x") { console.log("then"); } else { d.abcde = "changed"; }
if (v["kkkkk"] === "y") { console.log("alias"); }
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-cond.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
console.log(v.kkkkk === "y" ? "alias" : "no");
console.log(m.kkkkk === "x" ? "then" : (d.abcde = "changed"));
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-fn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.fghij };
m.kkkkk = function (a, b) { return a !== b; };
const v = m;
if (m.kkkkk(1, 1)) { console.log("then"); } else { d.abcde = "changed"; }
if (v.kkkkk(1, 2)) { console.log("alias"); }
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-halfrun.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.ggggg = (function () { if (m.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; } return 1; })();
m.kkkkk = "y";
const v = m;
if (v.kkkkk === "y") { console.log("alias"); }
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-halfrun2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: "y" };
m.kkkkk = d.abcde;
m.ggggg = (function () { if (m.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; } return 1; })();
const v = m;
if (v.kkkkk === "x") { console.log("alias"); }
console.log(d.abcde);
}
f();
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
if (v.kkkkk === "y") { console.log("alias"); }
if (m.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
11 changes: 11 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1-twoalias.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
const u = m;
if (u.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
if (v.kkkkk === "y") { console.log("alias"); }
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1a.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
if (m.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
if (v.kkkkk === "y") { console.log("alias"); }
console.log(d.abcde);
}
f();
10 changes: 10 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1b.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { bbbbb: d.abcde };
m.bbbbb = "y";
m.aaaaa = m.bbbbb;
const v = m;
if (v.aaaaa === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
9 changes: 9 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f1c.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde };
m.kkkkk = "y";
const v = m;
if (d.fghij(m.kkkkk, v.kkkkk)) { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-del.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
delete v.kkkkk;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-delp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
delete (v.kkkkk);
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-opt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
v.fffff?.();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-optc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
v["fffff"]?.();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
v.fffff?.call(v);
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-optn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
(v.fffff?.());
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-optp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
(v.fffff)?.();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-optt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; return {}; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
v.fffff?.().x;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-paren.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
(v.fffff)();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-plain.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
v.fffff();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
12 changes: 12 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r6-f2-asm-ptag.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
const v = m;
(v.fffff)`t`;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
Loading