Issue 5042 - Adds handling for requests which are not associated with browser tab

lib/requestBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module requestBlocker */
 
 "use strict";
 
 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
 const {Subscription} = require("subscriptionClasses");
 const {defaultMatcher} = require("matcher");
 const {FilterNotifier} = require("filterNotifier");
 const {Prefs} = require("prefs");
 const {checkWhitelisted, getKey} = require("whitelisting");
-const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
+const {stringifyURL, getDecodedHostname,

[Sebastian Noack, 2017/04/29 23:07:59]

It seems the newly imported function (i.e. getDecodedHostname) isn't used
anywhere.

[Jon Sonesen, 2017/05/04 10:26:05]

Done.

+      extractHostFromFrame, isThirdParty} = require("url");
 const {port} = require("messaging");
 const devtools = require("devtools");
 
 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 
 function onBeforeRequestAsync(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
   if (filter)
     FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
 
   if (devtools)
   {
     devtools.logRequest(
       page, url, type, docDomain,
       thirdParty, sitekey,
       specificOnly, filter
     );
   }
 }
 
 ext.webRequest.onBeforeRequest.addListener((url, type, page, frame) =>
 {
-  if (checkWhitelisted(page, frame))
-    return true;
+  let docDomain = null;
+  let sitekey = null;
 
+  let specificOnly = false;
+  let thirdParty = false;
   let urlString = stringifyURL(url);
-  let docDomain = extractHostFromFrame(frame);
-  let thirdParty = isThirdParty(url, docDomain);
-  let sitekey = getKey(page, frame);
 
-  let specificOnly = !!checkWhitelisted(
-    page, frame, RegExpFilter.typeMap.GENERICBLOCK
+  if (frame && page)
+  {
+    if (checkWhitelisted(page, frame))
+      return true;

[Sebastian Noack, 2017/04/29 23:08:00]

Nit: I'd always add a blank line when returning before the end of the function.

[Jon Sonesen, 2017/05/04 10:26:06]

Done.

+    docDomain = extractHostFromFrame(frame);
+    sitekey = getKey(page, frame);
+    isThirdParty(url, docDomain);

[Sebastian Noack, 2017/04/29 23:07:59]

As this code stands, this call is redundant. Did you forget to assign the result
to a variable?

[Jon Sonesen, 2017/05/04 10:26:05]

Yeah that's what happened there. 

Thanks.

Done.

+    specificOnly = !!checkWhitelisted(
+      page, frame, RegExpFilter.typeMap.GENERICBLOCK
   );
+  }
+
+
 
   let filter = defaultMatcher.matchesAny(
     urlString, RegExpFilter.typeMap[type],
     docDomain, thirdParty, sitekey, specificOnly
   );
 
   setTimeout(onBeforeRequestAsync, 0, page, urlString,
                                       type, docDomain,
                                       thirdParty, sitekey,
                                       specificOnly, filter);
@@ skipping 87 matching lines @@
   if (msg.requestType in chrome.webRequest.ResourceType)
     return false;
 
   return ext.webRequest.onBeforeRequest._dispatch(
      new URL(msg.url),
      msg.requestType,
      sender.page,
      sender.frame
   ).includes(false);
 });