From 4c4801ac37176a0efdba961e77950993ff749e07 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 23:26:46 +0100 Subject: [PATCH] fix: keep a block function that Annex B copies to an outer binding out of the string-array wraps --- .../src/string_array/cookie_wrap.rs | 5 +- .../src/string_array/inlined.rs | 63 +++++++++++++++---- .../block-rotator-annexb-checksum.js | 2 + .../block-rotator-annexb-closure.js | 2 + .../block-rotator-annexb-expression.js | 2 + .../block-rotator-annexb-for-var.js | 2 + .../block-rotator-annexb-function.js | 2 + .../block-rotator-annexb-second.js | 2 + .../block-rotator-annexb-top-level.js | 3 + .../block-rotator-annexb-var.js | 2 + .../block-rotator-leading-await-using.js | 2 + .../block-rotator-leading-using.js | 2 + .../obfuscator_sweep/called-rotator-annexb.js | 12 ++++ crates/untwist/tests/obfuscator_sweep_rows.rs | 31 +++++++++ 14 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-checksum.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-closure.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-expression.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-for-var.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-function.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-second.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-top-level.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-var.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await-using.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-using.js create mode 100644 crates/untwist/tests/data/obfuscator_sweep/called-rotator-annexb.js diff --git a/crates/untwist-deobfuscate/src/string_array/cookie_wrap.rs b/crates/untwist-deobfuscate/src/string_array/cookie_wrap.rs index 51d5b48ea..fc3c1a48a 100644 --- a/crates/untwist-deobfuscate/src/string_array/cookie_wrap.rs +++ b/crates/untwist-deobfuscate/src/string_array/cookie_wrap.rs @@ -13,7 +13,7 @@ use untwist_core::pass::Cx; use super::array_declaration; use super::checksum::parsed_statement; use super::cookie_minified::countdown_declaration; -use super::inlined::used_only_in; +use super::inlined::{copied_out_of_block, used_only_in}; use super::legacy::is_countdown; use crate::stamp::declaration_symbol; @@ -367,6 +367,9 @@ fn rotator_of( let Statement::FunctionDeclaration(function) = &body[at] else { return None; }; + if copied_out_of_block(function, scoping) { + return None; + } countdown_declaration(&body[at], alias_name)?; let id = function.id.as_ref()?; Some(Rotator { diff --git a/crates/untwist-deobfuscate/src/string_array/inlined.rs b/crates/untwist-deobfuscate/src/string_array/inlined.rs index acb28d8ab..3a2feaed7 100644 --- a/crates/untwist-deobfuscate/src/string_array/inlined.rs +++ b/crates/untwist-deobfuscate/src/string_array/inlined.rs @@ -526,11 +526,45 @@ fn owned_function( let Statement::FunctionDeclaration(function) = stmt else { return false; }; - function - .id - .as_ref() - .and_then(|id| id.symbol_id.get()) - .is_some_and(|symbol| used_only_in(scoping, symbol, moved.iter().map(|i| &body[*i]))) + !copied_out_of_block(function, scoping) + && function + .id + .as_ref() + .and_then(|id| id.symbol_id.get()) + .is_some_and(|symbol| used_only_in(scoping, symbol, moved.iter().map(|i| &body[*i]))) +} + +pub(super) fn copied_out_of_block(function: &Function<'_>, scoping: &Scoping) -> bool { + let Some(id) = function.id.as_ref() else { + return true; + }; + let Some(block) = function + .scope_id + .get() + .and_then(|scope| scoping.scope_parent_id(scope)) + else { + return true; + }; + let flags = scoping.scope_flags(block); + if flags.is_var() || flags.is_strict_mode() { + return false; + } + let own = id.symbol_id.get(); + let name = id.name; + let bound_outside = scoping.scope_ancestors(block).skip(1).any(|scope| { + scoping + .get_binding(scope, name) + .is_some_and(|symbol| Some(symbol) != own) + }); + let global = scoping + .scope_ancestors(block) + .find(|scope| scoping.scope_flags(*scope).is_var()) + .is_none_or(|scope| scope == scoping.root_scope_id()); + bound_outside + || global + || scoping + .root_unresolved_references() + .contains_key(name.as_str()) } fn rewrite_called<'a>(it: &mut AVec<'a, Statement<'a>>, plan: &Plan, cx: &Cx<'a, '_>) -> bool { @@ -554,13 +588,18 @@ fn rewrite_called<'a>(it: &mut AVec<'a, Statement<'a>>, plan: &Plan, cx: &Cx<'a, true } -fn block_declaration(stmt: &Statement<'_>) -> bool { +fn block_declaration(stmt: &Statement<'_>, scoping: &Scoping) -> bool { match stmt { - Statement::FunctionDeclaration(_) => true, - Statement::VariableDeclaration(declaration) => declaration - .declarations - .iter() - .all(|declarator| matches!(declarator.id, BindingPattern::BindingIdentifier(_))), + Statement::FunctionDeclaration(function) => !copied_out_of_block(function, scoping), + Statement::VariableDeclaration(declaration) => { + !matches!( + declaration.kind, + VariableDeclarationKind::Using | VariableDeclarationKind::AwaitUsing + ) && declaration + .declarations + .iter() + .all(|declarator| matches!(declarator.id, BindingPattern::BindingIdentifier(_))) + } _ => false, } } @@ -624,7 +663,7 @@ 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(|stmt| block_declaration(stmt, scoping)) || !before.iter().all(closed_initialisers) || reads_own_frame(stmt) || stmt.span().start >= SYNTHETIC_BASE diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-checksum.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-checksum.js new file mode 100644 index 000000000..b65fe3f62 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-checksum.js @@ -0,0 +1,2 @@ +function outer(arr) { var h = 1; { var al = arr(); function h() { return 2; } while (true) { try { var n = parseInt(al[0]); if (n === 3) break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return typeof h; } +console.log(outer(function () { return ["1", "2", "3"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-closure.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-closure.js new file mode 100644 index 000000000..115488ab4 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-closure.js @@ -0,0 +1,2 @@ +function outer(arr) { var h = 1; var g = function () { return typeof h; }; { function h() { return 2; } var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return g(); } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-expression.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-expression.js new file mode 100644 index 000000000..40f05a266 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-expression.js @@ -0,0 +1,2 @@ +var outer = function (arr) { var h = 1; { function h() { return 2; } const al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return typeof h; }; +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-for-var.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-for-var.js new file mode 100644 index 000000000..7d5694886 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-for-var.js @@ -0,0 +1,2 @@ +function outer(arr) { for (var h = 0; h < 1; h++) { } { function h() { return 2; } var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return typeof h; } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-function.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-function.js new file mode 100644 index 000000000..20a597ed4 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-function.js @@ -0,0 +1,2 @@ +function outer(arr) { function h() { return 1; } { function h() { return 2; } var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return h(); } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-second.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-second.js new file mode 100644 index 000000000..0f1785905 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-second.js @@ -0,0 +1,2 @@ +function outer(arr) { var h = 1; { let al = arr(); function h() { return 2; } for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return typeof h; } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-top-level.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-top-level.js new file mode 100644 index 000000000..45dfb501f --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-top-level.js @@ -0,0 +1,3 @@ +var arr = function () { return ["a", "b", "c"]; }; var h9 = 1; +{ function h9() { return 2; } let al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } +console.log(typeof h9); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-var.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-var.js new file mode 100644 index 000000000..b027e4098 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-annexb-var.js @@ -0,0 +1,2 @@ +function outer(arr) { var h = 1; { function h() { return 2; } var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return typeof h; } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await-using.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await-using.js new file mode 100644 index 000000000..924bcc202 --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-await-using.js @@ -0,0 +1,2 @@ +async function outer(arr) { { await using r = { [Symbol.asyncDispose]: async function () { console.log("disposed"); } }; var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } return "done"; } +outer(function () { return ["a", "b", "c"]; }).then(console.log); diff --git a/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-using.js b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-using.js new file mode 100644 index 000000000..163d8455a --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/block-rotator-leading-using.js @@ -0,0 +1,2 @@ +function outer(arr) { { using r = { [Symbol.dispose]: function () { console.log("disposed"); } }; var al = arr(); for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } } console.log("after"); return "done"; } +console.log(outer(function () { return ["a", "b", "c"]; })); diff --git a/crates/untwist/tests/data/obfuscator_sweep/called-rotator-annexb.js b/crates/untwist/tests/data/obfuscator_sweep/called-rotator-annexb.js new file mode 100644 index 000000000..7ab9dbdbd --- /dev/null +++ b/crates/untwist/tests/data/obfuscator_sweep/called-rotator-annexb.js @@ -0,0 +1,12 @@ +function outer() { + var h = 1; + { + function arr() { var a = ["a", "b", "c"]; arr = function () { return a; }; return arr(); } + var al = arr(); + function h() { return 2; } + for (;;) { try { if (al[0] === "c") break; al.push(al.shift()); } catch (e) { al.push(al.shift()); } } + console.log(arr()[0]); + } + return typeof h; +} +console.log(outer()); diff --git a/crates/untwist/tests/obfuscator_sweep_rows.rs b/crates/untwist/tests/obfuscator_sweep_rows.rs index 83456fcab..470bb585f 100644 --- a/crates/untwist/tests/obfuscator_sweep_rows.rs +++ b/crates/untwist/tests/obfuscator_sweep_rows.rs @@ -741,9 +741,24 @@ const BLOCK_ROTATOR_ESCAPES: &[&str] = &[ "block-rotator-leading-await", "block-rotator-leading-yield", "block-rotator-leading-super", + "block-rotator-annexb-var", + "block-rotator-annexb-function", + "block-rotator-annexb-top-level", + "block-rotator-annexb-second", + "block-rotator-annexb-closure", + "block-rotator-annexb-for-var", + "block-rotator-annexb-expression", + "block-rotator-annexb-checksum", "block-rotator-closed", ]; +const CALLED_ROTATOR_ANNEX_B: &[&str] = &["called-rotator-annexb"]; + +const BLOCK_ROTATOR_USING: &[&str] = &[ + "block-rotator-leading-using", + "block-rotator-leading-await-using", +]; + #[test] fn a_block_rotator_whose_loop_or_declarations_reach_outside_the_block_prints_like_node_in_both_lanes( ) { @@ -764,6 +779,22 @@ fn a_block_rotator_whose_loop_or_declarations_reach_outside_the_block_is_not_wra } } +#[test] +fn a_called_rotator_beside_a_block_function_copied_to_an_outer_binding_prints_like_node_in_both_lanes( +) { + prints_like_node_in(CALLED_ROTATOR_ANNEX_B, &[default_code, unsafe_lane]); +} + +#[test] +fn a_block_rotator_led_by_a_using_declaration_is_not_wrapped_in_both_lanes() { + for label in BLOCK_ROTATOR_USING { + 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");