AG-41743 Fix 'trusted-suppress-native-method' — reset 'isMatchingSuspended' when stack is not matched. #496

Squashed commit of the following:

commit 6bf2247
Author: Adam Wróblewski <[email protected]>
Date:   Tue Apr 22 14:27:15 2025 +0200

    Fix 'trusted-suppress-native-method' — reset 'isMatchingSuspended' when stack is not matched

Author: AdamWr

CHANGELOG.md

@@ -23,10 +23,16 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 - Improved docs for `json-prune`, `xml-prune` and `trusted-prune-inbound-object` scriptlets [#392].
 
+### Fixed
+
+- `trusted-suppress-native-method` scriptlet, `isMatchingSuspended` was not reset when the stack does not match,
+  so in some cases given method was not prevented [#496].
+
 [Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v2.1.7...HEAD
 [#392]: https://github.com/AdguardTeam/Scriptlets/issues/392
 [#416]: https://github.com/AdguardTeam/Scriptlets/issues/416
 [#477]: https://github.com/AdguardTeam/Scriptlets/issues/477
+[#496]: https://github.com/AdguardTeam/Scriptlets/issues/496
 
 ## [v2.1.7] - 2025-04-03
 

src/scriptlets/trusted-suppress-native-method.ts

@@ -188,6 +188,7 @@ export function trustedSuppressNativeMethod(
         isMatchingSuspended = true;
 
         if (stack && !matchStackTrace(stack, new Error().stack || '')) {
+            isMatchingSuspended = false;
             return Reflect.apply(target, thisArg, argumentsList);
         }
         const isMatching = matchMethodCall(argumentsList, signatureMatcher);

tests/scriptlets/trusted-suppress-native-method.test.js

@@ -16,6 +16,7 @@ const natives = {
     'Array.isArray': Array.isArray,
     'Node.prototype.appendChild': Node.prototype.appendChild,
     'Document.prototype.querySelectorAll': Document.prototype.querySelectorAll,
+    'Document.prototype.querySelector': Document.prototype.querySelector,
 };
 
 const restoreNativeMethod = (path) => {
@@ -307,4 +308,23 @@ test('Match: stack trace', (assert) => {
 
     assert.notOk(window.testMatching('test'), 'Call was prevented');
     assert.strictEqual(window.hit, 'FIRED', 'hit func executed');
+
+    runScriptlet(name, [
+        'Document.prototype.querySelector',
+        '"body"',
+        'prevent',
+        'testFunc',
+    ]);
+
+    const testFunc = () => document.querySelector('body');
+    const result = testFunc();
+    assert.strictEqual(result, undefined, 'testFunc should return undefined when prevented');
+
+    const test = () => document.querySelector('body');
+    const result2 = test();
+    assert.ok(result2 instanceof HTMLElement, 'test should return HTMLElement, stack does not match');
+
+    const testFunc1 = () => document.querySelector('body');
+    const result3 = testFunc1();
+    assert.strictEqual(result3, undefined, 'testFunc1 should return undefined when prevented');
 });