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
16 changes: 13 additions & 3 deletions crates/untwist-deobfuscate/src/control_flow_object/assembled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ fn this_free_function(value: &Expression<'_>) -> bool {
struct AliasUses<'s, 'k, 'p> {
scoping: &'s Scoping,
objects: FxHashMap<SymbolId, &'k Assembled<'p>>,
growing_bases: FxHashSet<SymbolId>,
dead: &'k FxHashSet<usize>,
builtins_unpatched: bool,
depth: usize,
Expand Down Expand Up @@ -297,9 +298,12 @@ impl<'a> VisitJs<'a> for AliasUses<'_, '_, '_> {
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);
let growing = resolved(id, self.scoping)
.is_some_and(|symbol| self.growing_bases.contains(&symbol));
let safe = !growing
&& member_parts(callee)
.and_then(|(_, name)| assembled.property(&name))
.is_some_and(this_free_function);
if !safe {
self.risky.insert(address_of(id));
}
Expand Down Expand Up @@ -354,6 +358,11 @@ where
for (_, assembled) in &used {
objects.entry(assembled.base).or_insert(*assembled);
}
let growing_bases = used
.iter()
.filter(|(_, assembled)| assembled.adds_keys())
.map(|(_, assembled)| assembled.base)
.collect();
let mut roots: Vec<&FunctionBody<'_>> = Vec::new();
let mut whole = false;
for assembled in objects.values() {
Expand All @@ -366,6 +375,7 @@ where
let mut uses = AliasUses {
scoping,
objects,
growing_bases,
dead,
builtins_unpatched,
depth: 0,
Expand Down
11 changes: 11 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1a.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
function setter() { this.kkkkk = "y"; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = { kkkkk: d.abcde, fffff: setter };
m.ggggg = m.fffff();
m.fffff = function () { return 1; };
const v = m;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
13 changes: 13 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1b.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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;
m.ggggg = m.fffff();
m.fffff = function () { return 1; };
const v = m;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
13 changes: 13 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1c.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
function setter() { this.kkkkk = "y"; return 1; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
m.ggggg = (function () { return m["fffff"](); })();
m.fffff = function () { return 1; };
const v = m;
if (d.fghij(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-r7-h1d.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function setter() { this.kkkkk = "y"; return 1; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
m.ggggg = m.fffff();
const v = m;
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
15 changes: 15 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
function setter() { this.kkkkk = "y"; return 1; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
function call() { return m.fffff(); }
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
m.ggggg = call();
m.fffff = function () { return 1; };
const v = m;
call();
if (v.kkkkk === "x") { console.log("then"); } else { d.abcde = "changed"; }
console.log(d.abcde);
}
f();
13 changes: 13 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1f.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
function setter() { this.kkkkk = "y"; return 1; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
m.ggggg = m.fffff?.();
m.fffff = function () { return 1; };
const v = m;
v.kkkkk === "x" ? console.log("then") : (d.abcde = "changed");
console.log(d.abcde);
}
f();
13 changes: 13 additions & 0 deletions crates/untwist/tests/data/obfuscator_sweep/cfo-r7-h1g.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
function setter() { this.kkkkk = "y"; return 1; }
function f() {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = setter;
m.ggggg = m.fffff();
m.fffff = function () { return this; };
const v = m;
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-r7-h1h.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function f(g) {
const d = { abcde: "x", fghij: function (a, b) { return a === b; } };
const m = {};
m.kkkkk = d.abcde;
m.fffff = g;
m.ggggg = m.fffff();
m.fffff = function () { return 1; };
const v = m;
if (v.kkkkk === "x") { console.log("then"); } else { console.log("else"); d.abcde = "changed"; }
console.log(d.abcde, v.kkkkk);
}
f(function () { delete this.kkkkk; });
29 changes: 29 additions & 0 deletions crates/untwist/tests/obfuscator_sweep_rows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,35 @@ fn an_assembled_base_read_or_an_optional_method_call_prints_like_node_in_both_la
);
}

const ASSEMBLED_BASE_CALLS_DURING_THE_RUN: &[&str] = &[
"cfo-r7-h1a",
"cfo-r7-h1b",
"cfo-r7-h1c",
"cfo-r7-h1d",
"cfo-r7-h1e",
"cfo-r7-h1f",
"cfo-r7-h1g",
"cfo-r7-h1h",
];

#[test]
fn a_method_call_on_an_assembled_base_prints_like_node_in_both_lanes() {
prints_like_node_in(
ASSEMBLED_BASE_CALLS_DURING_THE_RUN,
&[default_code, unsafe_lane],
);
}

#[test]
fn a_method_call_on_an_assembled_base_keeps_the_branch_in_both_lanes() {
for label in ASSEMBLED_BASE_CALLS_DURING_THE_RUN {
let source = read(&format!("{label}.js"));
for output in [default_code(&source), unsafe_lane(&source)] {
assert!(output.contains("\"changed\""), "{label}:\n{output}");
}
}
}

const BLOCK_ROTATOR_ESCAPES: &[&str] = &[
"block-rotator-return",
"block-rotator-loop-var",
Expand Down