fix #3546, #3428

gorhill · Feb 26, 2018 · 2c90158 · 2c90158
1 parent 64682ab
commit 2c90158
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 188 deletions.
diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
@@ -265,18 +265,29 @@ vAPI.tabs = {};
 
 /******************************************************************************/
 
+// https://github.com/gorhill/uBlock/issues/3546
+//   Added a new flavor of behind-the-scene tab id: vAPI.anyTabId.
+//   vAPI.anyTabId will be used for network requests which can be filtered,
+//   because they comes with enough contextual information. It's just not
+//   possible to pinpoint exactly from which tab it comes from. For example,
+//   with Firefox/webext, the `documentUrl` property is available for every
+//   network requests.
+
 vAPI.isBehindTheSceneTabId = function(tabId) {
-    return tabId.toString() === '-1';
+    if ( typeof tabId === 'string' ) { debugger; }
+    return tabId < 0;
 };
 
-vAPI.noTabId = '-1';
+vAPI.unsetTabId = 0;
+vAPI.noTabId = -1;      // definitely not any existing tab
+vAPI.anyTabId = -2;     // one of the existing tab
 
 /******************************************************************************/
 
+// To remove when tabId-as-integer has been tested enough.
+
 var toChromiumTabId = function(tabId) {
-    if ( typeof tabId === 'string' ) {
-        tabId = parseInt(tabId, 10);
-    }
+    if ( typeof tabId === 'string' ) { debugger; }
     if ( typeof tabId !== 'number' || isNaN(tabId) || tabId === -1 ) {
         return 0;
     }
@@ -329,8 +340,8 @@ vAPI.tabs.registerListeners = function() {
         }
         if ( typeof vAPI.tabs.onPopupCreated === 'function' ) {
             vAPI.tabs.onPopupCreated(
-                details.tabId.toString(),
-                details.sourceTabId.toString()
+                details.tabId,
+                details.sourceTabId
             );
         }
     };
@@ -364,7 +375,7 @@ vAPI.tabs.registerListeners = function() {
         if ( changeInfo.url ) {
             changeInfo.url = sanitizeURL(changeInfo.url);
         }
-        onUpdatedClient(tabId.toString(), changeInfo, tab);
+        onUpdatedClient(tabId, changeInfo, tab);
     };
 
     chrome.webNavigation.onBeforeNavigate.addListener(onBeforeNavigate);
@@ -542,9 +553,7 @@ vAPI.tabs.open = function(details) {
 
 vAPI.tabs.replace = function(tabId, url) {
     tabId = toChromiumTabId(tabId);
-    if ( tabId === 0 ) {
-        return;
-    }
+    if ( tabId === 0 ) { return; }
 
     var targetURL = url;
 
@@ -565,9 +574,7 @@ vAPI.tabs.replace = function(tabId, url) {
 
 vAPI.tabs.remove = function(tabId) {
     tabId = toChromiumTabId(tabId);
-    if ( tabId === 0 ) {
-        return;
-    }
+    if ( tabId === 0 ) { return; }
 
     var onTabRemoved = function() {
         // https://code.google.com/p/chromium/issues/detail?id=410868#c8
@@ -605,9 +612,7 @@ vAPI.tabs.reload = function(tabId, bypassCache) {
 
 vAPI.tabs.select = function(tabId) {
     tabId = toChromiumTabId(tabId);
-    if ( tabId === 0 ) {
-        return;
-    }
+    if ( tabId === 0 ) { return; }
 
     chrome.tabs.update(tabId, { active: true }, function(tab) {
         if ( chrome.runtime.lastError ) {
@@ -789,15 +794,15 @@ vAPI.messaging.onPortMessage = (function() {
         case 'connectionRefused':
             toPort = messaging.ports.get(msg.fromToken);
             if ( toPort !== undefined ) {
-                msg.tabId = tabId && tabId.toString();
+                msg.tabId = tabId;
                 toPort.postMessage(request);
             } else {
                 msg.what = 'connectionBroken';
                 port.postMessage(request);
             }
             break;
         case 'connectionRequested':
-            msg.tabId = tabId && tabId.toString();
+            msg.tabId = tabId;
             for ( toPort of messaging.ports.values() ) {
                 toPort.postMessage(request);
             }
@@ -809,7 +814,7 @@ vAPI.messaging.onPortMessage = (function() {
                 port.name === msg.fromToken ? msg.toToken : msg.fromToken
             );
             if ( toPort !== undefined ) {
-                msg.tabId = tabId && tabId.toString();
+                msg.tabId = tabId;
                 toPort.postMessage(request);
             } else {
                 msg.what = 'connectionBroken';

diff --git a/platform/chromium/vapi-webrequest.js b/platform/chromium/vapi-webrequest.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2017 Raymond Hill
+    Copyright (C) 2017-2018 Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -105,8 +105,6 @@ vAPI.net.registerListeners = function() {
     };
 
     var normalizeRequestDetails = function(details) {
-        details.tabId = details.tabId.toString();
-
         var type = details.type;
 
         // https://github.com/gorhill/uBlock/issues/1493

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2014-2107 The uBlock Origin authors
+    Copyright (C) 2014-2018 The uBlock Origin authors
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -833,10 +833,11 @@ var getOwnerWindow = function(target) {
 /******************************************************************************/
 
 vAPI.isBehindTheSceneTabId = function(tabId) {
-    return tabId.toString() === '-1';
+    return tabId < 0;
 };
 
-vAPI.noTabId = '-1';
+vAPI.noTabId = -1;
+vAPI.anyTabId = -2;
 
 /******************************************************************************/
 
@@ -1283,7 +1284,7 @@ var tabWatcher = (function() {
         }
         var tabId = browserToTabIdMap.get(browser);
         if ( tabId === undefined ) {
-            tabId = '' + tabIdGenerator++;
+            tabId = tabIdGenerator++;
             browserToTabIdMap.set(browser, tabId);
             tabIdToBrowserMap.set(tabId, Cu.getWeakReference(browser));
         }
@@ -1316,7 +1317,7 @@ var tabWatcher = (function() {
     var removeBrowserEntry = function(tabId, browser) {
         if ( tabId && tabId !== vAPI.noTabId ) {
             vAPI.tabs.onClosed(tabId);
-            delete vAPI.toolbarButton.tabs[tabId];
+            vAPI.toolbarButton.tabs.delete(tabId);
             tabIdToBrowserMap.delete(tabId);
         }
         if ( browser ) {
@@ -1539,7 +1540,7 @@ vAPI.setIcon = function(tabId, iconStatus, badge) {
     if ( tabId === undefined ) {
         tabId = curTabId;
     } else if ( badge !== undefined ) {
-        tb.tabs[tabId] = { badge: badge, img: iconStatus === 'on' };
+        tb.tabs.set(tabId, { badge: badge, img: iconStatus === 'on' });
     }
 
     if ( curTabId && tabId === curTabId ) {
@@ -2028,7 +2029,7 @@ var httpObserver = {
     },
 
     // https://github.com/gorhill/uBlock/issues/959
-    syntheticPendingRequest: { frameId: 0, parentFrameId: -1, tabId: '', rawtype: 1 },
+    syntheticPendingRequest: { frameId: 0, parentFrameId: -1, tabId: 0, rawtype: 1 },
 
     handleRequest: function(channel, URI, details) {
         var type = this.typeMap[details.rawtype] || 'other';
@@ -2437,7 +2438,7 @@ vAPI.toolbarButton = {
     viewId: location.host + '-panel',
     label: vAPI.app.name,
     tooltiptext: vAPI.app.name,
-    tabs: {/*tabId: {badge: 0, img: boolean}*/},
+    tabs: new Map(/* tabId: { badge: 0, img: boolean } */),
     init: null,
     codePath: ''
 };
@@ -2473,8 +2474,8 @@ vAPI.toolbarButton = {
         if ( tabId === undefined ) {
             return label;
         }
-        var tabDetails = this.tabs[tabId];
-        if ( !tabDetails ) {
+        var tabDetails = this.tabs.get(tabId);
+        if ( tabDetails === undefined ) {
             return label;
         }
         if ( !tabDetails.img ) {
@@ -2563,7 +2564,7 @@ vAPI.toolbarButton = {
             return;
         }
 
-        var icon = this.tabs[tabId];
+        var icon = this.tabs.get(tabId);
 
         button.setAttribute('badge', icon && icon.badge || '');
         button.classList.toggle('off', !icon || !icon.img);
@@ -3502,9 +3503,8 @@ vAPI.onLoadAllCompleted = function() {
     // TODO: vAPI shouldn't know about uBlock. Just like in uMatrix, uBlock
     // should collect on its side all the opened tabs whenever it is ready.
     var µb = µBlock;
-    var tabId;
     for ( var browser of tabWatcher.browsers() ) {
-        tabId = tabWatcher.tabIdFromTarget(browser);
+        var tabId = tabWatcher.tabIdFromTarget(browser);
         µb.tabContextManager.commit(tabId, browser.currentURI.asciiSpec);
         µb.bindTabToPageStats(tabId);
     }

diff --git a/platform/webext/vapi-webrequest.js b/platform/webext/vapi-webrequest.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2017 Raymond Hill
+    Copyright (C) 2017-2018 Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -100,10 +100,16 @@ vAPI.net.registerListeners = function() {
 
     var punycode = self.punycode;
     var reAsciiHostname  = /^https?:\/\/[0-9a-z_.:@-]+[/?#]/;
+    var reNetworkURI = /^(?:ftps?|https?|wss?)/;
     var parsedURL = new URL('about:blank');
 
     var normalizeRequestDetails = function(details) {
-        details.tabId = details.tabId.toString();
+        if (
+            details.tabId === vAPI.noTabId &&
+            reNetworkURI.test(details.documentUrl)
+        ) {
+            details.tabId = vAPI.anyTabId;
+        }
 
         if ( mustPunycode && !reAsciiHostname.test(details.url) ) {
             parsedURL.href = details.url;

diff --git a/src/js/background.js b/src/js/background.js
@@ -148,7 +148,7 @@ var µBlock = (function() { // jshint ignore:line
 
         selfieAfter: 17 * oneMinute,
 
-        pageStores: {},
+        pageStores: new Map(),
         pageStoresToken: 0,
 
         storageQuota: vAPI.storage.QUOTA_BYTES,

diff --git a/src/js/logger-ui-inspector.js b/src/js/logger-ui-inspector.js
@@ -45,7 +45,7 @@ if (
 
 var logger = self.logger;
 var inspectorConnectionId;
-var inspectedTabId = '';
+var inspectedTabId = 0;
 var inspectedURL = '';
 var inspectedHostname = '';
 var inspector = uDom.nodeFromId('domInspector');
@@ -468,7 +468,7 @@ var startDialog = (function() {
 var onClicked = function(ev) {
     ev.stopPropagation();
 
-    if ( inspectedTabId === '' ) { return; }
+    if ( inspectedTabId === 0 ) { return; }
 
     var target = ev.target;
     var parent = target.parentElement;
@@ -540,7 +540,7 @@ var onMouseOver = (function() {
     };
 
     return function(ev) {
-        if ( inspectedTabId === '' ) { return; }
+        if ( inspectedTabId === 0 ) { return; }
         // Convenience: skip real-time highlighting if shift key is pressed.
         if ( ev.shiftKey ) { return; }
         // Find closest `li`
@@ -560,15 +560,15 @@ var onMouseOver = (function() {
 /******************************************************************************/
 
 var currentTabId = function() {
-    if ( showdomButton.classList.contains('active') === false ) { return ''; }
+    if ( showdomButton.classList.contains('active') === false ) { return 0; }
     return logger.tabIdFromPageSelector();
 };
 
 /******************************************************************************/
 
 var injectInspector = function() {
     var tabId = currentTabId();
-    if ( tabId === '' ) { return; }
+    if ( tabId === 0 ) { return; }
     inspectedTabId = tabId;
     messaging.send('loggerUI', {
         what: 'scriptlet',
@@ -586,7 +586,7 @@ var shutdownInspector = function() {
     }
     logger.removeAllChildren(domTree);
     inspector.classList.add('vCompact');
-    inspectedTabId = '';
+    inspectedTabId = 0;
 };
 
 /******************************************************************************/
@@ -658,7 +658,7 @@ var toggleOff = function() {
     uDom.nodeFromSelector('#domInspector .permatoolbar .highlightMode').removeEventListener('click', toggleHighlightMode);
     uDom.nodeFromSelector('#domInspector .permatoolbar .revert').removeEventListener('click', revert);
     uDom.nodeFromSelector('#domInspector .permatoolbar .commit').removeEventListener('click', startDialog);
-    inspectedTabId = '';
+    inspectedTabId = 0;
 };
 
 /******************************************************************************/