Issue 6586 - Handle intiator of "null" on Chrome >=66

lib/requestBlocker.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 94 matching lines @@
   // If tabId is -1, its not (e.g. the request was sent by
   // a Service/Shared Worker) and we have to identify the related tabs.
   if (details.tabId != -1)
     return Promise.resolve([details.tabId]);
 
   let url;                    // Firefox provides "originUrl" indicating the
   if (details.originUrl)      // URL of the tab that caused this request.
     url = details.originUrl;  // In case of Service/Shared Worker, this is the
                               // URL of the tab that caused the worker to spawn.
 
-  else if (details.initiator)        // Chromium >=63 provides "intiator" which
-    url = details.initiator + "/*";  // is equivalent to "originUrl" on Firefox
+  else if (details.initiator && details.initiator != "null")

[kzar, 2018/05/11 12:50:17]

Why are you comparing it to the string "null" instead of null?

[Sebastian Noack, 2018/05/11 12:52:40]

Because that is what Chrome >=66 sets the value to if unknown.

[kzar, 2018/05/11 12:58:56]

Weird, that sounds like a bug, did you report it?

[Sebastian Noack, 2018/05/11 13:04:44]

Well, that behavior matches the documentation:
https://developer.chrome.com/extensions/webRequest#property-details-initiator

+    url = details.initiator + "/*";  // Chromium >=63 provides "intiator" which
+                                     // is equivalent to "originUrl" on Firefox
                                      // except that its not a full URL but just
                                      // an origin (proto + host).
   else
     return Promise.resolve([]);
 
   return browser.tabs.query({url}).then(tabs => tabs.map(tab => tab.id));
 }
 
 function logRequest(tabIds, url, type, docDomain, thirdParty,
                     sitekey, specificOnly, filter)
@@ skipping 20 matching lines @@
   // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket
   // protocol and is causing an error if it is given.
   let url = new URL(details.url);
   if (url.protocol != "http:" && url.protocol != "https:" &&
       url.protocol != "ws:" && url.protocol != "wss:")
     return;
 
   // Firefox provides us with the full origin URL, while Chromium (>=63)
   // provides only the protocol + host of the (top-level) document which
   // the request originates from through the "initiator" property.
-  let originUrl = details.originUrl ? new URL(details.originUrl) :
-                  details.initiator ? new URL(details.initiator) : null;
+  let originUrl = null;
+  if (details.originUrl)
+    originUrl = new URL(details.originUrl);
+  else if (details.initiator && details.initiator != "null")
+    originUrl = new URL(details.initiator);
 
   // Ignore requests sent by extensions or by Firefox itself:
   // * Firefox intercepts requests sent by any extensions, indicated with
   //   an "originURL" starting with "moz-extension:".
   // * Chromium intercepts requests sent by this extension only, indicated
   //   on Chromium >=63 with an "initiator" starting with "chrome-extension:".
   // * On Firefox, requests that don't relate to any document or extension are
   //   indicated with an "originUrl" starting with "chrome:".
   if (originUrl && (originUrl.protocol == extensionProtocol ||
                     originUrl.protocol == "chrome:"))
     return;
 
   let page = new ext.Page({id: details.tabId});
   let frame = ext.getFrame(
     details.tabId,
     // We are looking for the frame that contains the element which
     // has triggered this request. For most requests (e.g. images) we
     // can just use the request's frame ID, but for subdocument requests
     // (e.g. iframes) we must instead use the request's parent frame ID.
     details.type == "sub_frame" ? details.parentFrameId : details.frameId
   );
 
   // On Chromium >= 63, if both the frame is unknown and we haven't get
-  // an "initator", this implies a request sent by the browser itself
-  // (on older versions of Chromium, due to the lack of "initator",
+  // an "initiator", this implies a request sent by the browser itself

[Sebastian Noack, 2018/05/10 15:41:40]

Just fixed a typo here.

[kzar, 2018/05/11 12:50:17]

Acknowledged.

+  // (on older versions of Chromium, due to the lack of "initiator",
   // this can also indicate a request sent by a Shared/Service Worker).
   if (!frame && !originUrl)
     return;
 
   if (checkWhitelisted(page, frame, originUrl))
     return;
 
   let type = resourceTypes.get(details.type) || "OTHER";
   let [docDomain, sitekey, specificOnly] = getDocumentInfo(page, frame,
                                                            originUrl);
@@ skipping 115 matching lines @@
 }
 
 FilterNotifier.on("subscription.added", onFilterChange);
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);