Issue 3452 - Bring back $ping type option (Core changes)

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 25 matching lines @@
  * @class
  */
 var Policy = exports.Policy =
 {
   /**
    * Set of explicitly supported content types
    * @type Set.<string>
    */
   contentTypes: new Set([
     "OTHER", "SCRIPT", "IMAGE", "STYLESHEET", "OBJECT", "SUBDOCUMENT", "DOCUMENT",
-    "XMLHTTPREQUEST", "OBJECT_SUBREQUEST", "FONT", "MEDIA", "ELEMHIDE", "POPUP",
-    "GENERICHIDE", "GENERICBLOCK"
+    "XMLHTTPREQUEST", "OBJECT_SUBREQUEST", "FONT", "MEDIA", "PING", "ELEMHIDE",
+    "POPUP", "GENERICHIDE", "GENERICBLOCK"
   ]),
 
   /**
    * Set of content types that aren't associated with a visual document area
    * @type Set.<string>
    */
   nonVisualTypes: new Set([
     "SCRIPT", "STYLESHEET", "XMLHTTPREQUEST", "OBJECT_SUBREQUEST", "FONT",
-    "ELEMHIDE", "POPUP", "GENERICHIDE", "GENERICBLOCK"
+    "PING", "ELEMHIDE", "POPUP", "GENERICHIDE", "GENERICBLOCK"
   ]),
 
   /**
    * Map containing all schemes that should be ignored by content policy.
    * @type Set.<string>
    */
   whitelistSchemes: new Set(),
 
   /**
    * Called on module startup, initializes various exported properties.
@@ skipping 51 matching lines @@
 
     function response(allow, collapse)
     {
       return {allow, collapse, hits};
     }
 
     // Ignore whitelisted schemes
     if (!this.isBlockableScheme(location))
       return response(true, false);
 
+    // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the
+    // same concept - merely generalized.

[Sebastian Noack, 2015/12/23 13:34:45]

I'm inclined to also add a note that we cannot distinguis BEACON and PING on
Chrome anyway.

[Wladimir Palant, 2015/12/23 14:14:34]

That means fairly little for Firefox - we wouldn't dumb down our Firefox
extension because of Chrome if distinguishing the types made sense.

[Sebastian Noack, 2015/12/23 14:18:18]

Well, given that Chrome is our largest platform, I think the feasibility of
implementing a filter there, should be something we should consider, when adding
new filters.

+    if (contentType == "BEACON")
+      contentType = "PING";
+
     // Interpret unknown types as "other"
     if (!this.contentTypes.has(contentType))
       contentType = "OTHER";
 
     let wndLocation = frames[0].location;
     let docDomain = getHostname(wndLocation);
     let match = null;
     let [sitekey, sitekeyFrame] = getSitekey(frames);
     let nogeneric = false;
     if (!match && Prefs.enabled)
@@ skipping 257 matching lines @@
   {
     // EffectiveTLDService throws on IP addresses, just compare the host name
     let host = "";
     try
     {
       host = uri.host;
     } catch (e) {}
     return host != docDomain;
   }
 }