From 1ec526b88b74869455a7c04c9db0269284e92b7d Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 13:51:18 +0100 Subject: [PATCH 1/6] fix: open built-in chains on a read by a key not proven safe, and read no parameter of a self-referencing named function from its call A computed read, a computed pattern key or a .get call whose key is not proven numeric, enumerated or a resolved name other than __proto__, prototype and constructor now counts as obtaining a built-in prototype. This also feeds the cross-input built-in scan, so an input that patches a prototype through such a key stops folds in the other inputs. A function expression called in place binds its parameters to the call's arguments only when its own name is never referenced. --- .../calls/agnostic/namespace_uses/chains.rs | 85 ++++++++++++++++++- .../src/calls/agnostic/namespace_uses/mod.rs | 17 +++- .../data/rename_a25rr/multi/rx11-m1/a.js | 1 + .../data/rename_a25rr/multi/rx11-m1/b.js | 1 + .../data/rename_a25rr/multi/rx11-m2/a.js | 1 + .../data/rename_a25rr/multi/rx11-m2/b.js | 1 + .../data/rename_a25rr/multi/rx11-m3/a.js | 1 + .../data/rename_a25rr/multi/rx11-m3/b.js | 1 + .../data/rename_a25rr/multi/rx11-m4/a.js | 1 + .../data/rename_a25rr/multi/rx11-m4/b.js | 1 + .../data/rename_a25rr/multi/rx11-m5/a.js | 1 + .../data/rename_a25rr/multi/rx11-m5/b.js | 1 + .../data/rename_a25rr/multi/rx11-m6/a.js | 1 + .../data/rename_a25rr/multi/rx11-m6/b.js | 1 + .../data/rename_a25rr/multi/rx11-m7/a.js | 1 + .../data/rename_a25rr/multi/rx11-m7/b.js | 1 + .../data/rename_a25rr/multi/rx11-m8/a.js | 1 + .../data/rename_a25rr/multi/rx11-m8/b.js | 1 + .../data/rename_a25rr/single/q-rx11-p1.js | 3 + .../data/rename_a25rr/single/q-rx11-p10.js | 3 + .../data/rename_a25rr/single/q-rx11-p11.js | 3 + .../data/rename_a25rr/single/q-rx11-p12.js | 3 + .../data/rename_a25rr/single/q-rx11-p13.js | 3 + .../data/rename_a25rr/single/q-rx11-p14.js | 3 + .../data/rename_a25rr/single/q-rx11-p15.js | 3 + .../data/rename_a25rr/single/q-rx11-p16.js | 2 + .../data/rename_a25rr/single/q-rx11-p2.js | 3 + .../data/rename_a25rr/single/q-rx11-p3.js | 3 + .../data/rename_a25rr/single/q-rx11-p4.js | 3 + .../data/rename_a25rr/single/q-rx11-p5.js | 3 + .../data/rename_a25rr/single/q-rx11-p6.js | 3 + .../data/rename_a25rr/single/q-rx11-p7.js | 3 + .../data/rename_a25rr/single/q-rx11-p8.js | 3 + .../data/rename_a25rr/single/q-rx11-p9.js | 3 + .../tests/data/rename_a25rr/single/rx11-n1.js | 3 + .../tests/data/rename_a25rr/single/rx11-n2.js | 3 + .../tests/data/rename_a25rr/single/rx11-n3.js | 3 + .../tests/data/rename_a25rr/single/rx11-n4.js | 3 + crates/untwist/tests/rename_a25rr_rows.rs | 7 +- 39 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p1.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p10.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p11.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p12.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p13.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p14.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p15.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p16.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p2.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p3.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p4.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p5.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p6.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p7.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p8.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p9.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-n1.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-n2.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-n3.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-n4.js diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs index 8d354698..fe539a8e 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs @@ -1,13 +1,21 @@ use oxc_ast::ast::*; use oxc_ast::AstKind; -use oxc_syntax::operator::BinaryOperator; +use oxc_syntax::operator::{AssignmentOperator, BinaryOperator}; use oxc_syntax::symbol::SymbolFlags; use std::borrow::Cow; use untwist_core::ast_util::js_text::js_text; use untwist_core::semantic::{is_foreign_global, observers, Observers}; +use super::keys::KeyProof; use super::{member_address, same, str_const, Walker, KIND_DEPTH}; +const CHAIN_KEYS: [&str; 3] = ["__proto__", "prototype", "constructor"]; + +pub(super) struct OpenRead<'a> { + object: Option<&'a Expression<'a>>, + key: &'a Expression<'a>, +} + const PROTOTYPE_READERS: [&str; 5] = [ "__proto__", "getPrototypeOf", @@ -39,9 +47,19 @@ impl<'s, 'a> Walker<'s, 'a> { AstKind::ComputedMemberExpression(member) => { match str_const(&member.expression, self.resolve, KIND_DEPTH) { Some(key) => self.member_obtains(&key, &member.object), - None => self.constructor_name(&member.object), + None => { + self.note_open_read(Some(&member.object), &member.expression); + self.constructor_name(&member.object) + } } } + AstKind::BindingProperty(property) if property.computed => { + self.note_open_key(&property.key) + } + AstKind::AssignmentTargetPropertyProperty(property) if property.computed => { + self.note_open_key(&property.name) + } + AstKind::CallExpression(call) => self.keyed_get(call), AstKind::StringLiteral(text) => { !self.member_key_position() && !self.decoded_array_text(text.span) @@ -59,6 +77,66 @@ impl<'s, 'a> Walker<'s, 'a> { self.chains_open |= obtained; } + fn note_open_read(&mut self, object: Option<&'a Expression<'a>>, key: &'a Expression<'a>) { + if !self.plain_store_target() { + self.open_reads.push(OpenRead { object, key }); + } + } + + fn note_open_key(&mut self, key: &'a PropertyKey<'a>) -> bool { + if let Some(key) = key.as_expression() { + self.open_reads.push(OpenRead { object: None, key }); + } + false + } + + fn keyed_get(&mut self, call: &'a CallExpression<'a>) -> bool { + let Some(member) = call.callee.without_parentheses().as_member_expression() else { + return false; + }; + if super::member_key(member, self.resolve).as_deref() != Some("get") { + return false; + } + let spread = call.arguments.iter().take(2).any(Argument::is_spread); + match call.arguments.get(1).and_then(Argument::as_expression) { + _ if spread => true, + Some(key) => { + let object = call.arguments.first().and_then(Argument::as_expression); + self.open_reads.push(OpenRead { object, key }); + false + } + None => false, + } + } + + fn plain_store_target(&self) -> bool { + let at = self.stack.len() - 1; + let Some((up, child)) = self.parent(at) else { + return false; + }; + matches!(self.stack[up], AstKind::AssignmentExpression(assign) + if assign.operator == AssignmentOperator::Assign + && assign.left.as_member_expression().is_some_and(|target| member_address(target) == child)) + } + + fn settle_open_reads(&mut self) { + let reads = std::mem::take(&mut self.open_reads); + let trust_symbol = std::mem::replace(&mut self.trust_symbol, false); + self.chains_open |= reads.iter().any(|read| self.open_read_obtains(read)); + self.trust_symbol = trust_symbol; + } + + fn open_read_obtains(&self, read: &OpenRead<'a>) -> bool { + if let Some(text) = self.key_text(read.key, KIND_DEPTH) { + return CHAIN_KEYS.contains(&text.as_str()); + } + if self.numeric_key(read.key, KIND_DEPTH) { + return false; + } + read.object + .is_none_or(|object| matches!(self.key_proof(object, read.key), KeyProof::Open)) + } + fn member_obtains(&self, key: &str, object: &Expression<'a>) -> bool { match key { "__proto__" => !self.member_written(), @@ -193,6 +271,9 @@ impl<'s, 'a> Walker<'s, 'a> { } pub(super) fn settle_chains(&mut self, texts_run: bool) { + if !self.chains_open { + self.settle_open_reads(); + } self.chains_open |= CONSTRUCTORS.iter().any(|root| is_foreign_global(root)); self.builtins_trusted = observers() == Observers::None || !(self.chains_open || texts_run); self.settle_proto_stores(); diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs index b7147826..b85a5224 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs @@ -118,6 +118,7 @@ struct Walker<'s, 'a> { annex: AnnexBWrites, proto_stores: Vec>>, holders_open: bool, + open_reads: Vec>, } #[derive(Default)] @@ -172,6 +173,7 @@ fn walker_for<'s, 'a>( annex: AnnexBWrites::of(program, scoping), proto_stores: Vec::new(), holders_open: false, + open_reads: Vec::new(), } } @@ -296,14 +298,25 @@ fn transparent(kind: &AstKind<'_>) -> bool { fn iife_function<'k, 'a>( callee: &'k Expression<'a>, + scoping: &Scoping, ) -> Option<(&'k FormalParameters<'a>, Option
)> { match callee.without_parentheses() { - Expression::FunctionExpression(func) => Some((&func.params, Some(func.unstable_address()))), + Expression::FunctionExpression(func) if !self_named(func, scoping) => { + Some((&func.params, Some(func.unstable_address()))) + } Expression::ArrowFunctionExpression(arrow) => Some((&arrow.params, None)), _ => None, } } +fn self_named(func: &Function<'_>, scoping: &Scoping) -> bool { + func.id.as_ref().is_some_and(|id| { + id.symbol_id + .get() + .is_none_or(|symbol| !scoping.get_resolved_reference_ids(symbol).is_empty()) + }) +} + fn function_literal(expr: &Expression<'_>) -> bool { matches!( expr.without_parentheses(), @@ -450,7 +463,7 @@ impl<'s, 'a> Walker<'s, 'a> { } fn collect_params(&mut self, call: &'a CallExpression<'a>) { - let Some((params, function)) = iife_function(&call.callee) else { + let Some((params, function)) = iife_function(&call.callee, self.scoping) else { return; }; if params.rest.is_some() || call.arguments.iter().any(Argument::is_spread) { diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/a.js new file mode 100644 index 00000000..7245ec82 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/a.js @@ -0,0 +1 @@ +var k9 = ["__pro", "to__"].join(""); "x"[k9].trim = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/b.js new file mode 100644 index 00000000..a256bab7 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m1/b.js @@ -0,0 +1 @@ +console.log(" x ".trim()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/a.js new file mode 100644 index 00000000..41c324a5 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/a.js @@ -0,0 +1 @@ +var k9 = ["__pro", "to__"].join(""); Object.assign("x"[k9], { trim: function () { return "PATCHED"; } }); Object.assign([][k9], { join: function () { return "PATCHED"; } }); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m2/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/a.js new file mode 100644 index 00000000..d9944e2d --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/a.js @@ -0,0 +1 @@ +var c9 = ["constr", "uctor"].join(""), l9 = ["proto", "type"].join(""); "x"[c9][l9].trim = function () { return "PATCHED"; }; [][c9][l9].join = function () { return "PATCHED"; }; "x"[c9].fromCharCode = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m3/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/a.js new file mode 100644 index 00000000..52aedf1f --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/a.js @@ -0,0 +1 @@ +var k9 = ["__pro", "to__"].join(""); delete "x"[k9].trim; delete [][k9].join; ({})[k9].trim = function () { return "PATCHED"; }; ({})[k9].join = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m4/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/a.js new file mode 100644 index 00000000..aa6a61a9 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/a.js @@ -0,0 +1 @@ +var k9 = ["__pro", "to__"].join(""); Object.defineProperty("x"[k9], "trim", { value: function () { return "PATCHED"; } }); Object.defineProperty([][k9], "join", { value: function () { return "PATCHED"; } }); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m5/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/a.js new file mode 100644 index 00000000..164acc19 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/a.js @@ -0,0 +1 @@ +var k9 = String.fromCharCode(95, 95, 112, 114, 111, 116, 111, 95, 95); "x"[k9].trim = function () { return "PATCHED"; }; [][k9].join = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m6/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/a.js new file mode 100644 index 00000000..ebb0402a --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/a.js @@ -0,0 +1 @@ +var k9 = `__pro${"to"}__`; "x"[k9].trim = function () { return "PATCHED"; }; [][k9].join = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m7/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/a.js new file mode 100644 index 00000000..adc8b221 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/a.js @@ -0,0 +1 @@ +var k9 = ["__pro", "to__"].join(""); var m9 = ["tr", "im"].join(""), j9 = ["jo", "in"].join(""); "x"[k9][m9] = function () { return "PATCHED"; }; [][k9][j9] = function () { return "PATCHED"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/b.js new file mode 100644 index 00000000..6435a004 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-m8/b.js @@ -0,0 +1 @@ +console.log(" x ".trim(), ["a", "b"].join(""), String.fromCharCode(72, 105), [1, 2] + "", "abc".charAt(1), "a,b".split(","), [3, 4].reverse()); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p1.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p1.js new file mode 100644 index 00000000..9da430ba --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p1.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p10.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p10.js new file mode 100644 index 00000000..c6d4b89a --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p10.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; let a = []; a[k][k] = g; var R = a[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p11.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p11.js new file mode 100644 index 00000000..52df5148 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p11.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var { [k]: AP } = []; AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p12.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p12.js new file mode 100644 index 00000000..339e7408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p12.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP; ({ [k]: AP } = []); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p13.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p13.js new file mode 100644 index 00000000..eda8807f --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p13.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = Reflect.get([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p14.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p14.js new file mode 100644 index 00000000..f7af3a83 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p14.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = Reflect.get(Array, "prototype"); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p15.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p15.js new file mode 100644 index 00000000..eb3b2515 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p15.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var c = ["constr"][0] + "uctor"; var p = ["proto"][0] + "type"; var k = ["__pro"][0] + "to__"; var AP = [][c][p]; AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p16.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p16.js new file mode 100644 index 00000000..2462174c --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p16.js @@ -0,0 +1,2 @@ +var k9 = ["__pro", "to__"].join(""); "x"[k9].trim = function () { return "PATCHED"; }; +console.log(" x ".trim()); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p2.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p2.js new file mode 100644 index 00000000..e88279ae --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p2.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; [AP[k]] = [g]; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p3.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p3.js new file mode 100644 index 00000000..86a32df0 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p3.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; for (AP[k] of [g]); var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p4.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p4.js new file mode 100644 index 00000000..900cb721 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p4.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; Reflect.set(AP, k, g); var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p5.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p5.js new file mode 100644 index 00000000..95b16352 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p5.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; Object.assign(AP, { [k]: g }); var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p6.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p6.js new file mode 100644 index 00000000..56311048 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p6.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = [][k]; let h = {}; AP[k] = h; h[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p7.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p7.js new file mode 100644 index 00000000..46bbd4e5 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p7.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; [][k][k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p8.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p8.js new file mode 100644 index 00000000..8b89a1e7 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p8.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP = (function () {})[k]; AP[k] = g; var R = (function () {})[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p9.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p9.js new file mode 100644 index 00000000..62d848ae --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p9.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; let a = []; var AP = a[k]; AP[k] = g; var R = a[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-n1.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-n1.js new file mode 100644 index 00000000..feded31c --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-n1.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; (function me(p, d) { if (d) { me(g, 0); return; } var R = p[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); })({}, 1); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-n2.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-n2.js new file mode 100644 index 00000000..d93510b9 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-n2.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var h; (function me(p) { h = me; if (p === g) { var R = p[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); } })({}); h(g); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-n3.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-n3.js new file mode 100644 index 00000000..99aec7ae --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-n3.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; (function me(p) { var R = p[n]; if (R) { var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); } })(g); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-n4.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-n4.js new file mode 100644 index 00000000..4aee76f3 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-n4.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var h = function me(p, d) { if (d) { me(g, 0); return; } var R = p[n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); }; h({}, 1); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/rename_a25rr_rows.rs b/crates/untwist/tests/rename_a25rr_rows.rs index 73631108..ec3ff0c1 100644 --- a/crates/untwist/tests/rename_a25rr_rows.rs +++ b/crates/untwist/tests/rename_a25rr_rows.rs @@ -37,6 +37,10 @@ const UNSAFE_PREMISE_MULTI: &[(&str, RenameMode)] = &[ ("rx9-m21", RenameMode::Smart), ]; +const UNSAFE_PREMISE_MULTI_EVERY_MODE: &[&str] = &[ + "rx11-m1", "rx11-m2", "rx11-m3", "rx11-m4", "rx11-m5", "rx11-m6", "rx11-m7", "rx11-m8", +]; + const OBSERVED_INPUT: &str = "a.js"; fn data() -> PathBuf { @@ -210,7 +214,8 @@ fn multi_rows(unsafe_transforms: bool) -> Vec { for (mode, rename) in RENAMES { let premise = UNSAFE_PREMISE_MULTI .iter() - .any(|(label, mode)| *label == case.label && *mode == rename); + .any(|(label, mode)| *label == case.label && *mode == rename) + || UNSAFE_PREMISE_MULTI_EVERY_MODE.contains(&case.label.as_str()); if unsafe_transforms && premise { continue; } From 972e50dc0e4262bccf91c254c7fd28cc63cbfe39 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 14:25:13 +0100 Subject: [PATCH 2/6] fix: keep a key read safe when its parameter was overwritten with a number earlier in the same function body --- .../calls/agnostic/namespace_uses/chains.rs | 28 ++++++- .../src/calls/agnostic/namespace_uses/mod.rs | 1 + .../agnostic/namespace_uses/rewritten.rs | 84 +++++++++++++++++++ .../data/rename_a25rr/single/q-rx11-p17.js | 3 + .../data/rename_a25rr/single/q-rx11-p18.js | 3 + .../data/rename_a25rr/single/q-rx11-p19.js | 3 + .../data/rename_a25rr/single/q-rx11-p20.js | 3 + .../data/rename_a25rr/single/q-rx11-p21.js | 3 + 8 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p17.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p18.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p19.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p20.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p21.js diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs index fe539a8e..b99aaaf1 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs @@ -14,6 +14,7 @@ const CHAIN_KEYS: [&str; 3] = ["__proto__", "prototype", "constructor"]; pub(super) struct OpenRead<'a> { object: Option<&'a Expression<'a>>, key: &'a Expression<'a>, + rewritten: Option<(oxc_syntax::symbol::SymbolId, oxc_allocator::Address)>, } const PROTOTYPE_READERS: [&str; 5] = [ @@ -79,13 +80,15 @@ impl<'s, 'a> Walker<'s, 'a> { fn note_open_read(&mut self, object: Option<&'a Expression<'a>>, key: &'a Expression<'a>) { if !self.plain_store_target() { - self.open_reads.push(OpenRead { object, key }); + let read = self.open_read(object, key); + self.open_reads.push(read); } } fn note_open_key(&mut self, key: &'a PropertyKey<'a>) -> bool { if let Some(key) = key.as_expression() { - self.open_reads.push(OpenRead { object: None, key }); + let read = self.open_read(None, key); + self.open_reads.push(read); } false } @@ -102,13 +105,26 @@ impl<'s, 'a> Walker<'s, 'a> { _ if spread => true, Some(key) => { let object = call.arguments.first().and_then(Argument::as_expression); - self.open_reads.push(OpenRead { object, key }); + let read = self.open_read(object, key); + self.open_reads.push(read); false } None => false, } } + fn open_read( + &self, + object: Option<&'a Expression<'a>>, + key: &'a Expression<'a>, + ) -> OpenRead<'a> { + OpenRead { + object, + key, + rewritten: self.rewritten_before_here(key), + } + } + fn plain_store_target(&self) -> bool { let at = self.stack.len() - 1; let Some((up, child)) = self.parent(at) else { @@ -133,6 +149,12 @@ impl<'s, 'a> Walker<'s, 'a> { if self.numeric_key(read.key, KIND_DEPTH) { return false; } + if read + .rewritten + .is_some_and(|(symbol, function)| self.numeric_rewrite(symbol, function)) + { + return false; + } read.object .is_none_or(|object| matches!(self.key_proof(object, read.key), KeyProof::Open)) } diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs index b85a5224..e7448f42 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs @@ -6,6 +6,7 @@ mod holders; mod keys; mod numeric; mod proto_stores; +mod rewritten; mod shapes; use std::borrow::Cow; diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs new file mode 100644 index 00000000..2e3b8d07 --- /dev/null +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs @@ -0,0 +1,84 @@ +use oxc_allocator::{Address, GetAddress, UnstableAddress}; +use oxc_ast::ast::*; +use oxc_ast::AstKind; +use oxc_syntax::operator::AssignmentOperator; +use oxc_syntax::symbol::SymbolId; + +use super::numeric::NumericWrite; +use super::{Walker, KIND_DEPTH}; + +impl<'s, 'a> Walker<'s, 'a> { + pub(super) fn rewritten_before_here( + &self, + key: &Expression<'a>, + ) -> Option<(SymbolId, Address)> { + let Expression::Identifier(id) = key.without_parentheses() else { + return None; + }; + let symbol = self.symbol(id)?; + let at = self.stack.iter().rposition(|kind| { + matches!( + kind, + AstKind::Function(_) + | AstKind::ArrowFunctionExpression(_) + | AstKind::StaticBlock(_) + | AstKind::PropertyDefinition(_) + | AstKind::AccessorProperty(_) + ) + })?; + let AstKind::Function(function) = self.stack[at] else { + return None; + }; + let body = function.body.as_ref()?; + let statement = match (self.stack.get(at + 1), self.stack.get(at + 2)) { + (Some(AstKind::FunctionBody(_)), Some(statement)) => statement.address(), + _ => return None, + }; + let index = body + .statements + .iter() + .position(|item| item.address() == statement)?; + body.statements[..index] + .iter() + .any(|item| assigns(item, symbol, self)) + .then(|| (symbol, function.unstable_address())) + } + + pub(super) fn numeric_rewrite(&self, symbol: SymbolId, function: Address) -> bool { + let settled = !self.dynamic_scope + && !self.opaque.contains(&symbol) + && !self.shared_root(symbol) + && !self.annex.may_write(symbol) + && self.scoping.symbol_redeclarations(symbol).is_empty() + && !self.arguments_used.contains(&function); + settled + && self.numeric_writes.get(&symbol).is_some_and(|writes| { + writes.iter().all(|write| match write { + NumericWrite::Numeric => true, + NumericWrite::Value(value) => self.numeric_key(value, KIND_DEPTH), + NumericWrite::Unknown => false, + }) + }) + } +} + +fn assigns(statement: &Statement<'_>, symbol: SymbolId, walker: &Walker<'_, '_>) -> bool { + let Statement::ExpressionStatement(statement) = statement else { + return false; + }; + let Expression::AssignmentExpression(assign) = statement.expression.without_parentheses() + else { + return false; + }; + let AssignmentTarget::AssignmentTargetIdentifier(target) = &assign.left else { + return false; + }; + let overwrites = match assign.operator { + AssignmentOperator::Assign => true, + operator => !operator.is_logical() && operator != AssignmentOperator::Addition, + }; + if !overwrites { + return false; + } + walker.symbol(target) == Some(symbol) +} diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p17.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p17.js new file mode 100644 index 00000000..c36f899d --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p17.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { var r = o[j]; j = j - 0; return r; } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p18.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p18.js new file mode 100644 index 00000000..27287047 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p18.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { j = j - 0; arguments[1] = k; return o[j]; } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p19.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p19.js new file mode 100644 index 00000000..fd071e02 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p19.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { j ??= 0; return o[j]; } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p20.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p20.js new file mode 100644 index 00000000..2cca5b8d --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p20.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { j = j - 0; function h() { j = k; } h(); return o[j]; } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p21.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p21.js new file mode 100644 index 00000000..e2bda8a6 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p21.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { j = j * 1; var t = () => o[k]; return t(); } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); From ba90a3ee1fb5378ee64a4a1eb9f1263a576ca5eb Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 15:02:21 +0100 Subject: [PATCH 3/6] fix: keep a key read safe when its parameter only ever receives numbers from direct calls --- .../calls/agnostic/namespace_uses/chains.rs | 3 + .../agnostic/namespace_uses/key_params.rs | 137 ++++++++++++++++++ .../src/calls/agnostic/namespace_uses/mod.rs | 7 + .../agnostic/namespace_uses/rewritten.rs | 17 ++- .../tests/data/rename_a25rr/single/rx11-k1.js | 3 + .../tests/data/rename_a25rr/single/rx11-k2.js | 3 + .../tests/data/rename_a25rr/single/rx11-k3.js | 3 + .../tests/data/rename_a25rr/single/rx11-k4.js | 3 + .../tests/data/rename_a25rr/single/rx11-k5.js | 3 + .../tests/data/rename_a25rr/single/rx11-k6.js | 3 + .../tests/data/rename_a25rr/single/rx11-k7.js | 3 + .../tests/data/rename_a25rr/single/rx11-k8.js | 3 + 12 files changed, 181 insertions(+), 7 deletions(-) create mode 100644 crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k1.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k2.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k3.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k4.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k5.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k6.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k7.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-k8.js diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs index b99aaaf1..e90a8761 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs @@ -155,6 +155,9 @@ impl<'s, 'a> Walker<'s, 'a> { { return false; } + if self.numeric_param(read.key) { + return false; + } read.object .is_none_or(|object| matches!(self.key_proof(object, read.key), KeyProof::Open)) } diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs new file mode 100644 index 00000000..f3f6c687 --- /dev/null +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs @@ -0,0 +1,137 @@ +use oxc_allocator::{Address, UnstableAddress}; +use oxc_ast::ast::*; +use oxc_ast::AstKind; +use oxc_syntax::symbol::SymbolId; + +use super::{same, Walker, KIND_DEPTH}; + +#[derive(Clone, Copy)] +pub(super) struct ParamSlot { + binding: SymbolId, + index: usize, + function: Option
, +} + +impl<'s, 'a> Walker<'s, 'a> { + pub(super) fn collect_param_slots(&mut self, kind: AstKind<'a>) { + let (params, function) = match kind { + AstKind::Function(function) => (&*function.params, Some(function.unstable_address())), + AstKind::ArrowFunctionExpression(arrow) => (&*arrow.params, None), + _ => return, + }; + let Some(binding) = self.function_binding(kind) else { + return; + }; + if params.rest.is_some() { + return; + } + for (index, param) in params.items.iter().enumerate() { + let (BindingPattern::BindingIdentifier(id), None) = + (¶m.pattern, ¶m.initializer) + else { + continue; + }; + if let Some(symbol) = id.symbol_id.get() { + let slot = ParamSlot { + binding, + index, + function, + }; + self.param_slots.insert(symbol, slot); + } + } + } + + fn function_binding(&self, kind: AstKind<'a>) -> Option { + let at = self.stack.len() - 1; + if let AstKind::Function(function) = kind { + if function.is_declaration() { + let exported = self.parent(at).is_some_and(|(up, _)| { + matches!( + self.stack[up], + AstKind::ExportNamedDeclaration(_) | AstKind::ExportDefaultDeclaration(_) + ) + }); + return function + .id + .as_ref() + .and_then(|id| id.symbol_id.get()) + .filter(|_| !exported); + } + if super::self_named(function, self.scoping) { + return None; + } + } + let (up, child) = self.parent(at)?; + let AstKind::VariableDeclarator(declarator) = self.stack[up] else { + return None; + }; + let BindingPattern::BindingIdentifier(id) = &declarator.id else { + return None; + }; + declarator + .init + .as_ref() + .filter(|init| same(init, child)) + .and_then(|_| id.symbol_id.get()) + } + + pub(super) fn collect_callee(&mut self, id: &IdentifierReference<'a>) { + let Some(symbol) = self.symbol(id) else { + return; + }; + let at = self.stack.len() - 1; + let Some((up, child)) = self.parent(at) else { + return; + }; + if let AstKind::CallExpression(call) = self.stack[up] { + if same(&call.callee, child) { + self.callee_calls.entry(symbol).or_default().push(call); + } + } + } + + pub(super) fn numeric_param(&self, key: &Expression<'a>) -> bool { + let Expression::Identifier(id) = key.without_parentheses() else { + return false; + }; + let Some(symbol) = self.symbol(id) else { + return false; + }; + let Some(slot) = self.param_slots.get(&symbol).copied() else { + return false; + }; + let settled = !self.dynamic_scope + && !self.opaque.contains(&symbol) + && !self.opaque.contains(&slot.binding) + && !self.shared_root(slot.binding) + && !self.annex.may_write(slot.binding) + && !crate::calls::agnostic::rebound(self.scoping, slot.binding) + && self.scoping.symbol_redeclarations(slot.binding).is_empty() + && self.scoping.symbol_redeclarations(symbol).is_empty() + && slot + .function + .is_none_or(|function| !self.arguments_used.contains(&function)); + settled && self.writes_numeric(symbol) && self.called_with_numbers(slot) + } + + fn called_with_numbers(&self, slot: ParamSlot) -> bool { + let references = self.scoping.get_resolved_reference_ids(slot.binding).len(); + let Some(calls) = self.callee_calls.get(&slot.binding) else { + return references == 0; + }; + calls.len() == references + && calls.iter().all(|call| { + let spread = call + .arguments + .iter() + .take(slot.index + 1) + .any(Argument::is_spread); + let argument = call + .arguments + .get(slot.index) + .and_then(Argument::as_expression); + !spread && argument.is_some_and(|argument| self.numeric_key(argument, KIND_DEPTH)) + }) + } +} diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs index e7448f42..7bf25568 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs @@ -3,6 +3,7 @@ mod chains; mod flows; mod holder_uses; mod holders; +mod key_params; mod keys; mod numeric; mod proto_stores; @@ -120,6 +121,8 @@ struct Walker<'s, 'a> { proto_stores: Vec>>, holders_open: bool, open_reads: Vec>, + param_slots: FxHashMap, + callee_calls: FxHashMap>>, } #[derive(Default)] @@ -175,6 +178,8 @@ fn walker_for<'s, 'a>( proto_stores: Vec::new(), holders_open: false, open_reads: Vec::new(), + param_slots: FxHashMap::default(), + callee_calls: FxHashMap::default(), } } @@ -831,6 +836,7 @@ impl<'s, 'a> Walker<'s, 'a> { self.collect_numeric(kind); self.collect_array_source(kind); self.collect_enumeration(kind); + self.collect_param_slots(kind); match kind { AstKind::VariableDeclarator(declarator) => { self.collect_declarator(declarator); @@ -846,6 +852,7 @@ impl<'s, 'a> Walker<'s, 'a> { AstKind::IdentifierReference(id) => { self.collect_reference(id); self.collect_holder_use(id); + self.collect_callee(id); } _ => {} } diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs index 2e3b8d07..194e167c 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/rewritten.rs @@ -51,14 +51,17 @@ impl<'s, 'a> Walker<'s, 'a> { && !self.annex.may_write(symbol) && self.scoping.symbol_redeclarations(symbol).is_empty() && !self.arguments_used.contains(&function); - settled - && self.numeric_writes.get(&symbol).is_some_and(|writes| { - writes.iter().all(|write| match write { - NumericWrite::Numeric => true, - NumericWrite::Value(value) => self.numeric_key(value, KIND_DEPTH), - NumericWrite::Unknown => false, - }) + settled && self.numeric_writes.contains_key(&symbol) && self.writes_numeric(symbol) + } + + pub(super) fn writes_numeric(&self, symbol: SymbolId) -> bool { + self.numeric_writes.get(&symbol).is_none_or(|writes| { + writes.iter().all(|write| match write { + NumericWrite::Numeric => true, + NumericWrite::Value(value) => self.numeric_key(value, KIND_DEPTH), + NumericWrite::Unknown => false, }) + }) } } diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k1.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k1.js new file mode 100644 index 00000000..5a4a77dd --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k1.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { return o[j]; } var AP = q([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k2.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k2.js new file mode 100644 index 00000000..672fff9f --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k2.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { return o[j]; } q([], 0); var h = q; var AP = h([], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k3.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k3.js new file mode 100644 index 00000000..833edf21 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k3.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { return j === 0 ? q(o, k) : o[j]; } var AP = q([], 0); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k4.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k4.js new file mode 100644 index 00000000..2f0a72a1 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k4.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; const q = (o, j) => o[j]; var AP = q.call(null, [], k); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k5.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k5.js new file mode 100644 index 00000000..81ffc756 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k5.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { j = k; return o[j]; } var AP = q([], 0); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k6.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k6.js new file mode 100644 index 00000000..90f6f3f0 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k6.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { arguments[1] = k; return o[j]; } var AP = q([], 0); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k7.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k7.js new file mode 100644 index 00000000..2b3423aa --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k7.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; function q(o, j) { return o[j]; } var AP = q(...[[], k]); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-k8.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-k8.js new file mode 100644 index 00000000..caa53d34 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-k8.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var q = function (o, j) { return o[j]; }; q = function (o) { return o[k]; }; var AP = q([], 0); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); From 2d53f7805fb5928c6ccc63e50d95727cf5150872 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 17:59:27 +0100 Subject: [PATCH 4/6] fix: count a read by an unproven key only when its value is kept, and prove keys from unset numeric variables A read whose value is only tested, compared, coerced while the relied built-ins are intact, or called with the result dropped cannot hand out a prototype. The notes test decoder now shifts its index like the obfuscator.io decoder it stands for. --- .../calls/agnostic/namespace_uses/chains.rs | 7 +-- .../agnostic/namespace_uses/discarded.rs | 52 +++++++++++++++++++ .../agnostic/namespace_uses/holder_uses.rs | 2 +- .../agnostic/namespace_uses/key_params.rs | 48 +++++++++++++++-- .../src/calls/agnostic/namespace_uses/mod.rs | 4 ++ .../untwist-deobfuscate/tests/notes/cases.rs | 2 +- .../data/rename_a25rr/single/q-rx11-p22.js | 3 ++ .../data/rename_a25rr/single/q-rx11-p23.js | 3 ++ .../data/rename_a25rr/single/q-rx11-p24.js | 3 ++ .../data/rename_a25rr/single/q-rx11-p25.js | 3 ++ .../data/rename_a25rr/single/q-rx11-p26.js | 3 ++ .../data/rename_a25rr/single/q-rx11-p27.js | 3 ++ .../tests/data/rename_a25rr/single/rx11-s1.js | 3 ++ .../tests/data/rename_a25rr/single/rx11-s2.js | 3 ++ .../tests/data/rename_a25rr/single/rx11-s3.js | 3 ++ .../tests/data/rename_a25rr/single/rx11-s4.js | 3 ++ 16 files changed, 136 insertions(+), 9 deletions(-) create mode 100644 crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/discarded.rs create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p22.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p23.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p24.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p25.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p26.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/q-rx11-p27.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-s1.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-s2.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-s3.js create mode 100644 crates/untwist/tests/data/rename_a25rr/single/rx11-s4.js diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs index e90a8761..54b1c11f 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/chains.rs @@ -9,7 +9,7 @@ use untwist_core::semantic::{is_foreign_global, observers, Observers}; use super::keys::KeyProof; use super::{member_address, same, str_const, Walker, KIND_DEPTH}; -const CHAIN_KEYS: [&str; 3] = ["__proto__", "prototype", "constructor"]; +pub(super) const CHAIN_KEYS: [&str; 3] = ["__proto__", "prototype", "constructor"]; pub(super) struct OpenRead<'a> { object: Option<&'a Expression<'a>>, @@ -79,7 +79,7 @@ impl<'s, 'a> Walker<'s, 'a> { } fn note_open_read(&mut self, object: Option<&'a Expression<'a>>, key: &'a Expression<'a>) { - if !self.plain_store_target() { + if !self.plain_store_target() && !self.discarded_read() { let read = self.open_read(object, key); self.open_reads.push(read); } @@ -103,6 +103,7 @@ impl<'s, 'a> Walker<'s, 'a> { let spread = call.arguments.iter().take(2).any(Argument::is_spread); match call.arguments.get(1).and_then(Argument::as_expression) { _ if spread => true, + Some(_) if self.discarded_read() => false, Some(key) => { let object = call.arguments.first().and_then(Argument::as_expression); let read = self.open_read(object, key); @@ -155,7 +156,7 @@ impl<'s, 'a> Walker<'s, 'a> { { return false; } - if self.numeric_param(read.key) { + if self.safe_key_param(read.key) { return false; } read.object diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/discarded.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/discarded.rs new file mode 100644 index 00000000..6c5ccf4a --- /dev/null +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/discarded.rs @@ -0,0 +1,52 @@ +use oxc_ast::AstKind; +use oxc_syntax::operator::{BinaryOperator, UnaryOperator}; + +use super::holder_uses::harmless_binary; +use super::{same, Walker}; + +impl<'s, 'a> Walker<'s, 'a> { + pub(super) fn discarded_read(&self) -> bool { + let at = self.stack.len() - 1; + match self.parent(at) { + Some((up, child)) if self.called_by(up, child) => self.discarded(up), + _ => self.discarded(at), + } + } + + fn called_by(&self, up: usize, child: oxc_allocator::Address) -> bool { + match self.stack[up] { + AstKind::CallExpression(call) => same(&call.callee, child), + AstKind::NewExpression(new) => same(&new.callee, child), + _ => false, + } + } + + fn discarded(&self, at: usize) -> bool { + let Some((up, child)) = self.parent(at) else { + return false; + }; + match self.stack[up] { + AstKind::ExpressionStatement(_) => true, + AstKind::UnaryExpression(unary) => match unary.operator { + UnaryOperator::Typeof | UnaryOperator::Void | UnaryOperator::LogicalNot => true, + UnaryOperator::Delete => false, + _ => self.builtins_intact(), + }, + AstKind::BinaryExpression(binary) => { + harmless_binary(binary.operator, same(&binary.right, child)) + || (binary.operator != BinaryOperator::Instanceof && self.builtins_intact()) + } + AstKind::TemplateLiteral(_) => { + let tagged = up.checked_sub(1).is_some_and(|tag| { + matches!(self.stack[tag], AstKind::TaggedTemplateExpression(_)) + }); + !tagged && self.builtins_intact() + } + AstKind::IfStatement(statement) => same(&statement.test, child), + AstKind::WhileStatement(statement) => same(&statement.test, child), + AstKind::DoWhileStatement(statement) => same(&statement.test, child), + AstKind::ConditionalExpression(conditional) => same(&conditional.test, child), + _ => false, + } + } +} diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/holder_uses.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/holder_uses.rs index 65a20ac7..a9e02d68 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/holder_uses.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/holder_uses.rs @@ -41,7 +41,7 @@ const INSTANCE_CONSTRUCTORS: [&str; 16] = [ "Date", "Error", "Map", "Set", "WeakMap", "WeakSet", "Promise", ]; -fn harmless_binary(operator: BinaryOperator, right: bool) -> bool { +pub(super) fn harmless_binary(operator: BinaryOperator, right: bool) -> bool { matches!( operator, BinaryOperator::StrictEquality | BinaryOperator::StrictInequality diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs index f3f6c687..7ca0444f 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/key_params.rs @@ -3,6 +3,7 @@ use oxc_ast::ast::*; use oxc_ast::AstKind; use oxc_syntax::symbol::SymbolId; +use super::chains::CHAIN_KEYS; use super::{same, Walker, KIND_DEPTH}; #[derive(Clone, Copy)] @@ -91,7 +92,7 @@ impl<'s, 'a> Walker<'s, 'a> { } } - pub(super) fn numeric_param(&self, key: &Expression<'a>) -> bool { + pub(super) fn safe_key_param(&self, key: &Expression<'a>) -> bool { let Expression::Identifier(id) = key.without_parentheses() else { return false; }; @@ -112,10 +113,49 @@ impl<'s, 'a> Walker<'s, 'a> { && slot .function .is_none_or(|function| !self.arguments_used.contains(&function)); - settled && self.writes_numeric(symbol) && self.called_with_numbers(slot) + settled && self.writes_numeric(symbol) && self.called_with_safe_keys(slot) } - fn called_with_numbers(&self, slot: ParamSlot) -> bool { + fn safe_key(&self, key: &Expression<'a>) -> bool { + match self.key_text(key, KIND_DEPTH) { + Some(text) => !CHAIN_KEYS.contains(&text.as_str()), + None => self.numeric_key(key, KIND_DEPTH) || self.unset_numeric(key), + } + } + + pub(super) fn collect_unset(&mut self, declarator: &'a VariableDeclarator<'a>) { + let (BindingPattern::BindingIdentifier(id), None) = (&declarator.id, &declarator.init) + else { + return; + }; + let looped = self.stack.len().checked_sub(3).is_some_and(|at| { + matches!( + self.stack[at], + AstKind::ForInStatement(_) | AstKind::ForOfStatement(_) + ) + }); + if let (false, Some(symbol)) = (looped, id.symbol_id.get()) { + self.unset.insert(symbol); + } + } + + fn unset_numeric(&self, key: &Expression<'a>) -> bool { + let Expression::Identifier(id) = key.without_parentheses() else { + return false; + }; + let Some(symbol) = self.symbol(id) else { + return false; + }; + self.unset.contains(&symbol) + && !self.dynamic_scope + && !self.opaque.contains(&symbol) + && !self.shared_root(symbol) + && !self.annex.may_write(symbol) + && self.scoping.symbol_redeclarations(symbol).is_empty() + && self.writes_numeric(symbol) + } + + fn called_with_safe_keys(&self, slot: ParamSlot) -> bool { let references = self.scoping.get_resolved_reference_ids(slot.binding).len(); let Some(calls) = self.callee_calls.get(&slot.binding) else { return references == 0; @@ -131,7 +171,7 @@ impl<'s, 'a> Walker<'s, 'a> { .arguments .get(slot.index) .and_then(Argument::as_expression); - !spread && argument.is_some_and(|argument| self.numeric_key(argument, KIND_DEPTH)) + !spread && argument.is_some_and(|argument| self.safe_key(argument)) }) } } diff --git a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs index 7bf25568..f0a0659e 100644 --- a/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs +++ b/crates/untwist-deobfuscate/src/calls/agnostic/namespace_uses/mod.rs @@ -1,5 +1,6 @@ mod blocks; mod chains; +mod discarded; mod flows; mod holder_uses; mod holders; @@ -123,6 +124,7 @@ struct Walker<'s, 'a> { open_reads: Vec>, param_slots: FxHashMap, callee_calls: FxHashMap>>, + unset: FxHashSet, } #[derive(Default)] @@ -180,6 +182,7 @@ fn walker_for<'s, 'a>( open_reads: Vec::new(), param_slots: FxHashMap::default(), callee_calls: FxHashMap::default(), + unset: FxHashSet::default(), } } @@ -840,6 +843,7 @@ impl<'s, 'a> Walker<'s, 'a> { match kind { AstKind::VariableDeclarator(declarator) => { self.collect_declarator(declarator); + self.collect_unset(declarator); self.collect_protection(kind); } AstKind::Function(_) => self.collect_protection(kind), diff --git a/crates/untwist-deobfuscate/tests/notes/cases.rs b/crates/untwist-deobfuscate/tests/notes/cases.rs index f05d63d6..f5b9d7b9 100644 --- a/crates/untwist-deobfuscate/tests/notes/cases.rs +++ b/crates/untwist-deobfuscate/tests/notes/cases.rs @@ -2,7 +2,7 @@ use untwist_core::pass::Note; use untwist_core::semantic::{assume_shared_globals, SharedGlobals}; use untwist_deobfuscate::notes; -const HEAD: &str = "function __STRING_ARRAY__() {\n var h = ['log'];\n __STRING_ARRAY__ = function () { return h; };\n return __STRING_ARRAY__();\n}\nfunction __DECODE_0__(a, b) {\n var e = __STRING_ARRAY__();\n return e[a];\n}\n"; +const HEAD: &str = "function __STRING_ARRAY__() {\n var h = ['log'];\n __STRING_ARRAY__ = function () { return h; };\n return __STRING_ARRAY__();\n}\nfunction __DECODE_0__(a, b) {\n a = a - 0;\n var e = __STRING_ARRAY__();\n return e[a];\n}\n"; const WRAPPED_UNIT: &str = "\ function a() { var h = ['log', 'Hello World!']; a = function () { return h; }; return a(); } diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p22.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p22.js new file mode 100644 index 00000000..335502b5 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p22.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var AP; if ([][k]) { AP = [][k]; } AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p23.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p23.js new file mode 100644 index 00000000..707509a0 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p23.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var c = ["constr"][0] + "uctor"; var gp = ["getProto"][0] + "typeOf"; var AP = ({})[c][gp]([]); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p24.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p24.js new file mode 100644 index 00000000..9378f8ff --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p24.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var leak; class Y { static [Symbol.hasInstance](v) { leak = v; return true; } } [][k] instanceof Y; leak[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p25.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p25.js new file mode 100644 index 00000000..a9b68ed7 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p25.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var c = ["constr"][0] + "uctor"; var sp = ["setProto"][0] + "typeOf"; ({})[c][sp]([][k], g); var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p26.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p26.js new file mode 100644 index 00000000..8ea2e76b --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p26.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var leak; Object.prototype.valueOf = function () { leak = this; return 1; }; [][k] + 1; leak[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p27.js b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p27.js new file mode 100644 index 00000000..42986926 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/q-rx11-p27.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; var lg = ["__lookup"][0] + "Getter__"; var get = ({})[lg](k); var AP = get.call([]); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-s1.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-s1.js new file mode 100644 index 00000000..6fb6fe4c --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-s1.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; const q = (o, j) => o[j]; var AP = q([], "__proto__"); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-s2.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-s2.js new file mode 100644 index 00000000..21ddb30f --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-s2.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; const q = (o, j) => o[j]; var c = q([], "constructor"); var AP = q(c, "prototype"); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-s3.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-s3.js new file mode 100644 index 00000000..a6e47be1 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-s3.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; const q = (o, j) => o[j]; var AP = q([], "__pro" + "to__"); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); diff --git a/crates/untwist/tests/data/rename_a25rr/single/rx11-s4.js b/crates/untwist/tests/data/rename_a25rr/single/rx11-s4.js new file mode 100644 index 00000000..00a21cb7 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/single/rx11-s4.js @@ -0,0 +1,3 @@ +function f(a) { return a + 1; } +var g = [globalThis][0]; var n = ["Reflect"][0]; var k = ["__pro"][0] + "to__"; const q = (o, j) => o[j]; var AP = q([], `__proto__`); AP[k] = g; var R = [][n]; var [{ set: s }] = [R]; s(g, "f", function () { return 99; }); +console.log(f(1), f(2)); From 52e60b54ed5f1f8c1f79414ccc089cced02a63b0 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Fri, 20 Nov 2026 22:22:25 +0100 Subject: [PATCH 5/6] test: rows for r7 E1, a built-in prototype patched through an unresolved key in another input --- crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/b.js | 7 +++++++ crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/b.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/a.js | 1 + crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/b.js | 1 + crates/untwist/tests/rename_a25rr_rows.rs | 2 ++ 31 files changed, 110 insertions(+) create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/b.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/a.js create mode 100644 crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/b.js diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/a.js new file mode 100644 index 00000000..d1340ad6 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/a.js @@ -0,0 +1 @@ +var k = "constructor"; ""[k].prototype.charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1a/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/a.js new file mode 100644 index 00000000..bad49b0c --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/a.js @@ -0,0 +1 @@ +var c = "constructor"; (function () {})[c]("String.prototype.charAt = function () { return \"q\"; }")(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1b/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/a.js new file mode 100644 index 00000000..890108b8 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/a.js @@ -0,0 +1 @@ +var k = "__proto__x".slice(0, 9); ""[k].charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1c/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/a.js new file mode 100644 index 00000000..82c2d4bc --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/a.js @@ -0,0 +1 @@ +function key() { return "constructor"; } ""[key()].prototype.charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1d/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/a.js new file mode 100644 index 00000000..f725ff72 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/a.js @@ -0,0 +1 @@ +var k = "constructor"; var S = ""[k]; var P = S.prototype; P.charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1e/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/a.js new file mode 100644 index 00000000..31f6f2bd --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/a.js @@ -0,0 +1 @@ +let k = "constructor"; k = "constructor"; ""[k].prototype.charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1f/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/a.js new file mode 100644 index 00000000..57792a84 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/a.js @@ -0,0 +1 @@ +var k = "__proto__"; ""[k].charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1g/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/a.js new file mode 100644 index 00000000..72f30ddb --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/a.js @@ -0,0 +1 @@ +var ks = { p: "__proto__" }; ""[ks.p].charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1h/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/a.js new file mode 100644 index 00000000..446a0b90 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/a.js @@ -0,0 +1 @@ +function patch(v, k) { v[k].charAt = function () { return "q"; }; } patch("", "__proto__"); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1i/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/a.js new file mode 100644 index 00000000..5f20fc78 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/a.js @@ -0,0 +1 @@ +function patch(v, k) { v[k].prototype.charAt = function () { return "q"; }; } patch("", "constructor"); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1j/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/a.js new file mode 100644 index 00000000..7b3d2714 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/a.js @@ -0,0 +1 @@ +var k = "constructor"; delete ""[k].prototype.charAt; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1k/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/a.js new file mode 100644 index 00000000..1b812811 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/a.js @@ -0,0 +1 @@ +var k = "prototype"; var c = "constructor"; ""[c][k].charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1l/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/a.js new file mode 100644 index 00000000..51f07fa2 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/a.js @@ -0,0 +1 @@ +const k = "constr"; const k2 = k + "uctor"; ""[k2].prototype.charAt = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/b.js new file mode 100644 index 00000000..1a2e2408 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1m/b.js @@ -0,0 +1,7 @@ +function f() { + const U = { a: "x", b: "y", eq: function (p, q) { return p === q; } }; + const o = { k: U.a, t: function (p) { return p.charAt(0) === "x"; } }; + if (o.t(o.k)) {} else { U.b = "changed"; } + console.log(U.b, U.eq(U.a, "x")); +} +f(); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/a.js new file mode 100644 index 00000000..2da10c43 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/a.js @@ -0,0 +1 @@ +var k = "constructor"; ""[k].fromCharCode = function () { return "console.log(\"F\")"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/b.js new file mode 100644 index 00000000..ab3c7ebd --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1x/b.js @@ -0,0 +1 @@ +eval(String.fromCharCode(99, 111, 110, 115, 111, 108, 101, 46, 108, 111, 103, 40, 52, 41)); diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/a.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/a.js new file mode 100644 index 00000000..d00608ab --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/a.js @@ -0,0 +1 @@ +var k = "constructor"; ""[k].prototype.trim = function () { return "q"; }; diff --git a/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/b.js b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/b.js new file mode 100644 index 00000000..a256bab7 --- /dev/null +++ b/crates/untwist/tests/data/rename_a25rr/multi/rx11-f1y/b.js @@ -0,0 +1 @@ +console.log(" x ".trim()); diff --git a/crates/untwist/tests/rename_a25rr_rows.rs b/crates/untwist/tests/rename_a25rr_rows.rs index ec3ff0c1..9a8c3904 100644 --- a/crates/untwist/tests/rename_a25rr_rows.rs +++ b/crates/untwist/tests/rename_a25rr_rows.rs @@ -39,6 +39,8 @@ const UNSAFE_PREMISE_MULTI: &[(&str, RenameMode)] = &[ const UNSAFE_PREMISE_MULTI_EVERY_MODE: &[&str] = &[ "rx11-m1", "rx11-m2", "rx11-m3", "rx11-m4", "rx11-m5", "rx11-m6", "rx11-m7", "rx11-m8", + "rx11-f1a", "rx11-f1b", "rx11-f1c", "rx11-f1d", "rx11-f1e", "rx11-f1f", "rx11-f1g", "rx11-f1h", + "rx11-f1i", "rx11-f1j", "rx11-f1k", "rx11-f1l", "rx11-f1m", "rx11-f1x", "rx11-f1y", ]; const OBSERVED_INPUT: &str = "a.js"; From d25acaea618c5350181da7e07597a114c30875c1 Mon Sep 17 00:00:00 2001 From: sorte1 Date: Sat, 21 Nov 2026 00:46:12 +0100 Subject: [PATCH 6/6] ci(web): wasm baseline 15,010,000 (cap 16,511,000) for 16,509,891 bytes with the unresolved-key chain reads --- web/scripts/size.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/scripts/size.ts b/web/scripts/size.ts index 9ba164a7..79c15fc7 100644 --- a/web/scripts/size.ts +++ b/web/scripts/size.ts @@ -12,7 +12,7 @@ const INITIAL_JS_GZIP = 190_000; const CSS_GZIP = 15_000; const FONT_BYTES = 120_000; const SW_GZIP = 4_000; -const WASM_BASELINE_BYTES = 14_983_000; +const WASM_BASELINE_BYTES = 15_010_000; const WASM_GROWTH = 0.1; const gzip = (bytes: Buffer): number => gzipSync(bytes, { level: 9 }).length;