Bail on missing tabs (#3194)

* Bail on missing tabs

* Remove grade console log

* Bail early on corrupt argumentsObjects

Author: jonathanKingston

shared/js/background/components/devtools.js

@@ -62,6 +62,7 @@ class DevtoolsConnection {
     setTab({ tabId }) {
         this._tabIdResolver(tabId);
         const tab = tabManager.get({ tabId });
+        if (!tab) return;
         this.postMessage('tabChange', this.devtools.serializeTab(tab));
     }
 
@@ -82,6 +83,7 @@ class DevtoolsConnection {
         } else {
             const tabId = await this.tabId;
             const tab = tabManager.get({ tabId });
+            if (!tab) return;
             const enabled = tab.site?.enabledFeatures.includes(feature);
             const tabDomain = tldts.getDomain(tab.site.domain);
 
@@ -110,6 +112,7 @@ class DevtoolsConnection {
     async toggleProtections() {
         const tabId = await this.tabId;
         const tab = tabManager.get({ tabId });
+        if (!tab) return;
         if (tab.site?.isBroken && tab.url) {
             await this.devtools.tds.remoteConfig.modify((config) => {
                 removeBroken(tab.site.domain, config);

shared/js/background/components/tab-tracking.js

@@ -28,6 +28,7 @@ export default class TabTracker extends EventTarget {
             (request) => {
                 this.tabManager.updateTabUrl(request);
                 const tab = tabManager.get({ tabId: request.tabId });
+                if (!tab) return;
 
                 tab.httpErrorCodes.push(request.statusCode);
 

shared/js/background/https.js

@@ -157,6 +157,7 @@ class HTTPS {
     downgradeTab({ tabId, expectedUrl, targetUrl }) {
         // make sure that tab still has expected url (user could have navigated away or been redirected)
         const tab = tabManager.get({ tabId });
+        if (!tab) return;
 
         if (tab.url !== expectedUrl && tab.url !== targetUrl) {
             console.warn(`HTTPS: Not downgrading, expected and actual tab URLs don't match: ${expectedUrl} vs ${tab.url}`);

shared/js/background/message-handlers.js

@@ -32,7 +32,6 @@ export async function registeredContentScript(options, sender, req) {
         }
         argumentsObject.code = injectCode;
     }
-
     return argumentsObject;
 }
 
@@ -160,6 +159,7 @@ export async function getYouTubeVideoDetails(videoURL) {
 
 export async function unblockClickToLoadContent(data, sender) {
     const tab = tabManager.get({ tabId: sender.tab.id });
+    if (!tab) return;
 
     if (!tab.disabledClickToLoadRuleActions.includes(data.action)) {
         tab.disabledClickToLoadRuleActions.push(data.action);
@@ -172,6 +172,7 @@ export async function unblockClickToLoadContent(data, sender) {
 
 export function updateYouTubeCTLAddedFlag(value, sender) {
     const tab = tabManager.get({ tabId: sender.tab.id });
+    if (!tab) return;
     tab.ctlYouTube = Boolean(value);
 }
 
@@ -200,6 +201,7 @@ export function updateFacebookCTLBreakageFlags({ ctlFacebookPlaceholderShown = f
     }
 
     const tab = tabManager.get({ tabId });
+    if (!tab) return;
 
     if (ctlFacebookPlaceholderShown) {
         tab.ctlFacebookPlaceholderShown = true;
@@ -278,6 +280,7 @@ export async function isClickToLoadYoutubeEnabled() {
 
 export function addDebugFlag(message, sender, req) {
     const tab = tabManager.get({ tabId: sender.tab.id });
+    if (!tab) return;
     const flags = new Set(tab.debugFlags);
     flags.add(message.flag);
     tab.debugFlags = [...flags];

shared/js/background/tab-manager.js

@@ -92,7 +92,7 @@ class TabManager {
     /**
      * Called using either a chrome tab object or by id
      * get({tabId: ###});
-     * @returns {Tab}
+     * @returns {Tab|undefined}
      */
     get(tabData) {
         if (tabData.tabId === -1 && (tabData.initiator || tabData.documentUrl)) {
@@ -122,7 +122,7 @@ class TabManager {
     async getOrRestoreCurrentTab() {
         const currentTabDetails = await getCurrentTab();
         if (currentTabDetails?.id) {
-            return await tabManager.getOrRestoreTab(currentTabDetails.id);
+            return (await tabManager.getOrRestoreTab(currentTabDetails.id)) || null;
         }
         return null;
     }
@@ -209,8 +209,6 @@ class TabManager {
                     const hasHttps = !!(tab.url && tab.url.match(/^https:\/\//));
                     tab.site.grade.setHttps(hasHttps, hasHttps);
 
-                    console.info(tab.site.grade);
-
                     if (tab.statusCode === 200 && !tab.site.didIncrementCompaniesData) {
                         if (tab.trackers && Object.keys(tab.trackers).length > 0) {
                             Companies.incrementTotalPagesWithTrackers();

shared/js/content-scripts/content-scope-messaging.js

@@ -35,6 +35,8 @@ async function init() {
             },
         },
         async (argumentsObject) => {
+            // Potentially corrupted argumentsObject, don't init
+            if (!argumentsObject) return;
             // Setup debugging messages if necessary.
             if (argumentsObject.debug) {
                 window.addEventListener('message', (message) => {