@browserless.io/browserless 2.27.0 → 2.28.0

package/extensions/ublocklite/js/background.js

@@ -31,15 +31,6 @@ import {
     syncWithBrowserPermissions,
 } from './mode-manager.js';
 
-import {
-    adminRead,
-    browser,
-    dnr,
-    localRead, localRemove, localWrite,
-    runtime,
-    windows,
-} from './ext.js';
-
 import {
     adminReadEx,
     getAdminRulesets,
@@ -47,9 +38,18 @@ import {
 
 import {
     broadcastMessage,
+    hasBroadHostPermissions,
     hostnamesFromMatches,
 } from './utils.js';
 
+import {
+    browser,
+    dnr,
+    localRead, localRemove, localWrite,
+    runtime,
+    windows,
+} from './ext.js';
+
 import {
     enableRulesets,
     excludeFromStrictBlock,
@@ -93,31 +93,9 @@ function getCurrentVersion() {
 
 /******************************************************************************/
 
-async function hasGreatPowers(origin) {
-    if ( /^https?:\/\//.test(origin) === false ) { return false; }
-    return browser.permissions.contains({
-        origins: [ `${origin}/*` ],
-    });
-}
-
-async function hasOmnipotence() {
-    const manifest = runtime.getManifest();
-    const hasOmnipotence = Array.isArray(manifest.host_permissions) &&
-        manifest.host_permissions.includes('<all_urls>');
-    if ( hasOmnipotence ) { return true; }
-    return browser.permissions.contains({
-        origins: [ '<all_urls>' ],
-    });
-}
-
 async function onPermissionsRemoved() {
-    const beforeMode = await getDefaultFilteringMode();
     const modified = await syncWithBrowserPermissions();
     if ( modified === false ) { return false; }
-    const afterMode = await getDefaultFilteringMode();
-    if ( beforeMode > MODE_BASIC && afterMode <= MODE_BASIC ) {
-        updateDynamicRules();
-    }
     registerInjectables();
     return true;
 }
@@ -126,7 +104,14 @@ async function onPermissionsRemoved() {
 async function onPermissionsAdded(permissions) {
     const details = pendingPermissionRequest;
     pendingPermissionRequest = undefined;
-    if ( details === undefined ) { return; }
+    if ( details === undefined ) {
+        const modified = await syncWithBrowserPermissions();
+        if ( modified === false ) { return; }
+        return Promise.all([
+            updateSessionRules(),
+            registerInjectables(),
+        ]);
+    }
     const defaultMode = await getDefaultFilteringMode();
     if ( defaultMode >= MODE_OPTIMAL ) { return; }
     if ( Array.isArray(permissions.origins) === false ) { return; }
@@ -240,6 +225,7 @@ function onMessage(request, sender, callback) {
 
     case 'getOptionsPageData': {
         Promise.all([
+            hasBroadHostPermissions(),
             getDefaultFilteringMode(),
             getTrustedSites(),
             getRulesetDetails(),
@@ -248,6 +234,7 @@ function onMessage(request, sender, callback) {
             adminReadEx('disabledFeatures'),
         ]).then(results => {
             const [
+                hasOmnipotence,
                 defaultFilteringMode,
                 trustedSites,
                 rulesetDetails,
@@ -256,6 +243,7 @@ function onMessage(request, sender, callback) {
                 disabledFeatures,
             ] = results;
             callback({
+                hasOmnipotence,
                 defaultFilteringMode,
                 trustedSites: Array.from(trustedSites),
                 enabledRulesets,
@@ -314,21 +302,25 @@ function onMessage(request, sender, callback) {
 
     case 'popupPanelData': {
         Promise.all([
+            hasBroadHostPermissions(),
             getFilteringMode(request.hostname),
-            hasOmnipotence(),
-            hasGreatPowers(request.origin),
             getEnabledRulesetsDetails(),
             adminReadEx('disabledFeatures'),
         ]).then(results => {
+            const [
+                hasOmnipotence,
+                level,
+                rulesetDetails,
+                disabledFeatures,
+            ] = results;
             callback({
-                level: results[0],
+                hasOmnipotence,
+                level,
                 autoReload: rulesetConfig.autoReload,
-                hasOmnipotence: results[1],
-                hasGreatPowers: results[2],
-                rulesetDetails: results[3],
+                rulesetDetails,
                 isSideloaded,
                 developerMode: rulesetConfig.developerMode,
-                disabledFeatures: results[4],
+                disabledFeatures,
             });
         });
         return true;
@@ -373,9 +365,6 @@ function onMessage(request, sender, callback) {
                 ({ beforeLevel, afterLevel })
             )
         ).then(({ beforeLevel, afterLevel }) => {
-            if ( beforeLevel === 1 || afterLevel === 1 ) {
-                updateDynamicRules();
-            }
             if ( afterLevel !== beforeLevel ) {
                 registerInjectables();
             }
@@ -497,22 +486,16 @@ async function start() {
         });
     }
 
+    // Switch to basic filtering if uBOL doesn't have broad permissions at
+    // install time.
     if ( process.firstRun ) {
-        const enableOptimal = await hasOmnipotence();
-        if ( enableOptimal ) {
-            const afterLevel = await setDefaultFilteringMode(MODE_OPTIMAL);
-            if ( afterLevel === MODE_OPTIMAL ) {
-                updateDynamicRules();
+        const enableOptimal = await hasBroadHostPermissions();
+        if ( enableOptimal === false ) {
+            const afterLevel = await setDefaultFilteringMode(MODE_BASIC);
+            if ( afterLevel === MODE_BASIC ) {
                 registerInjectables();
                 process.firstRun = false;
             }
-        } else {
-            const disableFirstRunPage = await adminRead('disableFirstRunPage');
-            if ( disableFirstRunPage !== true ) {
-                runtime.openOptionsPage();
-            } else {
-                process.firstRun = false;
-            }
         }
     }
 

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

@@ -90,12 +90,11 @@ function updateNodes(listEntries) {
 /******************************************************************************/
 
 function rulesetStats(rulesetId) {
-    const hasOmnipotence = cachedRulesetData.defaultFilteringMode > 1;
     const rulesetDetails = rulesetMap.get(rulesetId);
     if ( rulesetDetails === undefined ) { return; }
     const { rules, filters } = rulesetDetails;
     let ruleCount = rules.plain + rules.regex;
-    if ( hasOmnipotence ) {
+    if ( cachedRulesetData.hasOmnipotence ) {
         ruleCount += rules.removeparam + rules.redirect + rules.modifyHeaders;
     }
     const filterCount = filters.accepted;

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

@@ -21,6 +21,7 @@
 
 import {
     broadcastMessage,
+    hasBroadHostPermissions,
     hostnamesFromMatches,
     isDescendantHostnameOfIter,
     toBroaderHostname,
@@ -223,7 +224,7 @@ export async function readFilteringModeDetails(bypassCache = false) {
         adminReadEx('noFiltering'),
     ]);
     if ( userModes === undefined ) {
-        userModes = { basic: [ 'all-urls' ] };
+        userModes = { optimal: [ 'all-urls' ] };
     }
     userModes = unserializeModeDetails(userModes);
     if ( Array.isArray(adminNoFiltering) ) {
@@ -255,12 +256,14 @@ async function writeFilteringModeDetails(afterDetails) {
     return Promise.all([
         getDefaultFilteringMode(),
         getTrustedSites(),
+        hasBroadHostPermissions(),
         localWrite('filteringModeDetails', data),
         sessionWrite('filteringModeDetails', data),
     ]).then(results => {
         broadcastMessage({
             defaultFilteringMode: results[0],
             trustedSites: Array.from(results[1]),
+            hasOmnipotence: results[2],
         });
     });
 }
@@ -347,9 +350,12 @@ export async function syncWithBrowserPermissions() {
     if ( beforeMode > MODE_BASIC && allowedHostnames.has('all-urls') === false ) {
         await setDefaultFilteringMode(MODE_BASIC);
         modified = true;
+    } else if ( beforeMode === MODE_BASIC && allowedHostnames.has('all-urls') ) {
+        await setDefaultFilteringMode(MODE_OPTIMAL);
+        modified = true;
     }
     const afterMode = await getDefaultFilteringMode();
-    if ( afterMode > MODE_BASIC ) { return false; }
+    if ( afterMode > MODE_BASIC ) { return afterMode !== beforeMode; }
     const filteringModes = await getFilteringModeDetails();
     const { optimal, complete } = filteringModes;
     for ( const hn of optimal ) {

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

@@ -21,7 +21,6 @@
 
 import {
     TAB_ID_NONE,
-    browser,
     dnr,
     i18n,
     localRead, localRemove, localWrite,
@@ -34,9 +33,9 @@ import {
     saveRulesetConfig,
 } from './config.js';
 
-
 import { fetchJSON } from './fetch.js';
 import { getAdminRulesets } from './admin.js';
+import { hasBroadHostPermissions } from './utils.js';
 import { ubolLog } from './debug.js';
 
 /******************************************************************************/
@@ -160,13 +159,7 @@ async function updateRemoveparamRules(currentRules, addRules, removeRuleIds) {
         removeRuleIds.push(rule.id);
     }
 
-    const [
-        hasOmnipotence,
-        rulesetDetails,
-    ] = await Promise.all([
-        browser.permissions.contains({ origins: [ '<all_urls>' ] }),
-        getEnabledRulesetsDetails(),
-    ]);
+    const rulesetDetails = await getEnabledRulesetsDetails();
 
     // Fetch removeparam rules for all enabled rulesets
     const toFetch = [];
@@ -178,12 +171,10 @@ async function updateRemoveparamRules(currentRules, addRules, removeRuleIds) {
 
     // Removeparam rules can only be enforced with omnipotence
     const allRules = [];
-    if ( hasOmnipotence ) {
-        for ( const rules of removeparamRulesets ) {
-            if ( Array.isArray(rules) === false ) { continue; }
-            for ( const rule of rules ) {
-                allRules.push(rule);
-            }
+    for ( const rules of removeparamRulesets ) {
+        if ( Array.isArray(rules) === false ) { continue; }
+        for ( const rule of rules ) {
+            allRules.push(rule);
         }
     }
     if ( allRules.length === 0 ) { return; }
@@ -205,13 +196,7 @@ async function updateRedirectRules(currentRules, addRules, removeRuleIds) {
         removeRuleIds.push(rule.id);
     }
 
-    const [
-        hasOmnipotence,
-        rulesetDetails,
-    ] = await Promise.all([
-        browser.permissions.contains({ origins: [ '<all_urls>' ] }),
-        getEnabledRulesetsDetails(),
-    ]);
+    const rulesetDetails = await getEnabledRulesetsDetails();
 
     // Fetch redirect rules for all enabled rulesets
     const toFetch = [];
@@ -223,12 +208,10 @@ async function updateRedirectRules(currentRules, addRules, removeRuleIds) {
 
     // Redirect rules can only be enforced with omnipotence
     const allRules = [];
-    if ( hasOmnipotence ) {
-        for ( const rules of redirectRulesets ) {
-            if ( Array.isArray(rules) === false ) { continue; }
-            for ( const rule of rules ) {
-                allRules.push(rule);
-            }
+    for ( const rules of redirectRulesets ) {
+        if ( Array.isArray(rules) === false ) { continue; }
+        for ( const rule of rules ) {
+            allRules.push(rule);
         }
     }
     if ( allRules.length === 0 ) { return; }
@@ -249,13 +232,7 @@ async function updateModifyHeadersRules(currentRules, addRules, removeRuleIds) {
         removeRuleIds.push(rule.id);
     }
 
-    const [
-        hasOmnipotence,
-        rulesetDetails,
-    ] = await Promise.all([
-        browser.permissions.contains({ origins: [ '<all_urls>' ] }),
-        getEnabledRulesetsDetails(),
-    ]);
+    const rulesetDetails = await getEnabledRulesetsDetails();
 
     // Fetch modifyHeaders rules for all enabled rulesets
     const toFetch = [];
@@ -267,12 +244,10 @@ async function updateModifyHeadersRules(currentRules, addRules, removeRuleIds) {
 
     // Redirect rules can only be enforced with omnipotence
     const allRules = [];
-    if ( hasOmnipotence ) {
-        for ( const rules of rulesets ) {
-            if ( Array.isArray(rules) === false ) { continue; }
-            for ( const rule of rules ) {
-                allRules.push(rule);
-            }
+    for ( const rules of rulesets ) {
+        if ( Array.isArray(rules) === false ) { continue; }
+        for ( const rule of rules ) {
+            allRules.push(rule);
         }
     }
     if ( allRules.length === 0 ) { return; }
@@ -348,7 +323,7 @@ async function updateStrictBlockRules(currentRules, addRules, removeRuleIds) {
         permanentlyExcluded = [],
         temporarilyExcluded = [],
     ] = await Promise.all([
-        browser.permissions.contains({ origins: [ '<all_urls>' ] }),
+        hasBroadHostPermissions(),
         getEnabledRulesetsDetails(),
         localRead('excludedStrictBlockHostnames'),
         sessionRead('excludedStrictBlockHostnames'),

package/extensions/ublocklite/js/settings.js

@@ -69,7 +69,7 @@ function renderWidgets() {
 
     {
         const input = qs$('#strictBlockMode input[type="checkbox"]');
-        const canStrictBlock = cachedRulesetData.defaultFilteringMode > 1;
+        const canStrictBlock = cachedRulesetData.hasOmnipotence;
         input.checked = canStrictBlock && cachedRulesetData.strictBlockMode;
         dom.attr(input, 'disabled', canStrictBlock ? null : '');
     }
@@ -102,17 +102,18 @@ async function onFilteringModeChange(ev) {
     const newLevel = parseInt(input.value, 10);
 
     switch ( newLevel ) {
-    case 1: { // Revoke broad permissions
-        await browser.permissions.remove({
-            origins: [ '<all_urls>' ]
+    case 1: {
+        const actualLevel = await sendMessage({
+            what: 'setDefaultFilteringMode',
+            level: newLevel,
         });
-        cachedRulesetData.defaultFilteringMode = 1;
+        cachedRulesetData.defaultFilteringMode = actualLevel;
         break;
     }
     case 2:
-    case 3: { // Request broad permissions
+    case 3: {
         const granted = await browser.permissions.request({
-            origins: [ '<all_urls>' ]
+            origins: [ '<all_urls>' ],
         });
         if ( granted ) {
             const actualLevel = await sendMessage({
@@ -120,6 +121,7 @@ async function onFilteringModeChange(ev) {
                 level: newLevel,
             });
             cachedRulesetData.defaultFilteringMode = actualLevel;
+            cachedRulesetData.hasOmnipotence = true;
         }
         break;
     }
@@ -233,6 +235,13 @@ listen.onmessage = ev => {
         }
     }
 
+    if ( message.hasOmnipotence !== undefined ) {
+        if ( message.hasOmnipotence !== local.hasOmnipotence ) {
+            local.hasOmnipotence = message.hasOmnipotence;
+            render = true;
+        }
+    }
+
     if ( message.defaultFilteringMode !== undefined ) {
         if ( message.defaultFilteringMode !== local.defaultFilteringMode ) {
             local.defaultFilteringMode = message.defaultFilteringMode;

package/extensions/ublocklite/js/utils.js

@@ -19,6 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
+import { browser } from './ext.js';
+
 /******************************************************************************/
 
 function parsedURLromOrigin(origin) {
@@ -134,6 +136,16 @@ const broadcastMessage = message => {
 
 /******************************************************************************/
 
+// https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/manifest.json/host_permissions#requested_permissions_and_user_prompts
+// "Users can grant or revoke host permissions on an ad hoc basis. Therefore,
+// most browsers treat host_permissions as optional."
+
+async function hasBroadHostPermissions() {
+    return browser.permissions.contains({ origins: [ '<all_urls>' ] });
+}
+
+/******************************************************************************/
+
 export {
     broadcastMessage,
     parsedURLromOrigin,
@@ -145,4 +157,5 @@ export {
     matchFromHostname,
     matchesFromHostnames,
     hostnamesFromMatches,
+    hasBroadHostPermissions,
 };

package/extensions/ublocklite/manifest.json

@@ -273,6 +273,9 @@
   },
   "default_locale": "en",
   "description": "__MSG_extShortDesc__",
+  "host_permissions": [
+    "<all_urls>"
+  ],
   "icons": {
     "16": "img/icon_16.png",
     "32": "img/icon_32.png",
@@ -283,9 +286,6 @@
   "minimum_chrome_version": "122.0",
   "name": "__MSG_extName__",
   "options_page": "dashboard.html",
-  "optional_host_permissions": [
-    "<all_urls>"
-  ],
   "permissions": [
     "activeTab",
     "declarativeNetRequest",
@@ -296,7 +296,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "2025.4.1.700",
+  "version": "2025.4.13.1188",
   "web_accessible_resources": [
     {
       "resources": [
@@ -321,6 +321,7 @@
         "/web_accessible_resources/noop.js",
         "/web_accessible_resources/google-ima.js",
         "/web_accessible_resources/noop.txt",
+        "/web_accessible_resources/amazon_apstag.js",
         "/web_accessible_resources/noop-1s.mp4",
         "/web_accessible_resources/noop.css",
         "/web_accessible_resources/2x2.png",
@@ -334,7 +335,6 @@
         "/web_accessible_resources/googlesyndication_adsbygoogle.js",
         "/web_accessible_resources/google-analytics_analytics.js",
         "/web_accessible_resources/prebid-ads.js",
-        "/web_accessible_resources/amazon_apstag.js",
         "/web_accessible_resources/doubleclick_instream_ad_status.js",
         "/web_accessible_resources/google-analytics_cx_api.js",
         "/web_accessible_resources/googletagservices_gpt.js",