@browserless.io/browserless 2.32.1 → 2.33.0

package/extensions/ublocklite/rulesets/scripting/scriptlet/adguard-mobile.remove-class.js

@@ -315,8 +315,8 @@ function safeSelf() {
 /******************************************************************************/
 
 const scriptletGlobals = {}; // eslint-disable-line
-const argsList = [["banners-brand","#page_content"],["fixed_ad","#header.fixed_ad"],["hasStickyHead","body.hasStickyHead"],["pt-[100px]","#main-container"],["mobile-sticky-ad-is-active","body"],["branding","body[id=\"pagebody\"]"],["branding","body"],["has-adhesion",".header-placeholder.has-adhesion"]];
-const hostnamesMap = new Map([["m.7days.ru",0],["thestudentroom.co.uk",1],["lepoint.fr",2],["mumsnet.com",3],["liquipedia.net",4],["www.ixbt.com",5],["slovoidilo.ua",6],["accuweather.com",7]]);
+const argsList = [["banners-brand","#page_content"],["fixed_ad","#header.fixed_ad"],["hasStickyHead","body.hasStickyHead"],["pt-[100px]","#main-container"],["mobile-sticky-ad-is-active","body"],["branding","body[id=\"pagebody\"]"],["i4It-cmp2-toaster-visible",".i4It"],["branding","body"],["has-adhesion",".header-placeholder.has-adhesion"]];
+const hostnamesMap = new Map([["m.7days.ru",0],["thestudentroom.co.uk",1],["lepoint.fr",2],["mumsnet.com",3],["liquipedia.net",4],["www.ixbt.com",5],["kayak.com.tr",6],["slovoidilo.ua",7],["accuweather.com",8]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;

package/extensions/ublocklite/rulesets/scripting/scriptlet/adguard-mobile.set-cookie-reload.js

@@ -366,7 +366,7 @@ function getCookieFn(
 
 const scriptletGlobals = {}; // eslint-disable-line
 const argsList = [["pShowMob","true"]];
-const hostnamesMap = new Map([["interxh.site",0],["xhspot.com",0],["xhwide5.com",0],["xhchannel.com",0],["xhtotal.com",0],["xhtree.com",0],["xhwide2.com",0],["xhlease.world",0],["xhamsterporno.mx",0],["valuexh.life",0],["xhdate.world",0],["xhbranch5.com",0],["galleryxh.site",0],["xhbig.com",0],["xhaccess.com",0],["xhofficial.com",0],["seexh.com",0],["xhamster42.desi",0],["xhvid.com",0],["xhamster20.desi",0],["xhamster19.desi",0],["xhwebsite2.com",0],["xhamster18.desi",0],["xhadult3.com",0],["xhadult2.com",0],["xhmoon5.com",0],["xhwide1.com",0],["xhamster3.com",0],["xhplanet2.com",0],["megaxh.com",0],["xhamster16.*",0],["xhamster.com",0],["xhamster2.com",0],["xhamster7.com",0],["xhamster8.com",0],["xhamster9.com",0],["xhamster10.com",0],["xhamster12.com",0],["xhamster13.*",0],["xhamster14.com",0],["xhamster15.com",0],["xhamster17.*",0],["xhamster18.*",0],["xhamster19.com",0],["xhamster1.desi",0],["xhamster2.desi",0],["xhamster3.*",0],["xhamster4.desi",0],["xhamster20.com",0],["xhamster22.com",0],["xhamster23.com",0],["xhamster25.com",0],["xhamster26.com",0],["xhamster27.com",0],["openxh.com",0],["xhamster31.com",0],["xhamster32.com",0],["xhamster34.com",0],["xhamster38.com",0],["xhamster5.desi",0],["xhopen.com",0],["openxh1.com",0],["xhamster39.com",0],["xhamster40.com",0],["xhamster.one",0],["xhamster.desi",0],["stripchat.com",0]]);
+const hostnamesMap = new Map([["xhamster43.desi",0],["fullxh.com",0],["interxh.site",0],["xhspot.com",0],["xhwide5.com",0],["xhchannel.com",0],["xhtotal.com",0],["xhtree.com",0],["xhwide2.com",0],["xhlease.world",0],["xhamsterporno.mx",0],["valuexh.life",0],["xhdate.world",0],["xhbranch5.com",0],["galleryxh.site",0],["xhbig.com",0],["xhaccess.com",0],["xhofficial.com",0],["seexh.com",0],["xhamster42.desi",0],["xhvid.com",0],["xhamster20.desi",0],["xhamster19.desi",0],["xhwebsite2.com",0],["xhamster18.desi",0],["xhadult3.com",0],["xhadult2.com",0],["xhmoon5.com",0],["xhwide1.com",0],["xhamster3.com",0],["xhplanet2.com",0],["megaxh.com",0],["xhamster16.*",0],["xhamster.com",0],["xhamster2.com",0],["xhamster7.com",0],["xhamster8.com",0],["xhamster9.com",0],["xhamster10.com",0],["xhamster12.com",0],["xhamster13.*",0],["xhamster14.com",0],["xhamster15.com",0],["xhamster17.*",0],["xhamster18.*",0],["xhamster19.com",0],["xhamster1.desi",0],["xhamster2.desi",0],["xhamster3.*",0],["xhamster4.desi",0],["xhamster22.com",0],["xhamster27.com",0],["openxh.com",0],["xhamster5.desi",0],["xhopen.com",0],["openxh1.com",0],["xhamster40.com",0],["xhamster.one",0],["xhamster.desi",0],["stripchat.com",0]]);
 const exceptionsMap = new Map([]);
 const hasEntities = true;
 const hasAncestors = false;

package/extensions/ublocklite/rulesets/scripting/scriptlet/{annoyances-overlays.href-sanitizer.js → annoyances-cookies.remove-node-text.js}

@@ -20,130 +20,130 @@
 
 */
 
-// ruleset: annoyances-overlays
+// ruleset: annoyances-cookies
 
 // Important!
 // Isolate from global scope
 
 // Start of local scope
-(function uBOL_hrefSanitizer() {
+(function uBOL_removeNodeText() {
 
 /******************************************************************************/
 
-function hrefSanitizer(
-    selector = '',
-    source = ''
+function removeNodeText(
+    nodeName,
+    includes,
+    ...extraArgs
+) {
+    replaceNodeTextFn(nodeName, '', '', 'includes', includes || '', ...extraArgs);
+}
+
+function replaceNodeTextFn(
+    nodeName = '',
+    pattern = '',
+    replacement = ''
 ) {
-    if ( typeof selector !== 'string' ) { return; }
-    if ( selector === '' ) { return; }
     const safe = safeSelf();
-    const logPrefix = safe.makeLogPrefix('href-sanitizer', selector, source);
-    if ( source === '' ) { source = 'text'; }
-    const sanitizeCopycats = (href, text) => {
-        let elems = [];
-        try {
-            elems = document.querySelectorAll(`a[href="${href}"`);
-        }
-        catch {
-        }
-        for ( const elem of elems ) {
-            elem.setAttribute('href', text);
+    const logPrefix = safe.makeLogPrefix('replace-node-text.fn', ...Array.from(arguments));
+    const reNodeName = safe.patternToRegex(nodeName, 'i', true);
+    const rePattern = safe.patternToRegex(pattern, 'gms');
+    const extraArgs = safe.getExtraArgs(Array.from(arguments), 3);
+    const reIncludes = extraArgs.includes || extraArgs.condition
+        ? safe.patternToRegex(extraArgs.includes || extraArgs.condition, 'ms')
+        : null;
+    const reExcludes = extraArgs.excludes
+        ? safe.patternToRegex(extraArgs.excludes, 'ms')
+        : null;
+    const stop = (takeRecord = true) => {
+        if ( takeRecord ) {
+            handleMutations(observer.takeRecords());
         }
-        return elems.length;
-    };
-    const validateURL = text => {
-        if ( typeof text !== 'string' ) { return ''; }
-        if ( text === '' ) { return ''; }
-        if ( /[\x00-\x20\x7f]/.test(text) ) { return ''; }
-        try {
-            const url = new URL(text, document.location);
-            return url.href;
-        } catch {
-        }
-        return '';
-    };
-    const extractParam = (href, source) => {
-        if ( Boolean(source) === false ) { return href; }
-        const recursive = source.includes('?', 1);
-        const end = recursive ? source.indexOf('?', 1) : source.length;
-        try {
-            const url = new URL(href, document.location);
-            let value = url.searchParams.get(source.slice(1, end));
-            if ( value === null ) { return href }
-            if ( recursive ) { return extractParam(value, source.slice(end)); }
-            return value;
-        } catch {
+        observer.disconnect();
+        if ( safe.logLevel > 1 ) {
+            safe.uboLog(logPrefix, 'Quitting');
         }
-        return href;
     };
-    const extractURL = (elem, source) => {
-        if ( /^\[.*\]$/.test(source) ) {
-            return elem.getAttribute(source.slice(1,-1).trim()) || '';
-        }
-        if ( source === 'text' ) {
-            return elem.textContent
-                .replace(/^[^\x21-\x7e]+/, '') // remove leading invalid characters
-                .replace(/[^\x21-\x7e]+$/, '') // remove trailing invalid characters
-            ;
+    const textContentFactory = (( ) => {
+        const out = { createScript: s => s };
+        const { trustedTypes: tt } = self;
+        if ( tt instanceof Object ) {
+            if ( typeof tt.getPropertyType === 'function' ) {
+                if ( tt.getPropertyType('script', 'textContent') === 'TrustedScript' ) {
+                    return tt.createPolicy(getRandomTokenFn(), out);
+                }
+            }
         }
-        if ( source.startsWith('?') === false ) { return ''; }
-        const steps = source.replace(/(\S)\?/g, '\\1?').split(/\s+/);
-        const url = steps.length === 1
-            ? extractParam(elem.href, source)
-            : urlSkip(elem.href, false, steps);
-        if ( url === undefined ) { return; }
-        return url.replace(/ /g, '%20');
-    };
-    const sanitize = ( ) => {
-        let elems = [];
-        try {
-            elems = document.querySelectorAll(selector);
+        return out;
+    })();
+    let sedCount = extraArgs.sedCount || 0;
+    const handleNode = node => {
+        const before = node.textContent;
+        if ( reIncludes ) {
+            reIncludes.lastIndex = 0;
+            if ( safe.RegExp_test.call(reIncludes, before) === false ) { return true; }
         }
-        catch {
-            return false;
+        if ( reExcludes ) {
+            reExcludes.lastIndex = 0;
+            if ( safe.RegExp_test.call(reExcludes, before) ) { return true; }
         }
-        for ( const elem of elems ) {
-            if ( elem.localName !== 'a' ) { continue; }
-            if ( elem.hasAttribute('href') === false ) { continue; }
-            const href = elem.getAttribute('href');
-            const text = extractURL(elem, source);
-            const hrefAfter = validateURL(text);
-            if ( hrefAfter === '' ) { continue; }
-            if ( hrefAfter === href ) { continue; }
-            elem.setAttribute('href', hrefAfter);
-            const count = sanitizeCopycats(href, hrefAfter);
-            safe.uboLog(logPrefix, `Sanitized ${count+1} links to\n${hrefAfter}`);
+        rePattern.lastIndex = 0;
+        if ( safe.RegExp_test.call(rePattern, before) === false ) { return true; }
+        rePattern.lastIndex = 0;
+        const after = pattern !== ''
+            ? before.replace(rePattern, replacement)
+            : replacement;
+        node.textContent = node.nodeName === 'SCRIPT'
+            ? textContentFactory.createScript(after)
+            : after;
+        if ( safe.logLevel > 1 ) {
+            safe.uboLog(logPrefix, `Text before:\n${before.trim()}`);
         }
-        return true;
+        safe.uboLog(logPrefix, `Text after:\n${after.trim()}`);
+        return sedCount === 0 || (sedCount -= 1) !== 0;
     };
-    let observer, timer;
-    const onDomChanged = mutations => {
-        if ( timer !== undefined ) { return; }
-        let shouldSanitize = false;
+    const handleMutations = mutations => {
         for ( const mutation of mutations ) {
-            if ( mutation.addedNodes.length === 0 ) { continue; }
             for ( const node of mutation.addedNodes ) {
-                if ( node.nodeType !== 1 ) { continue; }
-                shouldSanitize = true;
-                break;
+                if ( reNodeName.test(node.nodeName) === false ) { continue; }
+                if ( handleNode(node) ) { continue; }
+                stop(false); return;
             }
-            if ( shouldSanitize ) { break; }
         }
-        if ( shouldSanitize === false ) { return; }
-        timer = safe.onIdle(( ) => {
-            timer = undefined;
-            sanitize();
-        });
     };
-    const start = ( ) => {
-        if ( sanitize() === false ) { return; }
-        observer = new MutationObserver(onDomChanged);
-        observer.observe(document.body, {
-            subtree: true,
-            childList: true,
-        });
-    };
-    runAt(( ) => { start(); }, 'interactive');
+    const observer = new MutationObserver(handleMutations);
+    observer.observe(document, { childList: true, subtree: true });
+    if ( document.documentElement ) {
+        const treeWalker = document.createTreeWalker(
+            document.documentElement,
+            NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT
+        );
+        let count = 0;
+        for (;;) {
+            const node = treeWalker.nextNode();
+            count += 1;
+            if ( node === null ) { break; }
+            if ( reNodeName.test(node.nodeName) === false ) { continue; }
+            if ( node === document.currentScript ) { continue; }
+            if ( handleNode(node) ) { continue; }
+            stop(); break;
+        }
+        safe.uboLog(logPrefix, `${count} nodes present before installing mutation observer`);
+    }
+    if ( extraArgs.stay ) { return; }
+    runAt(( ) => {
+        const quitAfter = extraArgs.quitAfter || 0;
+        if ( quitAfter !== 0 ) {
+            setTimeout(( ) => { stop(); }, quitAfter);
+        } else {
+            stop();
+        }
+    }, 'interactive');
+}
+
+function getRandomTokenFn() {
+    const safe = safeSelf();
+    return safe.String_fromCharCode(Date.now() % 26 + 97) +
+        safe.Math_floor(safe.Math_random() * 982451653 + 982451653).toString(36);
 }
 
 function runAt(fn, when) {
@@ -365,103 +365,11 @@ function safeSelf() {
     return safe;
 }
 
-function urlSkip(url, blocked, steps, directive = {}) {
-    try {
-        let redirectBlocked = false;
-        let urlout = url;
-        for ( const step of steps ) {
-            const urlin = urlout;
-            const c0 = step.charCodeAt(0);
-            // Extract from hash
-            if ( c0 === 0x23 && step === '#' ) { // #
-                const pos = urlin.indexOf('#');
-                urlout = pos !== -1 ? urlin.slice(pos+1) : '';
-                continue;
-            }
-            // Extract from URL parameter name at position i
-            if ( c0 === 0x26 ) { // &
-                const i = (parseInt(step.slice(1)) || 0) - 1;
-                if ( i < 0 ) { return; }
-                const url = new URL(urlin);
-                if ( i >= url.searchParams.size ) { return; }
-                const params = Array.from(url.searchParams.keys());
-                urlout = decodeURIComponent(params[i]);
-                continue;
-            }
-            // Enforce https
-            if ( c0 === 0x2B && step === '+https' ) { // +
-                const s = urlin.replace(/^https?:\/\//, '');
-                if ( /^[\w-]:\/\//.test(s) ) { return; }
-                urlout = `https://${s}`;
-                continue;
-            }
-            // Decode
-            if ( c0 === 0x2D ) { // -
-                // Base64
-                if ( step === '-base64' ) {
-                    urlout = self.atob(urlin);
-                    continue;
-                }
-                // Safe Base64
-                if ( step === '-safebase64' ) {
-                    if ( urlSkip.safeBase64Replacer === undefined ) {
-                        urlSkip.safeBase64Map = { '-': '+', '_': '/' };
-                        urlSkip.safeBase64Replacer = s => urlSkip.safeBase64Map[s];
-                    }
-                    urlout = urlin.replace(/[-_]/g, urlSkip.safeBase64Replacer);
-                    urlout = self.atob(urlout);
-                    continue;
-                }
-                // URI component
-                if ( step === '-uricomponent' ) {
-                    urlout = decodeURIComponent(urlin);
-                    continue;
-                }
-                // Enable skip of blocked requests
-                if ( step === '-blocked' ) {
-                    redirectBlocked = true;
-                    continue;
-                }
-            }
-            // Regex extraction from first capture group
-            if ( c0 === 0x2F ) { // /
-                const re = directive.cache ?? new RegExp(step.slice(1, -1));
-                if ( directive.cache === null ) {
-                    directive.cache = re;
-                }
-                const match = re.exec(urlin);
-                if ( match === null ) { return; }
-                if ( match.length <= 1 ) { return; }
-                urlout = match[1];
-                continue;
-            }
-            // Extract from URL parameter
-            if ( c0 === 0x3F ) { // ?
-                urlout = (new URL(urlin)).searchParams.get(step.slice(1));
-                if ( urlout === null ) { return; }
-                if ( urlout.includes(' ') ) {
-                    urlout = urlout.replace(/ /g, '%20');
-                }
-                continue;
-            }
-            // Unknown directive
-            return;
-        }
-        const urlfinal = new URL(urlout);
-        if ( urlfinal.protocol !== 'https:' ) {
-            if ( urlfinal.protocol !== 'http:' ) { return; }
-        }
-        if ( blocked && redirectBlocked !== true ) { return; }
-        return urlout;
-    } catch {
-    }
-}
-
 /******************************************************************************/
 
 const scriptletGlobals = {}; // eslint-disable-line
-const argsList = [["a[href^=\"https://steamcommunity.com/linkfilter/?u=http\"]","?u"]];
-const hostnamesMap = new Map([["store.steampowered.com",0]]);
+const argsList = [["script","realCookieBanner"]];
+const hostnamesMap = new Map([["minaprotocol.com",0]]);
 const exceptionsMap = new Map([]);
 const hasEntities = false;
 const hasAncestors = false;
@@ -529,7 +437,7 @@ if ( hasAncestors ) {
 // Apply scriplets
 for ( const i of todoIndices ) {
     if ( tonotdoIndices.has(i) ) { continue; }
-    try { hrefSanitizer(...argsList[i]); }
+    try { removeNodeText(...argsList[i]); }
     catch { }
 }