From 7a118f358f752cbb4f1a9e022a2fe8f92eb8102e Mon Sep 17 00:00:00 2001 From: sorte1 Date: Sat, 21 Nov 2026 00:32:40 +0100 Subject: [PATCH 1/2] fix: refuse numeric keys for host-filled and Annex B bindings; keep self-defending when RegExp statics may be read --- README.md | 4 +- crates/untwist-core/src/semantic/builtins.rs | 4 +- .../src/semantic/builtins/scan.rs | 27 +++ .../src/semantic/builtins/scan/numeric.rs | 55 ++++-- .../src/semantic/builtins/scan/parts.rs | 1 + .../src/semantic/builtins/scan/statics.rs | 70 +++++++ .../tests/builtins_numeric_keys.rs | 14 ++ .../untwist-deobfuscate/src/self_defending.rs | 5 +- .../untwist/tests/data/r7nx12/a1-arguments.js | 1 + .../untwist/tests/data/r7nx12/a10-number.js | 1 + .../tests/data/r7nx12/a1b-arguments-fn.js | 1 + .../tests/data/r7nx12/a1c-arguments-led.js | 1 + crates/untwist/tests/data/r7nx12/a2-annexb.js | 1 + .../tests/data/r7nx12/a2b-annexb-if.js | 1 + .../tests/data/r7nx12/a2c-annexb-noVar.js | 1 + .../untwist/tests/data/r7nx12/a5-pattern.js | 1 + .../untwist/tests/data/r7nx12/a6-switchfn.js | 1 + .../untwist/tests/data/r7nx12/a8-param-fn.js | 1 + crates/untwist/tests/data/r7nx12/a9-proto.js | 1 + crates/untwist/tests/data/r7nx12/c-static.js | 1 + crates/untwist/tests/data/r7nx12/c-unk.js | 1 + .../tests/data/r7nx12/e1-h1-evaltext.js | 3 + .../tests/data/r7nx12/e1-h2-evaltext.js | 3 + .../tests/data/r7nx12/e1-hc-evaltext.js | 3 + crates/untwist/tests/data/r7nx12/f1a.js | 1 + crates/untwist/tests/data/r7nx12/f1b.js | 3 + crates/untwist/tests/data/r7nx12/f1c.js | 9 + crates/untwist/tests/data/r7nx12/f1d.js | 4 + crates/untwist/tests/data/r7nx12/f2a.js | 1 + crates/untwist/tests/data/r7nx12/f2b.js | 3 + crates/untwist/tests/data/r7nx12/f2c.js | 1 + crates/untwist/tests/data/r7nx12/f2d.js | 1 + crates/untwist/tests/data/r7nx12/f3a.js | 1 + crates/untwist/tests/data/r7nx12/f3b.js | 1 + crates/untwist/tests/data/r7nx12/f3c.js | 1 + .../untwist/tests/data/r7nx12/g30-exports.js | 4 + .../tests/data/r7nx12/g31-top-arguments.js | 4 + .../untwist/tests/data/r7nx12/g32-module.js | 4 + crates/untwist/tests/data/r7nx12/h29-label.js | 1 + .../untwist/tests/data/r7nx12/h30-var-fn.js | 1 + crates/untwist/tests/data/r7nx12/h31-if-fn.js | 1 + .../tests/data/r7nx12/h32-nested-block.js | 1 + .../tests/data/r7nx12/h34-args-block.js | 1 + .../untwist/tests/data/r7nx12/h35-args-for.js | 1 + .../tests/data/r7nx12/h39-args-join.js | 1 + .../untwist/tests/data/r7nx12/h40-args-led.js | 1 + .../tests/data/r7nx12/h41-annexb-led.js | 1 + .../tests/data/r7nx12/h42-annexb-inc.js | 1 + .../tests/data/r7nx12/h43-annexb-arrow.js | 1 + .../tests/data/r7nx12/h44-annexb-strict.js | 1 + .../data/r7nx12/h46-annexb-inblock-read.js | 1 + .../untwist/tests/data/r7nx12/h47-catch-fn.js | 1 + .../untwist/tests/data/r7nx12/l1-lastMatch.js | 1 + .../untwist/tests/data/r7nx12/l6-num-key.js | 1 + crates/untwist/tests/data/r7nx12/m1-unk.js | 1 + .../tests/data/r7nx12/m10-lastMatch-cat.js | 1 + crates/untwist/tests/data/r7nx12/m13-inc.js | 1 + .../untwist/tests/data/r7nx12/m15-reflect.js | 1 + crates/untwist/tests/data/r7nx12/m19-ctor.js | 1 + crates/untwist/tests/data/r7nx12/m20-opt.js | 1 + .../tests/data/r7nx12/m24-global-cat.js | 1 + .../tests/data/r7nx12/m25-const-key.js | 1 + .../untwist/tests/data/r7nx12/m26-var-key.js | 1 + .../untwist/tests/data/r7nx12/m27-name-cat.js | 1 + .../tests/data/r7nx12/m28-name-cat-call.js | 1 + .../untwist/tests/data/r7nx12/m4-var-cat.js | 1 + .../untwist/tests/data/r7nx12/m5-let-cat.js | 1 + crates/untwist/tests/data/r7nx12/m8-call.js | 1 + crates/untwist/tests/data/r7nx12/m9-tpl.js | 1 + .../tests/data/r7nx12/n12-ctor-proto-read.js | 1 + .../untwist/tests/data/r7nx12/s1-h1-spread.js | 9 + .../untwist/tests/data/r7nx12/s1-hc-spread.js | 9 + crates/untwist/tests/review_r7_nx12_rows.rs | 178 ++++++++++++++++++ 73 files changed, 447 insertions(+), 21 deletions(-) create mode 100644 crates/untwist-core/src/semantic/builtins/scan/statics.rs create mode 100644 crates/untwist/tests/data/r7nx12/a1-arguments.js create mode 100644 crates/untwist/tests/data/r7nx12/a10-number.js create mode 100644 crates/untwist/tests/data/r7nx12/a1b-arguments-fn.js create mode 100644 crates/untwist/tests/data/r7nx12/a1c-arguments-led.js create mode 100644 crates/untwist/tests/data/r7nx12/a2-annexb.js create mode 100644 crates/untwist/tests/data/r7nx12/a2b-annexb-if.js create mode 100644 crates/untwist/tests/data/r7nx12/a2c-annexb-noVar.js create mode 100644 crates/untwist/tests/data/r7nx12/a5-pattern.js create mode 100644 crates/untwist/tests/data/r7nx12/a6-switchfn.js create mode 100644 crates/untwist/tests/data/r7nx12/a8-param-fn.js create mode 100644 crates/untwist/tests/data/r7nx12/a9-proto.js create mode 100644 crates/untwist/tests/data/r7nx12/c-static.js create mode 100644 crates/untwist/tests/data/r7nx12/c-unk.js create mode 100644 crates/untwist/tests/data/r7nx12/e1-h1-evaltext.js create mode 100644 crates/untwist/tests/data/r7nx12/e1-h2-evaltext.js create mode 100644 crates/untwist/tests/data/r7nx12/e1-hc-evaltext.js create mode 100644 crates/untwist/tests/data/r7nx12/f1a.js create mode 100644 crates/untwist/tests/data/r7nx12/f1b.js create mode 100644 crates/untwist/tests/data/r7nx12/f1c.js create mode 100644 crates/untwist/tests/data/r7nx12/f1d.js create mode 100644 crates/untwist/tests/data/r7nx12/f2a.js create mode 100644 crates/untwist/tests/data/r7nx12/f2b.js create mode 100644 crates/untwist/tests/data/r7nx12/f2c.js create mode 100644 crates/untwist/tests/data/r7nx12/f2d.js create mode 100644 crates/untwist/tests/data/r7nx12/f3a.js create mode 100644 crates/untwist/tests/data/r7nx12/f3b.js create mode 100644 crates/untwist/tests/data/r7nx12/f3c.js create mode 100644 crates/untwist/tests/data/r7nx12/g30-exports.js create mode 100644 crates/untwist/tests/data/r7nx12/g31-top-arguments.js create mode 100644 crates/untwist/tests/data/r7nx12/g32-module.js create mode 100644 crates/untwist/tests/data/r7nx12/h29-label.js create mode 100644 crates/untwist/tests/data/r7nx12/h30-var-fn.js create mode 100644 crates/untwist/tests/data/r7nx12/h31-if-fn.js create mode 100644 crates/untwist/tests/data/r7nx12/h32-nested-block.js create mode 100644 crates/untwist/tests/data/r7nx12/h34-args-block.js create mode 100644 crates/untwist/tests/data/r7nx12/h35-args-for.js create mode 100644 crates/untwist/tests/data/r7nx12/h39-args-join.js create mode 100644 crates/untwist/tests/data/r7nx12/h40-args-led.js create mode 100644 crates/untwist/tests/data/r7nx12/h41-annexb-led.js create mode 100644 crates/untwist/tests/data/r7nx12/h42-annexb-inc.js create mode 100644 crates/untwist/tests/data/r7nx12/h43-annexb-arrow.js create mode 100644 crates/untwist/tests/data/r7nx12/h44-annexb-strict.js create mode 100644 crates/untwist/tests/data/r7nx12/h46-annexb-inblock-read.js create mode 100644 crates/untwist/tests/data/r7nx12/h47-catch-fn.js create mode 100644 crates/untwist/tests/data/r7nx12/l1-lastMatch.js create mode 100644 crates/untwist/tests/data/r7nx12/l6-num-key.js create mode 100644 crates/untwist/tests/data/r7nx12/m1-unk.js create mode 100644 crates/untwist/tests/data/r7nx12/m10-lastMatch-cat.js create mode 100644 crates/untwist/tests/data/r7nx12/m13-inc.js create mode 100644 crates/untwist/tests/data/r7nx12/m15-reflect.js create mode 100644 crates/untwist/tests/data/r7nx12/m19-ctor.js create mode 100644 crates/untwist/tests/data/r7nx12/m20-opt.js create mode 100644 crates/untwist/tests/data/r7nx12/m24-global-cat.js create mode 100644 crates/untwist/tests/data/r7nx12/m25-const-key.js create mode 100644 crates/untwist/tests/data/r7nx12/m26-var-key.js create mode 100644 crates/untwist/tests/data/r7nx12/m27-name-cat.js create mode 100644 crates/untwist/tests/data/r7nx12/m28-name-cat-call.js create mode 100644 crates/untwist/tests/data/r7nx12/m4-var-cat.js create mode 100644 crates/untwist/tests/data/r7nx12/m5-let-cat.js create mode 100644 crates/untwist/tests/data/r7nx12/m8-call.js create mode 100644 crates/untwist/tests/data/r7nx12/m9-tpl.js create mode 100644 crates/untwist/tests/data/r7nx12/n12-ctor-proto-read.js create mode 100644 crates/untwist/tests/data/r7nx12/s1-h1-spread.js create mode 100644 crates/untwist/tests/data/r7nx12/s1-hc-spread.js create mode 100644 crates/untwist/tests/review_r7_nx12_rows.rs diff --git a/README.md b/README.md index 2def9792..6c9168fe 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ module objects or loader through `process` taken as a value (`var p = process; p computed member of `process`, or requests the `module` or `process` built-in is not split, but an alias is not followed, since most bundles pass `process` around. And no value the program tests is `document.all`, so `x != null ? x : y` becomes `x ?? y`: the two -differ only for that object, which compares loosely equal to `null` without being nullish. Nor does any code read a function's caller through `.caller`, `arguments.callee.caller` or a stack frame (`Error.prepareStackTrace` call sites with `getFunction()` or `getFunctionName()`) to observe which function called it (the non-standard `Function.prototype.caller`; strict code cannot): inlining a control-flow object's call proxy removes the proxy's frame, so such a read would see the function that held the call instead of the proxy. The default lane also assumes obfuscator.io's self-defending check would pass on the input: removing the trap may make an input that would trap (for example one reformatted after obfuscation) run normally. It does not assume an obfuscator.io domain lock would pass: the lock reads the host's `document` and `location` and enumerates the global object's names, so the default lane keeps it, the protections registered with it and the machinery it can see, and says so (`a domain lock was found …`); `--unsafe` assumes the lock passes and removes it. The default lane keeps a protection that may still run, one it cannot read or prove inert (a self-defending callback is inert only when the built-in scan proves that nothing in the program can replace a built-in member the callback calls), and when that is a block registered through a call controller or a debug-protection timer it keeps every block registered that way and every debug-protection timer with it, including another layer's console silencing, because removing one layer's silencing and keeping another's changes what the program prints, and removing the silencing and keeping a timer, or the reverse, changes what it prints or whether it keeps running. Untwist also assumes no debugger or inspector session changes the program's values while it +differ only for that object, which compares loosely equal to `null` without being nullish. Nor does any code read a function's caller through `.caller`, `arguments.callee.caller` or a stack frame (`Error.prepareStackTrace` call sites with `getFunction()` or `getFunctionName()`) to observe which function called it (the non-standard `Function.prototype.caller`; strict code cannot): inlining a control-flow object's call proxy removes the proxy's frame, so such a read would see the function that held the call instead of the proxy. The default lane also assumes obfuscator.io's self-defending check would pass on the input: removing the trap may make an input that would trap (for example one reformatted after obfuscation) run normally. It does not assume an obfuscator.io domain lock would pass: the lock reads the host's `document` and `location` and enumerates the global object's names, so the default lane keeps it, the protections registered with it and the machinery it can see, and says so (`a domain lock was found …`); `--unsafe` assumes the lock passes and removes it. The default lane keeps a protection that may still run, one it cannot read or prove inert (a self-defending callback is inert only when the built-in scan proves that nothing in the program can replace a built-in member the callback calls or read the RegExp legacy statics its searches change), and when that is a block registered through a call controller or a debug-protection timer it keeps every block registered that way and every debug-protection timer with it, including another layer's console silencing, because removing one layer's silencing and keeping another's changes what the program prints, and removing the silencing and keeping a timer, or the reverse, changes what it prints or whether it keeps running. Untwist also assumes no debugger or inspector session changes the program's values while it runs; every lane and every proof rests on this. [`docs/known-divergences/deobfuscate.md`](docs/known-divergences/deobfuscate.md) lists every premise. @@ -267,7 +267,7 @@ or runs code text through any runner, `(0, eval)`, overwrites a decoder alias, a decoder wrapper or a constant used as a decoder argument through Annex B hoisting, and no direct `eval` redeclares one in its own scope (`var d = dec; { function d() {} } d(1)`, `var d = dec; if (1) function d() {} d(1)` and -`var d = dec; eval("function d() {}"); d(1)` are each decoded as a call of `dec`). A few passes that rest on +`var d = dec; eval("function d() {}"); d(1)` are each decoded as a call of `dec`). No code reads the RegExp legacy statics (`RegExp.$1`, `lastMatch`, `input`, ...) after a removed self-defending callback's regexp searches would have changed them; the default lane keeps the block when the program may read them. A few passes that rest on heuristics are allowed to run. These are `template-literals` and JSX reconstruction (`jsx`, `jsx-new`). `dead-code`, which deletes branches behind constant comparisons, runs in both lanes. `fold-pure-calls` also folds calls to a pure helper that is passed around as a value or that the diff --git a/crates/untwist-core/src/semantic/builtins.rs b/crates/untwist-core/src/semantic/builtins.rs index 5f416d14..f478feb8 100644 --- a/crates/untwist-core/src/semantic/builtins.rs +++ b/crates/untwist-core/src/semantic/builtins.rs @@ -5,7 +5,9 @@ use crate::semantic::has_module_syntax; mod scan; -pub use scan::{intact, scan, scan_outside, scan_with_unknown_keys_plain}; +pub use scan::{ + intact, scan, scan_outside, scan_outside_with_regexp_statics, scan_with_unknown_keys_plain, +}; use oxc_semantic::Scoping; diff --git a/crates/untwist-core/src/semantic/builtins/scan.rs b/crates/untwist-core/src/semantic/builtins/scan.rs index 1f298de7..3962e9a4 100644 --- a/crates/untwist-core/src/semantic/builtins/scan.rs +++ b/crates/untwist-core/src/semantic/builtins/scan.rs @@ -19,6 +19,7 @@ mod modules; mod numeric; mod parts; mod reach; +mod statics; mod targets; mod windows; @@ -200,6 +201,7 @@ struct Scan<'s> { writes_only: bool, unknown_keys_plain: bool, first_only: bool, + statics: bool, skipped: Option<&'s FxHashSet>, module: bool, frames: Vec, @@ -284,9 +286,31 @@ pub fn scan_outside( module: bool, reliance: &Reliance, skipped: &FxHashSet, +) -> Builtins { + outside(program, scoping, module, reliance, skipped, false) +} + +pub fn scan_outside_with_regexp_statics( + program: &Program<'_>, + scoping: &Scoping, + module: bool, + reliance: &Reliance, + skipped: &FxHashSet, +) -> Builtins { + outside(program, scoping, module, reliance, skipped, true) +} + +fn outside( + program: &Program<'_>, + scoping: &Scoping, + module: bool, + reliance: &Reliance, + skipped: &FxHashSet, + statics: bool, ) -> Builtins { let mut scan = Scan::new(program, scoping, module, reliance); scan.skipped = Some(skipped); + scan.statics = statics; scan.visit_program(program); scan.settle_window_flows(); scan.verdict @@ -320,6 +344,7 @@ impl<'s> Scan<'s> { writes_only: false, unknown_keys_plain: false, first_only: false, + statics: false, skipped: None, module, frames: vec![Frame::of_program(program, module)], @@ -938,6 +963,7 @@ impl<'a> VisitJs<'a> for Scan<'_> { fn visit_static_member_expression(&mut self, it: &StaticMemberExpression<'a>) { let key = Key::Name(it.property.name.as_str()); + self.judge_statics(&it.object, key); if self.names_a_loader(key) { self.not_allowed(); } @@ -948,6 +974,7 @@ impl<'a> VisitJs<'a> for Scan<'_> { fn visit_computed_member_expression(&mut self, it: &ComputedMemberExpression<'a>) { let key = self.sharpen(key_of(&it.expression)); + self.judge_statics(&it.object, key); if self.names_a_loader(key) { self.not_allowed(); } diff --git a/crates/untwist-core/src/semantic/builtins/scan/numeric.rs b/crates/untwist-core/src/semantic/builtins/scan/numeric.rs index 1f084b49..e517a19f 100644 --- a/crates/untwist-core/src/semantic/builtins/scan/numeric.rs +++ b/crates/untwist-core/src/semantic/builtins/scan/numeric.rs @@ -9,7 +9,8 @@ use rustc_hash::{FxHashMap, FxHashSet}; use super::reach::{key_of, Key}; use super::GLOBAL_OBJECTS; -use crate::semantic::is_foreign_global; +use crate::host_globals::{is_host_global, is_host_global_property}; +use crate::semantic::{is_foreign_global, AnnexBWrites}; pub(super) type NumericBindings = FxHashSet; @@ -139,6 +140,7 @@ const MAX_PASSES: usize = 8; struct Collect<'s> { scoping: &'s Scoping, + annex_b: &'s AnnexBWrites, numeric: &'s NumericBindings, led: Option<&'s NumericBindings>, module: bool, @@ -296,8 +298,15 @@ impl Collect<'_> { } } + fn host_provided(&self, symbol: SymbolId) -> bool { + let name = self.scoping.symbol_name(symbol); + name == ARGUMENTS + || (self.scoping.symbol_scope_id(symbol) == self.scoping.root_scope_id() + && (is_host_global(name) || is_host_global_property(name))) + } + fn holds(&self, symbol: SymbolId) -> bool { - if self.direct_eval { + if self.direct_eval || self.annex_b.may_write(symbol) || self.host_provided(symbol) { return false; } let flags = self.scoping.symbol_flags(symbol); @@ -415,14 +424,26 @@ impl<'a> VisitJs<'a> for Collect<'_> { } } -fn narrowed( - program: &Program<'_>, - scoping: &Scoping, +struct Sources<'s, 'a> { + program: &'s Program<'a>, + scoping: &'s Scoping, + annex_b: &'s AnnexBWrites, module: bool, +} + +fn narrowed( + sources: &Sources<'_, '_>, (numeric, led): (&NumericBindings, Option<&NumericBindings>), ) -> NumericBindings { + let Sources { + program, + scoping, + annex_b, + module, + } = *sources; let mut collect = Collect { scoping, + annex_b, numeric, led, module, @@ -448,17 +469,12 @@ fn narrowed( .collect() } -fn fixpoint( - program: &Program<'_>, - scoping: &Scoping, - module: bool, - numeric: Option<&NumericBindings>, -) -> NumericBindings { - let mut current: NumericBindings = scoping.symbol_ids().collect(); +fn fixpoint(sources: &Sources<'_, '_>, numeric: Option<&NumericBindings>) -> NumericBindings { + let mut current: NumericBindings = sources.scoping.symbol_ids().collect(); for _ in 0..MAX_PASSES { let next = match numeric { - Some(numeric) => narrowed(program, scoping, module, (numeric, Some(¤t))), - None => narrowed(program, scoping, module, (¤t, None)), + Some(numeric) => narrowed(sources, (numeric, Some(¤t))), + None => narrowed(sources, (¤t, None)), }; if next.len() == current.len() { return next; @@ -469,7 +485,14 @@ fn fixpoint( } pub(super) fn key_bindings(program: &Program<'_>, scoping: &Scoping, module: bool) -> KeyBindings { - let numeric = fixpoint(program, scoping, module, None); - let led = fixpoint(program, scoping, module, Some(&numeric)); + let annex_b = AnnexBWrites::of(program, scoping); + let sources = Sources { + program, + scoping, + annex_b: &annex_b, + module, + }; + let numeric = fixpoint(&sources, None); + let led = fixpoint(&sources, Some(&numeric)); KeyBindings { numeric, led } } diff --git a/crates/untwist-core/src/semantic/builtins/scan/parts.rs b/crates/untwist-core/src/semantic/builtins/scan/parts.rs index bcb53a9e..04538727 100644 --- a/crates/untwist-core/src/semantic/builtins/scan/parts.rs +++ b/crates/untwist-core/src/semantic/builtins/scan/parts.rs @@ -9,6 +9,7 @@ impl Scan<'_> { let Some((object, key)) = member_parts(expression) else { return false; }; + self.judge_member_statics(expression); self.visit_unless_root(object); if let Some(key) = key { self.visit_expression(key); diff --git a/crates/untwist-core/src/semantic/builtins/scan/statics.rs b/crates/untwist-core/src/semantic/builtins/scan/statics.rs new file mode 100644 index 00000000..cb08e155 --- /dev/null +++ b/crates/untwist-core/src/semantic/builtins/scan/statics.rs @@ -0,0 +1,70 @@ +use oxc_ast::ast::*; + +use super::reach::{member_of, Key}; +use super::Scan; + +const REGEXP: &str = "RegExp"; + +const LEGACY_STATICS: [&str; 21] = [ + "$1", + "$2", + "$3", + "$4", + "$5", + "$6", + "$7", + "$8", + "$9", + "$_", + "$&", + "$+", + "$`", + "$'", + "input", + "lastMatch", + "lastParen", + "leftContext", + "rightContext", + "multiline", + "$*", +]; + +impl Scan<'_> { + pub(super) fn judge_statics(&mut self, object: &Expression<'_>, key: Key<'_>) { + if self.statics + && !self.writes_only + && self.may_name_a_static(key) + && self.may_be_regexp(object) + { + self.aliased(); + } + } + + pub(super) fn judge_member_statics(&mut self, expression: &Expression<'_>) { + if let Some((object, key)) = member_of(expression) { + self.judge_statics(object, key); + } + } + + fn may_name_a_static(&self, key: Key<'_>) -> bool { + match self.sharpen(key) { + Key::Name(name) => LEGACY_STATICS.contains(&name), + Key::Other => false, + Key::Unknown(expression) => self + .known_key(expression) + .is_none_or(|name| LEGACY_STATICS.contains(&name.as_str())), + } + } + + fn may_be_regexp(&self, object: &Expression<'_>) -> bool { + let object = object.without_parentheses(); + if self.is_global_object(object) || self.is_maybe_global_this(object) { + return false; + } + match object { + Expression::Identifier(id) => self.global_named(id, &[REGEXP]), + Expression::ThisExpression(_) => false, + other => self.is_root(other), + } + } +} diff --git a/crates/untwist-core/tests/builtins_numeric_keys.rs b/crates/untwist-core/tests/builtins_numeric_keys.rs index 41d93960..1d2a6ef0 100644 --- a/crates/untwist-core/tests/builtins_numeric_keys.rs +++ b/crates/untwist-core/tests/builtins_numeric_keys.rs @@ -22,6 +22,7 @@ fn a_key_proven_numeric_reaches_no_prototype() { "function f(a) { for (let i = 0; i < a.length; i++) g(a[i]); }", "function f(a, n) { let i = n - 1; i *= 2; g(a[i]); }", "function f(a, n) { let i = 0; i += 1; g(a[i + 1]); }", + "function f(a) { var k; g(a[k]); }", "function f(a, n) { g(a[n | 0], a[-n], a[~n], a[!n], a[n++]); }", "function f(p, q) { p = p - 277; var c = d(); return c[p]; }", "function f(a, c) { g(a[c -= 0], a[c = +c]); }", @@ -50,6 +51,19 @@ fn a_key_that_may_be_a_string_still_counts() { "function f(a, s, n) { g(a[s + (n | 0)]); }", "var a = [1]; var i = 0; window.i = k; g(a[i]);", "var a = [1]; var i = 0; this[k] = 1; g(a[i]);", + "function f(a) { var arguments; g(a[arguments]); }", + "function f(a) { { var arguments; } g(a[arguments]); }", + "function f(a) { for (var arguments; ;) return a[arguments]; }", + "function f(a) { g(a[arguments]); var arguments = 0; }", + "var exports; g(a[exports]);", + "var module; g(a[module]);", + "g(a[require]); var require = 0;", + "function f(a) { var k; { function k() {} } g(a[k]); }", + "function f(a) { var k = 0; if (1) function k() {} g(a[k]); }", + "function f(a) { var k = 0; switch (1) { case 1: function k() {} } g(a[k]); }", + "function f(a) { var k; { { function k() {} } } g(a[k + ''] ); }", + "function f(a) { var k; try {} catch (e) { function k() {} } g(a[k]); }", + "var f = (a) => { var k; { function k() {} } g(a[k]); };", ] { assert_ne!(verdict(source), Builtins::Intact, "{source}"); } diff --git a/crates/untwist-deobfuscate/src/self_defending.rs b/crates/untwist-deobfuscate/src/self_defending.rs index b422e60a..6852fdc9 100644 --- a/crates/untwist-deobfuscate/src/self_defending.rs +++ b/crates/untwist-deobfuscate/src/self_defending.rs @@ -16,7 +16,7 @@ use untwist_core::ast_util::matcher::{anonymous_function, call_parts, iife}; use untwist_core::ast_util::naming_slot::without_unnamed; use untwist_core::ast_util::prop::{identifier_name, member_parts}; use untwist_core::pass::{Cx, Interest, Pass}; -use untwist_core::semantic::builtins::{scan_outside, Builtins, Reliance}; +use untwist_core::semantic::builtins::{scan_outside_with_regexp_statics, Builtins, Reliance}; use untwist_core::semantic::{has_module_syntax, AnnexBWrites}; use crate::bindings::{ @@ -1618,7 +1618,8 @@ fn callback_built_ins_intact<'a>(program: &Program<'a>, spans: &[Span], cx: &Cx< let module = has_module_syntax(program); let mut skipped: FxHashSet = spans.iter().copied().collect(); skipped.extend(crate::debug_protection::planned_removal(program, spans, cx)); - scan_outside(program, cx.scoping(), module, &CALLBACK_RELIES_ON, &skipped) == Builtins::Intact + scan_outside_with_regexp_statics(program, cx.scoping(), module, &CALLBACK_RELIES_ON, &skipped) + == Builtins::Intact } #[derive(Default)] diff --git a/crates/untwist/tests/data/r7nx12/a1-arguments.js b/crates/untwist/tests/data/r7nx12/a1-arguments.js new file mode 100644 index 00000000..4159ad0e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a1-arguments.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return 'constructor'; }; ''[arguments].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a10-number.js b/crates/untwist/tests/data/r7nx12/a10-number.js new file mode 100644 index 00000000..bdc32ece --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a10-number.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return 'constructor'; }; (5)[arguments].prototype.toString = function () { console.log('patched'); return 'x'; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a1b-arguments-fn.js b/crates/untwist/tests/data/r7nx12/a1b-arguments-fn.js new file mode 100644 index 00000000..a955d435 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a1b-arguments-fn.js @@ -0,0 +1 @@ +(function () { try { function g() { var arguments; arguments.toString = function () { return 'constructor'; }; return ''[arguments]; } g().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a1c-arguments-led.js b/crates/untwist/tests/data/r7nx12/a1c-arguments-led.js new file mode 100644 index 00000000..9ca3a59d --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a1c-arguments-led.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return 'constructor'; }; var k = arguments + ''; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a2-annexb.js b/crates/untwist/tests/data/r7nx12/a2-annexb.js new file mode 100644 index 00000000..7562096c --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a2-annexb.js @@ -0,0 +1 @@ +(function () { try { var k; { function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a2b-annexb-if.js b/crates/untwist/tests/data/r7nx12/a2b-annexb-if.js new file mode 100644 index 00000000..951731c2 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a2b-annexb-if.js @@ -0,0 +1 @@ +(function () { try { var k = 0; if (true) { function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a2c-annexb-noVar.js b/crates/untwist/tests/data/r7nx12/a2c-annexb-noVar.js new file mode 100644 index 00000000..c7578e6f --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a2c-annexb-noVar.js @@ -0,0 +1 @@ +(function () { try { { function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a5-pattern.js b/crates/untwist/tests/data/r7nx12/a5-pattern.js new file mode 100644 index 00000000..067dd15b --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a5-pattern.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return 'constructor'; }; var { [arguments]: C } = ''; C.prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a6-switchfn.js b/crates/untwist/tests/data/r7nx12/a6-switchfn.js new file mode 100644 index 00000000..202f184f --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a6-switchfn.js @@ -0,0 +1 @@ +(function () { try { var k = 0; switch (1) { case 1: function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a8-param-fn.js b/crates/untwist/tests/data/r7nx12/a8-param-fn.js new file mode 100644 index 00000000..2423242e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a8-param-fn.js @@ -0,0 +1 @@ +(function () { try { function f(p) { p = p - 0; { function p() {} } p.toString = function () { return 'constructor'; }; return ''[p]; } f(0).prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/a9-proto.js b/crates/untwist/tests/data/r7nx12/a9-proto.js new file mode 100644 index 00000000..17391637 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/a9-proto.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return '__proto__'; }; ''[arguments].search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/c-static.js b/crates/untwist/tests/data/r7nx12/c-static.js new file mode 100644 index 00000000..aa7a568e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/c-static.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp.$1 === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/c-unk.js b/crates/untwist/tests/data/r7nx12/c-unk.js new file mode 100644 index 00000000..0b42f72a --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/c-unk.js @@ -0,0 +1 @@ +(function () { try { var k = ['constructor'][0]; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/e1-h1-evaltext.js b/crates/untwist/tests/data/r7nx12/e1-h1-evaltext.js new file mode 100644 index 00000000..5de0a545 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/e1-h1-evaltext.js @@ -0,0 +1,3 @@ +function hole(v) { var arguments; arguments.toString = function () { return 'constructor'; }; return v[arguments]; } +hole([]).prototype.join = function () { return 'X'; }; +function f() { eval("console.log('or" + [] + "ig')"); } f(); diff --git a/crates/untwist/tests/data/r7nx12/e1-h2-evaltext.js b/crates/untwist/tests/data/r7nx12/e1-h2-evaltext.js new file mode 100644 index 00000000..cc4f201e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/e1-h2-evaltext.js @@ -0,0 +1,3 @@ +function hole(v) { var k; { function k() {} } k.toString = function () { return 'constructor'; }; return v[k]; } +hole([]).prototype.join = function () { return 'X'; }; +function f() { eval("console.log('or" + [] + "ig')"); } f(); diff --git a/crates/untwist/tests/data/r7nx12/e1-hc-evaltext.js b/crates/untwist/tests/data/r7nx12/e1-hc-evaltext.js new file mode 100644 index 00000000..cdae1d1d --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/e1-hc-evaltext.js @@ -0,0 +1,3 @@ +function hole(v) { var k = ['constructor'][0]; return v[k]; } +hole([]).prototype.join = function () { return 'X'; }; +function f() { eval("console.log('or" + [] + "ig')"); } f(); diff --git a/crates/untwist/tests/data/r7nx12/f1a.js b/crates/untwist/tests/data/r7nx12/f1a.js new file mode 100644 index 00000000..4159ad0e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f1a.js @@ -0,0 +1 @@ +(function () { try { var arguments; arguments.toString = function () { return 'constructor'; }; ''[arguments].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f1b.js b/crates/untwist/tests/data/r7nx12/f1b.js new file mode 100644 index 00000000..5de0a545 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f1b.js @@ -0,0 +1,3 @@ +function hole(v) { var arguments; arguments.toString = function () { return 'constructor'; }; return v[arguments]; } +hole([]).prototype.join = function () { return 'X'; }; +function f() { eval("console.log('or" + [] + "ig')"); } f(); diff --git a/crates/untwist/tests/data/r7nx12/f1c.js b/crates/untwist/tests/data/r7nx12/f1c.js new file mode 100644 index 00000000..9212e483 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f1c.js @@ -0,0 +1,9 @@ +function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } +function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); } +function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } +function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } } +function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); } +function hole(v) { var arguments; arguments.toString = function () { return 'constructor'; }; return v[arguments]; } +hole([]).isArray = function () { console.log('patched'); return false; }; +console.log(_toConsumableArray([1, 2]), !0); diff --git a/crates/untwist/tests/data/r7nx12/f1d.js b/crates/untwist/tests/data/r7nx12/f1d.js new file mode 100644 index 00000000..26689692 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f1d.js @@ -0,0 +1,4 @@ +var exports; exports.toString = function () { return 'constructor'; }; ''[exports].prototype.search = function () { console.log('patched'); return 0; }; +var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); +var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); +console.log('after'); diff --git a/crates/untwist/tests/data/r7nx12/f2a.js b/crates/untwist/tests/data/r7nx12/f2a.js new file mode 100644 index 00000000..7562096c --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f2a.js @@ -0,0 +1 @@ +(function () { try { var k; { function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f2b.js b/crates/untwist/tests/data/r7nx12/f2b.js new file mode 100644 index 00000000..cc4f201e --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f2b.js @@ -0,0 +1,3 @@ +function hole(v) { var k; { function k() {} } k.toString = function () { return 'constructor'; }; return v[k]; } +hole([]).prototype.join = function () { return 'X'; }; +function f() { eval("console.log('or" + [] + "ig')"); } f(); diff --git a/crates/untwist/tests/data/r7nx12/f2c.js b/crates/untwist/tests/data/r7nx12/f2c.js new file mode 100644 index 00000000..6b6edc51 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f2c.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; if (true) function k() {} k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f2d.js b/crates/untwist/tests/data/r7nx12/f2d.js new file mode 100644 index 00000000..202f184f --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f2d.js @@ -0,0 +1 @@ +(function () { try { var k = 0; switch (1) { case 1: function k() {} } k.toString = function () { return 'constructor'; }; ''[k].prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f3a.js b/crates/untwist/tests/data/r7nx12/f3a.js new file mode 100644 index 00000000..262eb691 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f3a.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = '$1'; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f3b.js b/crates/untwist/tests/data/r7nx12/f3b.js new file mode 100644 index 00000000..69150915 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f3b.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(/x/.constructor.$1 === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/f3c.js b/crates/untwist/tests/data/r7nx12/f3c.js new file mode 100644 index 00000000..010180e4 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/f3c.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var k = ['$1'][0]; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[k] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/g30-exports.js b/crates/untwist/tests/data/r7nx12/g30-exports.js new file mode 100644 index 00000000..26689692 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/g30-exports.js @@ -0,0 +1,4 @@ +var exports; exports.toString = function () { return 'constructor'; }; ''[exports].prototype.search = function () { console.log('patched'); return 0; }; +var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); +var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); +console.log('after'); diff --git a/crates/untwist/tests/data/r7nx12/g31-top-arguments.js b/crates/untwist/tests/data/r7nx12/g31-top-arguments.js new file mode 100644 index 00000000..6a494ab3 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/g31-top-arguments.js @@ -0,0 +1,4 @@ +var arguments; arguments.toString = function () { return 'constructor'; }; ''[arguments].prototype.search = function () { console.log('patched'); return 0; }; +var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); +var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); +console.log('after'); diff --git a/crates/untwist/tests/data/r7nx12/g32-module.js b/crates/untwist/tests/data/r7nx12/g32-module.js new file mode 100644 index 00000000..969009a6 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/g32-module.js @@ -0,0 +1,4 @@ +var module; module.toString = function () { return 'constructor'; }; ''[module].prototype.search = function () { console.log('patched'); return 0; }; +var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); +var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); +console.log('after'); diff --git a/crates/untwist/tests/data/r7nx12/h29-label.js b/crates/untwist/tests/data/r7nx12/h29-label.js new file mode 100644 index 00000000..869872b0 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h29-label.js @@ -0,0 +1 @@ +(function () { try { function h() { var k; foo: function k() {} k.toString = function () { return 'constructor'; }; return ''[k]; } h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h30-var-fn.js b/crates/untwist/tests/data/r7nx12/h30-var-fn.js new file mode 100644 index 00000000..f0d7b888 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h30-var-fn.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k; function k() {} k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h31-if-fn.js b/crates/untwist/tests/data/r7nx12/h31-if-fn.js new file mode 100644 index 00000000..6b6edc51 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h31-if-fn.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; if (true) function k() {} k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h32-nested-block.js b/crates/untwist/tests/data/r7nx12/h32-nested-block.js new file mode 100644 index 00000000..0f98665f --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h32-nested-block.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; { { function k() {} } } k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h34-args-block.js b/crates/untwist/tests/data/r7nx12/h34-args-block.js new file mode 100644 index 00000000..3e76cac5 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h34-args-block.js @@ -0,0 +1 @@ +(function () { try { var h = function () { { var arguments; } arguments.toString = function () { return 'constructor'; }; return ''[arguments]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h35-args-for.js b/crates/untwist/tests/data/r7nx12/h35-args-for.js new file mode 100644 index 00000000..528cd40c --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h35-args-for.js @@ -0,0 +1 @@ +(function () { try { var h = function () { for (var arguments; ;) { break; } arguments.toString = function () { return 'constructor'; }; return ''[arguments]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h39-args-join.js b/crates/untwist/tests/data/r7nx12/h39-args-join.js new file mode 100644 index 00000000..2498d300 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h39-args-join.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var arguments; arguments.toString = [].join; return ''[arguments]; }; h('constructor').prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h40-args-led.js b/crates/untwist/tests/data/r7nx12/h40-args-led.js new file mode 100644 index 00000000..b88fbbc0 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h40-args-led.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var arguments; arguments.toString = [].join; return ''[arguments + '']; }; h('constructor').prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h41-annexb-led.js b/crates/untwist/tests/data/r7nx12/h41-annexb-led.js new file mode 100644 index 00000000..b66390c3 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h41-annexb-led.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k; { function k() {} } k.toString = function () { return 'constructor'; }; var j = k + ''; return ''[j]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h42-annexb-inc.js b/crates/untwist/tests/data/r7nx12/h42-annexb-inc.js new file mode 100644 index 00000000..9234f8e2 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h42-annexb-inc.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; { function k() {} } k.toString = function () { return '__proto__'; }; return ''[k]; }; h().search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h43-annexb-arrow.js b/crates/untwist/tests/data/r7nx12/h43-annexb-arrow.js new file mode 100644 index 00000000..5900aeef --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h43-annexb-arrow.js @@ -0,0 +1 @@ +(function () { try { var h = () => { var k = 0; { function k() {} } k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h44-annexb-strict.js b/crates/untwist/tests/data/r7nx12/h44-annexb-strict.js new file mode 100644 index 00000000..62cf5d5a --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h44-annexb-strict.js @@ -0,0 +1 @@ +(function () { try { var h = function () { 'use strict'; var k = 0; { function k() {} } return ''[k]; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h46-annexb-inblock-read.js b/crates/untwist/tests/data/r7nx12/h46-annexb-inblock-read.js new file mode 100644 index 00000000..d1c9d898 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h46-annexb-inblock-read.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; { function k() {} k.toString = function () { return 'constructor'; }; } return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/h47-catch-fn.js b/crates/untwist/tests/data/r7nx12/h47-catch-fn.js new file mode 100644 index 00000000..c0ffc76d --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/h47-catch-fn.js @@ -0,0 +1 @@ +(function () { try { var h = function () { var k = 0; try { throw 1; } catch (e) { function k() {} } k.toString = function () { return 'constructor'; }; return ''[k]; }; h().prototype.search = function () { console.log('patched'); return 0; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/l1-lastMatch.js b/crates/untwist/tests/data/r7nx12/l1-lastMatch.js new file mode 100644 index 00000000..b38f9f04 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/l1-lastMatch.js @@ -0,0 +1 @@ +(function () { try { 'zz'.search('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp.lastMatch === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/l6-num-key.js b/crates/untwist/tests/data/r7nx12/l6-num-key.js new file mode 100644 index 00000000..d52852e6 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/l6-num-key.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 0; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + (q + 1)] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m1-unk.js b/crates/untwist/tests/data/r7nx12/m1-unk.js new file mode 100644 index 00000000..010180e4 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m1-unk.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var k = ['$1'][0]; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[k] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m10-lastMatch-cat.js b/crates/untwist/tests/data/r7nx12/m10-lastMatch-cat.js new file mode 100644 index 00000000..83c33b8c --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m10-lastMatch-cat.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 'Match'; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['last' + q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m13-inc.js b/crates/untwist/tests/data/r7nx12/m13-inc.js new file mode 100644 index 00000000..5d551270 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m13-inc.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 0; q++; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m15-reflect.js b/crates/untwist/tests/data/r7nx12/m15-reflect.js new file mode 100644 index 00000000..209f8f5a --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m15-reflect.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(Reflect.get(RegExp, '$1') === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m19-ctor.js b/crates/untwist/tests/data/r7nx12/m19-ctor.js new file mode 100644 index 00000000..69150915 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m19-ctor.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(/x/.constructor.$1 === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m20-opt.js b/crates/untwist/tests/data/r7nx12/m20-opt.js new file mode 100644 index 00000000..49eeeafe --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m20-opt.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp?.$1 === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m24-global-cat.js b/crates/untwist/tests/data/r7nx12/m24-global-cat.js new file mode 100644 index 00000000..7ce8ef63 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m24-global-cat.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 1; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(globalThis.RegExp['$' + q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m25-const-key.js b/crates/untwist/tests/data/r7nx12/m25-const-key.js new file mode 100644 index 00000000..37509e64 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m25-const-key.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); const q = '$1'; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m26-var-key.js b/crates/untwist/tests/data/r7nx12/m26-var-key.js new file mode 100644 index 00000000..262eb691 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m26-var-key.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = '$1'; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m27-name-cat.js b/crates/untwist/tests/data/r7nx12/m27-name-cat.js new file mode 100644 index 00000000..c6becd17 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m27-name-cat.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 1; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + (q + 0)] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m28-name-cat-call.js b/crates/untwist/tests/data/r7nx12/m28-name-cat-call.js new file mode 100644 index 00000000..01090d0a --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m28-name-cat-call.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = function () { return 1; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + q()] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m4-var-cat.js b/crates/untwist/tests/data/r7nx12/m4-var-cat.js new file mode 100644 index 00000000..29cba973 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m4-var-cat.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 1; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m5-let-cat.js b/crates/untwist/tests/data/r7nx12/m5-let-cat.js new file mode 100644 index 00000000..7299f11a --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m5-let-cat.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); let q = 1; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp['$' + q] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m8-call.js b/crates/untwist/tests/data/r7nx12/m8-call.js new file mode 100644 index 00000000..e4128d72 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m8-call.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var g = function () { return '$1'; }; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[g()] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/m9-tpl.js b/crates/untwist/tests/data/r7nx12/m9-tpl.js new file mode 100644 index 00000000..45553e2b --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/m9-tpl.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var q = 1; var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(RegExp[`$${q}`] === 'z'); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/n12-ctor-proto-read.js b/crates/untwist/tests/data/r7nx12/n12-ctor-proto-read.js new file mode 100644 index 00000000..444c4b92 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/n12-ctor-proto-read.js @@ -0,0 +1 @@ +(function () { try { /(z)/.test('z'); var c = (function () { var o = true; return function (n, t) { var e = o ? function () { if (t) { var r = t.apply(n, arguments); t = null; return r; } } : function () {}; o = false; return e; }; })(); var s = c(this, function () { return s.toString().search("(((.+)+)+)+$").toString().constructor(s).search("(((.+)+)+)+$"); }); s(); console.log(typeof ''.constructor.prototype.search); console.log('after'); } catch (e) { console.log('threw', e.name); } })(); diff --git a/crates/untwist/tests/data/r7nx12/s1-h1-spread.js b/crates/untwist/tests/data/r7nx12/s1-h1-spread.js new file mode 100644 index 00000000..9212e483 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/s1-h1-spread.js @@ -0,0 +1,9 @@ +function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } +function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); } +function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } +function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } } +function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); } +function hole(v) { var arguments; arguments.toString = function () { return 'constructor'; }; return v[arguments]; } +hole([]).isArray = function () { console.log('patched'); return false; }; +console.log(_toConsumableArray([1, 2]), !0); diff --git a/crates/untwist/tests/data/r7nx12/s1-hc-spread.js b/crates/untwist/tests/data/r7nx12/s1-hc-spread.js new file mode 100644 index 00000000..cc384d86 --- /dev/null +++ b/crates/untwist/tests/data/r7nx12/s1-hc-spread.js @@ -0,0 +1,9 @@ +function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } +function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); } +function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } +function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } } +function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); } +function hole(v) { var k = ['constructor'][0]; return v[k]; } +hole([]).isArray = function () { console.log('patched'); return false; }; +console.log(_toConsumableArray([1, 2]), !0); diff --git a/crates/untwist/tests/review_r7_nx12_rows.rs b/crates/untwist/tests/review_r7_nx12_rows.rs new file mode 100644 index 00000000..fb9b6abd --- /dev/null +++ b/crates/untwist/tests/review_r7_nx12_rows.rs @@ -0,0 +1,178 @@ +use std::path::PathBuf; + +use untwist::{Options, Pipeline}; +use untwist_testing::node_rows::{self, node_or_skip, printed}; + +const DATA: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/data/r7nx12"); + +const SELF_DEFENDING: &str = "(((.+)+)+)+$"; + +const STATICS_READ: [&str; 21] = [ + "f3a", + "f3b", + "f3c", + "l1-lastMatch", + "l6-num-key", + "m1-unk", + "m4-var-cat", + "m5-let-cat", + "m8-call", + "m9-tpl", + "m10-lastMatch-cat", + "m13-inc", + "m15-reflect", + "m19-ctor", + "m20-opt", + "m24-global-cat", + "m25-const-key", + "m26-var-key", + "m27-name-cat", + "m28-name-cat-call", + "c-static", + "n6-ctor-static", + "n7-ctor-var", + "n8-ctor-lastMatch", +]; + +const NUMERIC_LOOKING_KEYS: [&str; 28] = [ + "f1a", + "f1d", + "f2a", + "f2c", + "f2d", + "a1-arguments", + "a1b-arguments-fn", + "a1c-arguments-led", + "a2-annexb", + "a2b-annexb-if", + "a5-pattern", + "a6-switchfn", + "a9-proto", + "a10-number", + "g30-exports", + "g31-top-arguments", + "g32-module", + "h31-if-fn", + "h32-nested-block", + "h34-args-block", + "h35-args-for", + "h39-args-join", + "h40-args-led", + "h41-annexb-led", + "h42-annexb-inc", + "h43-annexb-arrow", + "h46-annexb-inblock-read", + "h47-catch-fn", +]; + +fn lane(unsafe_transforms: bool) -> Options { + Options { + unsafe_transforms, + ..Options::default() + } +} + +fn transformed(unsafe_transforms: bool, source: &str) -> String { + Pipeline::new(lane(unsafe_transforms)) + .run(source) + .code() + .to_string() +} + +fn probe(label: &str) -> String { + std::fs::read_to_string(PathBuf::from(DATA).join(format!("{label}.js"))).expect("read probe") +} + +fn probes() -> Vec<(String, String)> { + let mut found: Vec = std::fs::read_dir(DATA) + .expect("probe dir") + .flatten() + .map(|entry| entry.path()) + .filter(|path| path.extension().is_some_and(|ext| ext == "js")) + .collect(); + found.sort(); + found + .into_iter() + .map(|path| { + let label = path.file_stem().unwrap().to_string_lossy().to_string(); + (label, std::fs::read_to_string(&path).expect("read probe")) + }) + .collect() +} + +#[test] +fn every_r7_nx12_probe_prints_what_node_prints_by_default() { + let Some(node) = node_or_skip() else { + return; + }; + let programs = probes(); + assert!(programs.len() >= 60, "found {} probes", programs.len()); + let run = |source: &str| transformed(false, source); + let modes: Vec> = vec![("default", &run)]; + let wrong = node_rows::mismatches(&node, &programs, &modes); + assert!(wrong.is_empty(), "{}", wrong.join("\n")); +} + +#[test] +fn under_unsafe_a_probe_prints_what_node_prints_unless_a_listed_premise_covers_it() { + let Some(node) = node_or_skip() else { + return; + }; + let dir = tempfile::tempdir().unwrap(); + let mut wrong = Vec::new(); + for (label, source) in probes() { + let listed = STATICS_READ.contains(&label.as_str()) + || NUMERIC_LOOKING_KEYS.contains(&label.as_str()); + let expected = printed(&node, dir.path(), &source); + let actual = printed(&node, dir.path(), &transformed(true, &source)); + if expected.is_ok() && expected == actual { + continue; + } + if !listed && !patches_a_built_in(&source) { + wrong.push(format!("{label}: {expected:?} vs {actual:?}")); + } + } + assert!(wrong.is_empty(), "{}", wrong.join("\n")); +} + +fn patches_a_built_in(source: &str) -> bool { + [".prototype.", ").isArray = "] + .iter() + .any(|patch| source.contains(patch)) +} + +#[test] +fn a_regexp_static_read_keeps_the_self_defending_block_by_default() { + for label in STATICS_READ { + let code = transformed(false, &probe(label)); + assert!(code.contains(SELF_DEFENDING), "{label}: {code}"); + } +} + +#[test] +fn a_key_named_arguments_or_overwritten_by_a_block_function_keeps_the_block_by_default() { + for label in NUMERIC_LOOKING_KEYS { + let code = transformed(false, &probe(label)); + assert!(code.contains(SELF_DEFENDING), "{label}: {code}"); + } +} + +#[test] +fn the_unsafe_lane_still_removes_the_self_defending_block() { + for label in STATICS_READ.iter().chain(&NUMERIC_LOOKING_KEYS) { + let code = transformed(true, &probe(label)); + assert!(!code.contains(SELF_DEFENDING), "{label}: {code}"); + } +} + +#[test] +fn a_hole_key_keeps_the_direct_eval_and_the_spread_helper_by_default() { + for label in ["f1b", "f2b", "e1-h1-evaltext", "e1-h2-evaltext"] { + let code = transformed(false, &probe(label)); + assert!(code.contains("eval("), "{label}: {code}"); + } + for label in ["f1c", "s1-h1-spread"] { + let code = transformed(false, &probe(label)); + assert!(code.contains("_toConsumableArray"), "{label}: {code}"); + } +} From 5985903562916e043a6890a2c0613d879c377b97 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Sat, 21 Nov 2026 00:45:22 +0100 Subject: [PATCH 2/2] test: drop three code-text probes from the r7-nx12 rows --- crates/untwist/tests/review_r7_nx12_rows.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/crates/untwist/tests/review_r7_nx12_rows.rs b/crates/untwist/tests/review_r7_nx12_rows.rs index fb9b6abd..e30a9c19 100644 --- a/crates/untwist/tests/review_r7_nx12_rows.rs +++ b/crates/untwist/tests/review_r7_nx12_rows.rs @@ -29,9 +29,6 @@ const STATICS_READ: [&str; 21] = [ "m27-name-cat", "m28-name-cat-call", "c-static", - "n6-ctor-static", - "n7-ctor-var", - "n8-ctor-lastMatch", ]; const NUMERIC_LOOKING_KEYS: [&str; 28] = [