From da4e61c6e97db131be1cfe62dbd263e705402eb7 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 14:17:48 +0100 Subject: [PATCH] fix: wrap a block rotator only when its loop and leading initialisers are closed block_rotator now requires closed_loop on the rotator, as called_plan and checksum_plan do, and refuses leading declarations whose initialisers hold await, yield, super, return or labelled jumps. A return, a loop var or function read after the block, a jump to an outer label, await/yield or super no longer change meaning when the block is moved into a function. --- .../src/string_array/inlined.rs | 4 +- .../src/string_array/minified.rs | 17 +++++++ .../block-rotator-checksum-var.js | 10 ++++ .../obfuscator_sweep/block-rotator-closed.js | 11 +++++ .../block-rotator-for-init-var.js | 10 ++++ .../block-rotator-leading-await.js | 12 +++++ .../block-rotator-leading-function.js | 11 +++++ .../block-rotator-leading-super.js | 13 ++++++ .../block-rotator-leading-yield.js | 14 ++++++ .../block-rotator-loop-await.js | 11 +++++ .../block-rotator-loop-function.js | 10 ++++ .../block-rotator-loop-super.js | 12 +++++ .../block-rotator-loop-var.js | 10 ++++ .../block-rotator-loop-yield.js | 9 ++++ .../block-rotator-outer-break.js | 14 ++++++ .../block-rotator-outer-continue.js | 13 ++++++ .../obfuscator_sweep/block-rotator-return.js | 10 ++++ crates/untwist/tests/obfuscator_sweep_rows.rs | 46 +++++++++++++++++++ 18 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-checksum-var.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-closed.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-for-init-var.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-function.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-super.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-yield.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-await.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-function.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-super.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-var.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-yield.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-break.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-continue.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-return.js diff --git a/crates/untwist-deobfuscate/src/string_array/inlined.rs b/crates/untwist-deobfuscate/src/string_array/inlined.rs index 85bb36f11..acb28d8ab 100644 --- a/crates/untwist-deobfuscate/src/string_array/inlined.rs +++ b/crates/untwist-deobfuscate/src/string_array/inlined.rs @@ -14,7 +14,7 @@ use super::checksum::parsed_statement; use super::cookie_wrap::wrap_inlined_cookie; use super::for_init::hoist_decoded_arrays; use super::legacy::{incremented, is_countdown, literal_arithmetic, predecrements, pushes_shifted}; -use super::minified::closed_loop; +use super::minified::{closed_initialisers, closed_loop}; use super::single_use::declare_single_use_decoder; use super::{array_declaration, array_literal}; use crate::array_rotator::is_infinite_rotator_loop; @@ -623,7 +623,9 @@ fn block_rotator(stmt: &Statement<'_>, scoping: &Scoping) -> bool { }; if before.is_empty() || !is_infinite_rotator_loop(rotator) + || !closed_loop(rotator, scoping) || !before.iter().all(block_declaration) + || !before.iter().all(closed_initialisers) || reads_own_frame(stmt) || stmt.span().start >= SYNTHETIC_BASE { diff --git a/crates/untwist-deobfuscate/src/string_array/minified.rs b/crates/untwist-deobfuscate/src/string_array/minified.rs index 2a7fe5e93..e0840c32f 100644 --- a/crates/untwist-deobfuscate/src/string_array/minified.rs +++ b/crates/untwist-deobfuscate/src/string_array/minified.rs @@ -218,6 +218,23 @@ fn closed_loop_with(stmt: &Statement<'_>, scoping: &Scoping, dynamic: &DynamicSc !escapes.found && (!uses.found || minified_rotators_trusted()) && sealed } +pub(super) fn closed_initialisers(stmt: &Statement<'_>) -> bool { + let Statement::VariableDeclaration(declaration) = stmt else { + return true; + }; + declaration + .declarations + .iter() + .filter_map(|declarator| declarator.init.as_ref()) + .all(|init| { + let mut escapes = LoopEscapes::default(); + escapes.visit_expression(init); + let mut uses = LexicalUses::default(); + uses.visit_expression(init); + !escapes.found && (!uses.found || minified_rotators_trusted()) + }) +} + fn sequence_head<'k, 'a>(expr: Option<&'k Expression<'a>>) -> Option<&'k Expression<'a>> { match expr.map(Expression::without_parentheses) { Some(Expression::SequenceExpression(sequence)) => sequence.expressions.first(), diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-checksum-var.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-checksum-var.js new file mode 100644 index 000000000..43ac3b351 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-checksum-var.js @@ -0,0 +1,10 @@ +function outer(arr) { + { + var al = arr(); + while (true) { + try { var h = parseInt(al[0]); if (h === 3) break; else al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "checksum " + h; +} +console.log(outer(function () { return ["1", "2", "3"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-closed.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-closed.js new file mode 100644 index 000000000..1eef26e98 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-closed.js @@ -0,0 +1,11 @@ +function outer(arr) { + var al; + { + var w = arr(); + for (;;) { + try { if (w[0] === "c") break; w.push(w.shift()); } catch (e) { w.push(w.shift()); } + } + } + return "fell through"; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-for-init-var.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-for-init-var.js new file mode 100644 index 000000000..3960e6871 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-for-init-var.js @@ -0,0 +1,10 @@ +function outer(arr) { + { + var al = arr(); + for (var i = 0; ; i++) { + try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "turns " + i; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await.js new file mode 100644 index 000000000..28d369405 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await.js @@ -0,0 +1,12 @@ +async function outer(arr, p) { + var res = []; + { + var al = arr(); + var z = await p; + for (;;) { + try { res.push(z); if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "r " + res; +} +outer(function () { return ["a", "b", "c"]; }, Promise.resolve("p")).then(console.log); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-function.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-function.js new file mode 100644 index 000000000..9796fdef6 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-function.js @@ -0,0 +1,11 @@ +function outer(arr) { + { + var al = arr(); + function g() { return "g!"; } + for (;;) { + try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "fn " + typeof g; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-super.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-super.js new file mode 100644 index 000000000..75a0f2819 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-super.js @@ -0,0 +1,13 @@ +class A { tag() { return "A"; } } +class B extends A { m(arr) { + var res = []; + { + var al = arr(); + var t = super.tag(); + for (;;) { + try { res.push(t); if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "r " + res; +} } +console.log(new B().m(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-yield.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-yield.js new file mode 100644 index 000000000..7362fe2d3 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-yield.js @@ -0,0 +1,14 @@ +function* outer(arr) { + var res = []; + { + var al = arr(); + var z = yield "y"; + for (;;) { + try { res.push(z); if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "r " + res; +} +var it = outer(function () { return ["a", "b", "c"]; }); +it.next(); +console.log(it.next("v").value); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-await.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-await.js new file mode 100644 index 000000000..5298705ee --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-await.js @@ -0,0 +1,11 @@ +async function outer(arr) { + var seen = []; + { + var al = arr(); + for (;;) { + try { seen.push(await al[0]); if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "seen " + seen; +} +outer(function () { return ["a", "b", "c"]; }).then(console.log); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-function.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-function.js new file mode 100644 index 000000000..bcfbd00f8 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-function.js @@ -0,0 +1,10 @@ +function outer(arr) { + { + var al = arr(); + for (;;) { + try { function g() { return "g!"; } if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "fn " + typeof g; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-super.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-super.js new file mode 100644 index 000000000..bdb053d3f --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-super.js @@ -0,0 +1,12 @@ +class A { tag() { return "A"; } } +class B extends A { m(arr) { + var res = []; + { + var al = arr(); + for (;;) { + try { res.push(super.tag()); if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "r " + res; +} } +console.log(new B().m(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-var.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-var.js new file mode 100644 index 000000000..fedcb5535 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-var.js @@ -0,0 +1,10 @@ +function outer(arr) { + { + var al = arr(); + for (;;) { + try { var n = al[0]; if (n === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + return "last " + n; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-yield.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-yield.js new file mode 100644 index 000000000..c14ff2db7 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-loop-yield.js @@ -0,0 +1,9 @@ +function* outer(arr) { + { + var al = arr(); + for (;;) { + try { yield al[0]; if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } +} +console.log([...outer(function () { return ["a", "b", "c"]; })].join()); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-break.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-break.js new file mode 100644 index 000000000..b24835a65 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-break.js @@ -0,0 +1,14 @@ +function outer(arr) { + var turns = 0; + L: for (var k = 0; k < 3; k++) { + { + var al = arr(); + for (;;) { + try { turns++; if (al[0] === "c") break L; al.push(al.shift()); } catch (e) { al.push(al.shift()); } + } + } + turns += 100; + } + return "turns " + turns; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-continue.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-continue.js new file mode 100644 index 000000000..d31db7cc0 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-outer-continue.js @@ -0,0 +1,13 @@ +function outer(arr) { + var turns = 0; + L: for (var k = 0; k < 3; k++) { + { + var al = arr(); + for (;;) { + try { turns++; if (al[0] === "c") break; al.push(al.shift()); if (turns > 1) continue L; } catch (e) { al.push(al.shift()); } + } + } + } + return "turns " + turns; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-return.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-return.js new file mode 100644 index 000000000..ad7e23806 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-return.js @@ -0,0 +1,10 @@ +function outer(arr) { + { + var al = arr(); + for (;;) { + try { if (al[0] === "c") return "returned"; al.push(al.shift()); if (al.length > 9) break; } catch (e) { al.push(al.shift()); } + } + } + return "fell through"; +} +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/obfuscator_sweep_rows.rs b/crates/untwist/tests/obfuscator_sweep_rows.rs index ae8e90838..16b6711a0 100644 --- a/crates/untwist/tests/obfuscator_sweep_rows.rs +++ b/crates/untwist/tests/obfuscator_sweep_rows.rs @@ -704,3 +704,49 @@ fn an_assembled_base_read_or_an_optional_method_call_prints_like_node_in_both_la &[default_code, unsafe_lane], ); } + +const BLOCK_ROTATOR_ESCAPES: &[&str] = &[ + "block-rotator-return", + "block-rotator-loop-var", + "block-rotator-checksum-var", + "block-rotator-for-init-var", + "block-rotator-loop-function", + "block-rotator-leading-function", + "block-rotator-outer-continue", + "block-rotator-outer-break", + "block-rotator-loop-await", + "block-rotator-loop-yield", + "block-rotator-loop-super", + "block-rotator-leading-await", + "block-rotator-leading-yield", + "block-rotator-leading-super", + "block-rotator-closed", +]; + +#[test] +fn a_block_rotator_whose_loop_or_declarations_reach_outside_the_block_prints_like_node_in_both_lanes( +) { + prints_like_node_in(BLOCK_ROTATOR_ESCAPES, &[default_code, unsafe_lane]); +} + +#[test] +fn a_block_rotator_whose_loop_or_declarations_reach_outside_the_block_is_not_wrapped_in_both_lanes() +{ + for label in BLOCK_ROTATOR_ESCAPES + .iter() + .filter(|label| **label != "block-rotator-closed") + { + let source = read(&format!("{label}.js")); + for output in [default_code(&source), unsafe_lane(&source)] { + assert!(!output.contains("})();"), "{label}:\n{output}"); + } + } +} + +#[test] +fn a_closed_block_rotator_is_still_wrapped_in_both_lanes() { + let source = read("block-rotator-closed.js"); + for output in [default_code(&source), unsafe_lane(&source)] { + assert!(output.contains("(function () {\n const w"), "{output}"); + } +}