Issue 6543 - Match requests without tabId/frameId in their originating context

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 79 matching lines @@
 function composeFilters(details)
 {
   let {page, frame} = details;
   let filters = [];
   let selectors = [];
 
   if (!checkWhitelisted(page, frame))
   {
     let typeMask = RegExpFilter.typeMap[details.type];
     let docDomain = extractHostFromFrame(frame);
-    let specificOnly = checkWhitelisted(page, frame,
+    let specificOnly = checkWhitelisted(page, frame, null,
                                         RegExpFilter.typeMap.GENERICBLOCK);
 
     // Add a blocking filter for each URL of the element that can be blocked
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
       url = stringifyURL(urlObj);
 
       let filter = defaultMatcher.whitelist.matchesAny(
         url, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
         getKey(page, frame), specificOnly
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w-]+:\/+(?:www\.)?/, "||");
 
         if (specificOnly)
           filterText += "$domain=" + docDomain;
 
         if (!filters.includes(filterText))
           filters.push(filterText);
       }
     }
 
     // If we couldn't generate any blocking filters, fallback to element hiding
-    if (filters.length == 0 && !checkWhitelisted(page, frame,
+    if (filters.length == 0 && !checkWhitelisted(page, frame, null,
                                                  RegExpFilter.typeMap.ELEMHIDE))
     {
       // Generate CSS selectors based on the element's "id" and
       // "class" attribute.
       if (isValidString(details.id))
         selectors.push("#" + escapeCSS(details.id));
 
       let classes = details.classes.filter(isValidString);
       if (classes.length > 0)
         selectors.push(classes.map(c => "." + escapeCSS(c)).join(""));
@@ skipping 179 matching lines @@
   // When tabs start loading we send them a message to ensure that the state
   // of the "block element" tool is reset. This is necessary since Firefox will
   // sometimes cache the state of a tab when the user navigates back / forward,
   // which includes the state of the "block element" tool.
   // Since sending this message will often fail (e.g. for new tabs which have
   // just been opened) we catch and ignore any exception thrown.
   browser.tabs.sendMessage(
     page.id, {type: "composer.content.finished"}
   ).catch(() => {});
 });