AG-50540 Improve prevent-window-open — match '_blank'. #549

Squashed commit of the following:

commit ebf2e31
Merge: 2385c99 1d852ea
Author: Adam Wróblewski <adam@adguard.com>
Date:   Tue Mar 3 08:52:49 2026 +0100

    Merge branch 'master' into feature/AG-50540

commit 2385c99
Author: Adam Wróblewski <adam@adguard.com>
Date:   Fri Feb 27 14:29:04 2026 +0100

    Fix changelog

commit c9a9af4
Author: Adam Wróblewski <adam@adguard.com>
Date:   Fri Feb 27 14:23:18 2026 +0100

    Add combineArgs helper

commit 268a376
Author: Adam Wróblewski <adam@adguard.com>
Date:   Fri Feb 27 14:12:55 2026 +0100

    Update `prevent-window-open` to check all parameters

Author: AdamWr

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
   across `abort-on-property-read`, `abort-on-property-write`, `abort-on-stack-trace`,
   `abort-current-inline-script`, `debug-on-property-write`, `debug-on-property-read`,
   `debug-current-inline-script` and `log-on-stack-trace` scriptlets [#513].
+- `prevent-window-open` now checks all parameters [#549].
 
 ### Fixed
 
@@ -30,6 +31,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 [Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v2.2.16...HEAD
 [#513]: https://github.com/AdguardTeam/Scriptlets/issues/513
 [#545]: https://github.com/AdguardTeam/Scriptlets/issues/545
+[#549]: https://github.com/AdguardTeam/Scriptlets/issues/549
 
 ## [v2.2.16] - 2026-02-19
 

src/scriptlets/prevent-window-open.js

@@ -22,7 +22,7 @@ import {
  * @scriptlet prevent-window-open
  *
  * @description
- * Prevents `window.open` calls when URL either matches or not matches the specified string/regexp.
+ * Prevents `window.open` calls when URL or any other parameter either matches or not matches the specified string/regexp.
  * Using it without parameters prevents all `window.open` calls.
  *
  * Related UBO scriptlet:
@@ -102,6 +102,20 @@ export function preventWindowOpen(source, match = '*', delay, replacement) {
     const nativeOpen = window.open;
     const isNewSyntax = match !== '0' && match !== '1';
 
+    /**
+     * Combine `url` and additional `args` into a single string for matching.
+     *
+     * @param {string} url - The URL or first argument passed to `window.open`.
+     * @param {Array<string>|undefined} args - Additional arguments to include.
+     * @returns {string} The concatenated string used for matching.
+     */
+    const combineArgs = (url, args) => {
+        if (args && args.length > 0) {
+            return `${url} ${args.join(' ')}`;
+        }
+        return url;
+    };
+
     const oldOpenWrapper = (str, ...args) => {
         match = Number(match) > 0;
         // 'delay' was 'search' prop for matching in old syntax
@@ -110,7 +124,11 @@ export function preventWindowOpen(source, match = '*', delay, replacement) {
             return nativeOpen.apply(window, [str, ...args]);
         }
         const searchRegexp = toRegExp(delay);
-        if (match !== searchRegexp.test(str)) {
+
+        // Check all arguments of window.open, not only the first one
+        // https://github.com/AdguardTeam/Scriptlets/issues/549
+        const argsToCheck = combineArgs(str, args);
+        if (match !== searchRegexp.test(argsToCheck)) {
             return nativeOpen.apply(window, [str, ...args]);
         }
         hit(source);
@@ -133,7 +151,10 @@ export function preventWindowOpen(source, match = '*', delay, replacement) {
             shouldPrevent = true;
         } else if (isValidMatchStr(match)) {
             const { isInvertedMatch, matchRegexp } = parseMatchArg(match);
-            shouldPrevent = matchRegexp.test(url) !== isInvertedMatch;
+            // Check all arguments of window.open, not only the first one
+            // https://github.com/AdguardTeam/Scriptlets/issues/549
+            const argsToCheck = combineArgs(url, args);
+            shouldPrevent = matchRegexp.test(argsToCheck) !== isInvertedMatch;
         } else {
             logMessage(source, `Invalid parameter: ${match}`);
             shouldPrevent = false;

tests/scriptlets/prevent-window-open.test.js

@@ -96,6 +96,13 @@ test('old syntax: does not work - invalid regexp pattern', (assert) => {
     assert.ok(window[CHECK_PROP], 'window.open has been executed');
 });
 
+test('old syntax: target parameter ', (assert) => {
+    const scriptletArgs = ['1', '_blank'];
+    runScriptlet(name, scriptletArgs);
+    window.open('test url', '_blank');
+    assert.equal(window.hit, 'value', 'Hit function was executed');
+});
+
 test('new syntax: no args', (assert) => {
     runScriptlet(name);
     window.open('some url');
@@ -252,3 +259,10 @@ test('new syntax: invalid regexp', (assert) => {
     window.open('test url', 'some target');
     assert.equal(window.hit, undefined, 'Hit function was executed');
 });
+
+test('new syntax: target parameter ', (assert) => {
+    const scriptletArgs = ['_blank'];
+    runScriptlet(name, scriptletArgs);
+    window.open('foo bar baz', '_blank');
+    assert.equal(window.hit, 'value', 'Hit function was executed');
+});