@browserless.io/browserless 2.34.1 → 2.36.0

package/extensions/ublocklite/_locales/sq/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
-    "message": "Zhvilloni",
+    "message": "Zhvillimi",
     "description": "appears as tab name in dashboard. Inspired from 'Develop' menu in Safari, see https://developer.apple.com/documentation/safari-developer-tools/develop-menu"
   },
   "aboutPageName": {
@@ -36,11 +36,11 @@
     "description": "Label in the popup panel for the current filtering mode"
   },
   "popupLocalToolsLabel": {
-    "message": "Në këtë faqe interneti",
+    "message": "Në këtë uebsajt",
     "description": "Label in the popup panel for the local tools section"
   },
   "popupTipReport": {
-    "message": "Raportoj problemin me uebsajtin",
+    "message": "Raportoj problemin",
     "description": "Tooltip used for the 'chat' icon in the panel"
   },
   "popupTipDashboard": {
@@ -68,7 +68,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupMalware": {
-    "message": "Domenet e dëmshme",
+    "message": "Domenet e dëmshme, siguria",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupAnnoyances": {
@@ -244,7 +244,7 @@
     "description": "Short description for a checkbox in the options page"
   },
   "developerModeLabel": {
-    "message": "Modaliteti i zhvilluesit",
+    "message": "Këndi i zhvilluesit",
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
@@ -292,7 +292,7 @@
     "description": "A button to navigate to the blocked page"
   },
   "zapperTipEnter": {
-    "message": "Aktivizoj asgjësuesin e elementeve",
+    "message": "Heq elementin",
     "description": "Tooltip for the button used to enter zapper mode"
   },
   "zapperTipQuit": {
@@ -300,11 +300,11 @@
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
-    "message": "Krijo filtër të personalizuar",
+    "message": "Krijoj filtër të personalizuar",
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "Hiq një filtër të personalizuar",
+    "message": "Heq filtrin e personalizuar",
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
@@ -312,7 +312,7 @@
     "description": "A label of a dropdown list"
   },
   "developOptionFilteringModeDetails": {
-    "message": "Detalet e mënyrës së filtërimit",
+    "message": "Detajet e mënyrës së filtrimit",
     "description": "An option in a dropdown list"
   },
   "developOptionCustomDnrRules": {
@@ -320,7 +320,7 @@
     "description": "An option in a dropdown list"
   },
   "developOptionDnrRulesOf": {
-    "message": "Rregullat DNR të ...",
+    "message": "Rregullat DNR të…",
     "description": "A section header in a dropdown list"
   },
   "developOptionDynamicRuleset": {
@@ -328,11 +328,11 @@
     "description": "An option in a dropdown list"
   },
   "developOptionSessionRuleset": {
-    "message": "Rregullat e sesionit",
+    "message": "Rregullat e seancës",
     "description": "An option in a dropdown list"
   },
   "saveButton": {
-    "message": "Ruaj",
+    "message": "Regjistroj",
     "description": "Text for buttons used to save changes"
   },
   "revertButton": {
@@ -348,7 +348,7 @@
     "description": "Text for buttons used to export content"
   },
   "dnrRulesWarning": {
-    "message": "Mos shtoni filtra nga burime të pabesueshme.",
+    "message": "Mos shtoni materiale nga burime të pabesueshme",
     "description": "Short description of the DNR rules editor pane"
   },
   "dnrRulesCountInfo": {
@@ -356,15 +356,15 @@
     "description": "Short sentence to report the number of currently registered DNR rules"
   },
   "pickerSliderLabel": {
-    "message": "Lëvizni rrëshqitësin për të zgjedhur përputhjen më të mirë",
+    "message": "Lëvizeni për të zgjedhur pikën më të përshtatshme",
     "description": "Label to describe the purpose of the slider"
   },
   "pickerPick": {
-    "message": "Përzgjedh",
+    "message": "Zgjedh",
     "description": "Text for the button to re-enter element-picking mode"
   },
   "pickerPreview": {
-    "message": "Parapamje",
+    "message": "Parashikoj",
     "description": "Text for the button to activate preview mode"
   },
   "pickerCreate": {
@@ -372,7 +372,7 @@
     "description": "Text for the button to create the filter"
   },
   "unpickerUsage": {
-    "message": "Zgjidh një filtër më poshtë për të nxjerrë në pah elementët që përputhen në faqen e internetit. Klikoni te koshi për të hequr një filtër.",
+    "message": "Zgjidhni ndër filtrat më poshtë për të parë elementin që i korrespondon në faqe. Filtrat hiqen duke klikuar koshin.",
     "description": "Summary description on how to use the tool to remove custom filters"
   }
 }

package/extensions/ublocklite/_locales/th/messages.json

@@ -68,7 +68,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupMalware": {
-    "message": "Malware protection, security",
+    "message": "การป้องกันมัลแวร์ ความปลอดภัย",
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "3pGroupAnnoyances": {

package/extensions/ublocklite/_locales/tr/messages.json

@@ -248,7 +248,7 @@
     "description": "Label for a checkbox in the options page"
   },
   "developerModeLegend": {
-    "message": "Teknik kullanıcılara uygun özelliklere erişime izin ver",
+    "message": "Teknik kullanıcılara uygun özelliklere erişime izin ver.",
     "description": "Short description for a checkbox in the options page"
   },
   "findListsPlaceholder": {

package/extensions/ublocklite/_locales/vi/messages.json

@@ -344,7 +344,7 @@
     "description": "Text for buttons used to import and append content"
   },
   "exportButton": {
-    "message": "Xuất...",
+    "message": "Xuất…",
     "description": "Text for buttons used to export content"
   },
   "dnrRulesWarning": {

package/extensions/ublocklite/css/common.css

@@ -80,7 +80,7 @@ button {
     appearance: none;
     -moz-appearance: none;
     -webkit-appearance: none;
-    border: 0;
+    border: var(--button-border-size) solid var(--ink-1);
     border-radius: var(--button-border-radius);
     background-color: var(--button-surface);
     color: var(--button-ink);
@@ -193,7 +193,7 @@ label:hover .checkbox:not([disabled]) {
     height: 100%;
     margin: 0;
     min-width: var(--checkbox-size);
-    opacity: 0;
+    opacity: var(--native-control-opacity);
     position: absolute;
     width: 100%;
     }
@@ -204,6 +204,7 @@ label:hover .checkbox:not([disabled]) {
     box-sizing: border-box;
     fill: none;
     height: 100%;
+    opacity: calc(1 - var(--native-control-opacity));
     pointer-events: none;
     position: absolute;
     stroke: none;
@@ -242,7 +243,7 @@ label:hover .checkbox:not([disabled]) {
     height: 100%;
     margin: 0;
     min-width: var(--checkbox-size);
-    opacity: 0;
+    opacity: var(--native-control-opacity);
     position: absolute;
     width: 100%;
     }
@@ -250,6 +251,7 @@ label:hover .checkbox:not([disabled]) {
     background-color: transparent;
     box-sizing: border-box;
     height: 100%;
+    opacity: calc(1 - var(--native-control-opacity));
     pointer-events: none;
     position: absolute;
     width: 100%;

package/extensions/ublocklite/css/default.css

@@ -408,8 +408,11 @@
     --fieldset-header-surface: transparent;
     --fieldset-header-ink: var(--ink-2);
 
+    --native-control-opacity: 0;
+
     --button-ink: var(--ink-1);
     --button-surface: rgb(var(--button-surface-rgb));
+    --button-border-size: 0;
     --button-border-radius: 5px;
     --button-preferred-ink: var(--accent-ink-1);
     --button-preferred-surface: var(--accent-surface-1);
@@ -460,6 +463,13 @@
     --popup-ruleset-tool-shadow: transparent;
 }
 
+@media (prefers-contrast: more) {
+    :root {
+        --native-control-opacity: 1;
+        --button-border-size: 1px;
+    }
+}
+
 /*
  * Rule colors
  * */

package/extensions/ublocklite/js/dnr-parser.js

@@ -515,7 +515,7 @@ export function rulesFromText(text) {
         if ( indices.length === 0 ) { continue; }
         const result = ruleFromLines(lines, indices);
         if ( result.bad ) {
-            bad.push(...result.bad);
+            bad.push(...result.bad.slice(4));
         } else if ( result.rule ) {
             rules.push(result.rule);
         }

package/extensions/ublocklite/js/filter-lists.js

@@ -94,10 +94,7 @@ function rulesetStats(rulesetId) {
     const rulesetDetails = rulesetMap.get(rulesetId);
     if ( rulesetDetails === undefined ) { return; }
     const { rules, filters } = rulesetDetails;
-    let ruleCount = rules.plain + rules.regex;
-    if ( cachedRulesetData.hasOmnipotence ) {
-        ruleCount += rules.removeparam + rules.redirect + rules.modifyHeaders;
-    }
+    const ruleCount = rules.plain + rules.regex;
     const filterCount = filters.accepted;
     return { ruleCount, filterCount };
 }

package/extensions/ublocklite/js/popup.js

@@ -340,8 +340,6 @@ async function init() {
 
     dom.cl.toggle('#gotoUnpicker', 'enabled', popupPanelData.hasCustomFilters);
 
-    dom.cl.remove(dom.body, 'loading');
-
     return true;
 }
 
@@ -350,6 +348,8 @@ async function tryInit() {
         await init();
     } catch {
         setTimeout(tryInit, 100);
+    } finally {
+        dom.cl.remove(dom.body, 'loading');
     }
 }
 

package/extensions/ublocklite/js/ruleset-manager.js

@@ -30,13 +30,13 @@ import {
     rulesetConfig,
     saveRulesetConfig,
 } from './config.js';
+import { ubolErr, ubolLog } from './debug.js';
 
 import { dnr } from './ext-compat.js';
 import { fetchJSON } from './fetch.js';
 import { getAdminRulesets } from './admin.js';
 import { hasBroadHostPermissions } from './utils.js';
 import { rulesFromText } from './dnr-parser.js';
-import { ubolErr, ubolLog } from './debug.js';
 
 /******************************************************************************/
 
@@ -131,9 +131,8 @@ pruneInvalidRegexRules.validated = new Map();
 async function updateRegexRules(currentRules, addRules, removeRuleIds) {
     // Remove existing regex-related block rules
     for ( const rule of currentRules ) {
+        if ( rule.id === 0 ) { continue; }
         if ( rule.id >= SPECIAL_RULES_REALM ) { continue; }
-        const { type } = rule.action;
-        if ( type !== 'block' && type !== 'allow' ) { continue; }
         if ( rule.condition.regexFilter === undefined ) { continue; }
         removeRuleIds.push(rule.id);
     }
@@ -167,134 +166,19 @@ async function updateRegexRules(currentRules, addRules, removeRuleIds) {
 
 /******************************************************************************/
 
-async function updateRemoveparamRules(currentRules, addRules, removeRuleIds) {
-    // Remove existing removeparam-related rules
-    for ( const rule of currentRules ) {
-        if ( rule.id >= SPECIAL_RULES_REALM ) { continue; }
-        if ( rule.action.type !== 'redirect' ) { continue; }
-        if ( rule.action.redirect.transform === undefined ) { continue; }
-        removeRuleIds.push(rule.id);
-    }
-
-    const rulesetDetails = await getEnabledRulesetsDetails();
-
-    // Fetch removeparam rules for all enabled rulesets
-    const toFetch = [];
-    for ( const details of rulesetDetails ) {
-        if ( details.rules.removeparam === 0 ) { continue; }
-        toFetch.push(fetchJSON(`/rulesets/removeparam/${details.id}`));
-    }
-    const removeparamRulesets = await Promise.all(toFetch);
-
-    const allRules = [];
-    for ( const rules of removeparamRulesets ) {
-        if ( Array.isArray(rules) === false ) { continue; }
-        for ( const rule of rules ) {
-            allRules.push(rule);
-        }
-    }
-    if ( allRules.length === 0 ) { return; }
-
-    const validRules = await pruneInvalidRegexRules('removeparam', allRules);
-    if ( validRules.length === 0 ) { return; }
-
-    ubolLog(`Add ${validRules.length} DNR removeparam rules`);
-    addRules.push(...validRules);
-}
-
-/******************************************************************************/
-
-async function updateRedirectRules(currentRules, addRules, removeRuleIds) {
-    // Remove existing redirect-related rules
-    for ( const rule of currentRules ) {
-        if ( rule.id >= SPECIAL_RULES_REALM ) { continue; }
-        if ( rule.action.type !== 'redirect' ) { continue; }
-        if ( rule.action.redirect.extensionPath === undefined ) { continue; }
-        removeRuleIds.push(rule.id);
-    }
-
-    const rulesetDetails = await getEnabledRulesetsDetails();
-
-    // Fetch redirect rules for all enabled rulesets
-    const toFetch = [];
-    for ( const details of rulesetDetails ) {
-        if ( details.rules.redirect === 0 ) { continue; }
-        toFetch.push(fetchJSON(`/rulesets/redirect/${details.id}`));
-    }
-    const redirectRulesets = await Promise.all(toFetch);
-
-    const allRules = [];
-    for ( const rules of redirectRulesets ) {
-        if ( Array.isArray(rules) === false ) { continue; }
-        for ( const rule of rules ) {
-            allRules.push(rule);
-        }
-    }
-    if ( allRules.length === 0 ) { return; }
-
-    const validRules = await pruneInvalidRegexRules('redirect', allRules);
-    if ( validRules.length === 0 ) { return; }
-
-    ubolLog(`Add ${validRules.length} DNR redirect rules`);
-    addRules.push(...validRules);
-}
-
-/******************************************************************************/
-
-async function updateModifyHeadersRules(currentRules, addRules, removeRuleIds) {
-    // Remove existing header modification-related rules
-    for ( const rule of currentRules ) {
-        if ( rule.id >= SPECIAL_RULES_REALM ) { continue; }
-        if ( rule.action.type !== 'modifyHeaders' ) { continue; }
-        removeRuleIds.push(rule.id);
-    }
-
-    const rulesetDetails = await getEnabledRulesetsDetails();
-
-    // Fetch modifyHeaders rules for all enabled rulesets
-    const toFetch = [];
-    for ( const details of rulesetDetails ) {
-        if ( details.rules.modifyHeaders === 0 ) { continue; }
-        toFetch.push(fetchJSON(`/rulesets/modify-headers/${details.id}`));
-    }
-    const rulesets = await Promise.all(toFetch);
-
-    const allRules = [];
-    for ( const rules of rulesets ) {
-        if ( Array.isArray(rules) === false ) { continue; }
-        for ( const rule of rules ) {
-            allRules.push(rule);
-        }
-    }
-    if ( allRules.length === 0 ) { return; }
-
-    const validRules = await pruneInvalidRegexRules('modify-headers', allRules);
-    if ( validRules.length === 0 ) { return; }
-
-    ubolLog(`Add ${validRules.length} DNR modify-headers rules`);
-    addRules.push(...validRules);
-}
-
-/******************************************************************************/
-
 async function updateDynamicRules() {
     const currentRules = await dnr.getDynamicRules();
     const addRules = [];
     const removeRuleIds = [];
 
-    // Remove potentially left-over strict-block rules from previous version
+    // Remove potentially left-over rules from previous version
     for ( const rule of currentRules ) {
         if ( rule.id >= SPECIAL_RULES_REALM ) { continue; }
-        if ( isStrictBlockRule(rule) === false ) { continue; }
         removeRuleIds.push(rule.id);
+        rule.id = 0;
     }
 
-    await Promise.all([
-        updateRegexRules(currentRules, addRules, removeRuleIds),
-        updateRemoveparamRules(currentRules, addRules, removeRuleIds),
-        updateRedirectRules(currentRules, addRules, removeRuleIds),
-        updateModifyHeadersRules(currentRules, addRules, removeRuleIds),
-    ]);
+    await updateRegexRules(currentRules, addRules, removeRuleIds);
     if ( addRules.length === 0 && removeRuleIds.length === 0 ) { return; }
 
     dynamicRegexCount = 0;

package/extensions/ublocklite/js/rw-dnr-editor.js

@@ -376,17 +376,21 @@ export class ReadWriteDNREditor extends DNREditor {
             separatorBefore = true;
         }
         const pastedText = newDoc.sliceString(from, to);
-        let prepend;
+        let linesToPrepend;
         let rules = this.rulesFromJSON(pastedText);
         if ( Boolean(rules?.length) === false ) {
             rules = parseFilters(pastedText);
             if ( Boolean(rules?.length) === false ) { return; }
-            prepend = pastedText.trim().split(/\n/).map(a => `# ${a}`).join('\n');
+            const lines = pastedText.trim().split(/\n/);
+            linesToPrepend = lines.slice(0, 10).map(a => `# ${a}`);
+            if ( lines.length > linesToPrepend.length ) {
+                linesToPrepend.push('# ...');
+            }
         }
         let yamlText = textFromRules(rules);
         if ( yamlText === undefined ) { return; }
-        if ( prepend ) {
-            yamlText = yamlText.replace('---\n', `---\n${prepend}\n`);
+        if ( linesToPrepend ) {
+            yamlText = yamlText.replace('---\n', `---\n${linesToPrepend.join('\n')}\n`);
         }
         if ( separatorBefore && yamlText.startsWith('---\n') ) {
             yamlText = yamlText.slice(4);

package/extensions/ublocklite/js/scripting/tool-overlay.js

@@ -262,6 +262,7 @@ self.ubolOverlay = {
             }
             return this.proceduralFiltererAPI.qsa(selector);
         }
+        selector = selector.replace(/::[^:]+$/, '');
         try {
             const elems = node.querySelectorAll(selector);
             this.qsa.error = undefined;

package/extensions/ublocklite/js/settings.js

@@ -242,9 +242,10 @@ sendMessage({
         renderAdminRules();
         renderFilterLists(cachedRulesetData);
         renderWidgets();
-        dom.cl.remove(dom.body, 'loading');
     } catch(reason) {
         console.error(reason);
+    } finally {
+        dom.cl.remove(dom.body, 'loading');
     }
     listen();
 }).catch(reason => {

package/extensions/ublocklite/js/static-filtering-parser.js

@@ -1245,7 +1245,7 @@ export class AstFilterParser {
         let modifierType = 0;
         let requestTypeCount = 0;
         let unredirectableTypeCount = 0;
-        let badfilter = false;
+        let isBadfilter = false;
         for ( let i = 0, n = this.nodeTypeRegisterPtr; i < n; i++ ) {
             const type = this.nodeTypeRegister[i];
             const targetNode = this.nodeTypeLookupTable[type];
@@ -1269,7 +1269,7 @@ export class AstFilterParser {
                 realBad = hasValue;
                 break;
             case NODE_TYPE_NET_OPTION_NAME_BADFILTER:
-                badfilter = true;
+                isBadfilter = true;
                 /* falls through */
             case NODE_TYPE_NET_OPTION_NAME_NOOP:
                 realBad = isNegated || hasValue;
@@ -1423,9 +1423,6 @@ export class AstFilterParser {
                 this.addFlags(AST_FLAG_HAS_ERROR);
             }
         }
-        const requiresTrustedSource = ( ) =>
-            this.options.trustedSource !== true &&
-            isException === false && badfilter === false;
         switch ( modifierType ) {
         case NODE_TYPE_NET_OPTION_NAME_CNAME:
             realBad = abstractTypeCount || behaviorTypeCount || requestTypeCount;
@@ -1453,7 +1450,8 @@ export class AstFilterParser {
         case NODE_TYPE_NET_OPTION_NAME_REPLACE: {
             realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
             if ( realBad ) { break; }
-            if ( requiresTrustedSource() ) {
+            if ( isException || isBadfilter ) { break; }
+            if ( this.options.trustedSource !== true ) {
                 this.astError = AST_ERROR_UNTRUSTED_SOURCE;
                 realBad = true;
                 break;
@@ -1468,7 +1466,8 @@ export class AstFilterParser {
         case NODE_TYPE_NET_OPTION_NAME_URLSKIP: {
             realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
             if ( realBad ) { break; }
-            if ( requiresTrustedSource() ) {
+            if ( isException || isBadfilter ) { break; }
+            if ( this.options.trustedSource !== true ) {
                 this.astError = AST_ERROR_UNTRUSTED_SOURCE;
                 realBad = true;
                 break;
@@ -1483,7 +1482,8 @@ export class AstFilterParser {
         case NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM: {
             realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
             if ( realBad ) { break; }
-            if ( requiresTrustedSource() ) {
+            if ( isException || isBadfilter ) { break; }
+            if ( this.options.trustedSource !== true ) {
                 this.astError = AST_ERROR_UNTRUSTED_SOURCE;
                 realBad = true;
                 break;