Issue 6473 - Remove WebSocket wrapper

inject.preload.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
  * 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/>.
  */
 
 "use strict";
 
 let randomEventName = "abp-request-" + Math.random().toString(36).substr(2);
 
 // Proxy "should we block?" messages from checkRequest inside the injected
 // code to the background page and back again.
 document.addEventListener(randomEventName, event =>
 {
-  let {url, requestType} = event.detail;
+  let {url} = event.detail;
 
   browser.runtime.sendMessage({
-    type: "request.blockedByWrapper",
-    requestType,
+    type: "request.blockedByRTCWrapper",
     url
   }, block =>
   {
     document.dispatchEvent(new CustomEvent(
-      randomEventName + "-" + requestType + "-" + url, {detail: block}
+      randomEventName + "-" + url, {detail: block}
     ));
   });
 });
 
 function injected(eventName, injectedIntoContentWindow)
 {
   let checkRequest;
 
   /*
    * Frame context wrapper
@@ skipping 85 matching lines @@
         configurable: true, enumerable: true, get()
         {
           let thisShadow = shadowRoot(this);
           return thisShadow == ourShadowRoot ? null : thisShadow;
         }
       });
     }
   }
 
   /*
-   * Shared request checking code, used by the RTCPeerConnection wrapper.

[Sebastian Noack, 2018/03/13 17:43:01]

Well, it's no longer shared. We probably should just move the RTCPeerConnection
wrapper comment up here.

[Manish Jethani, 2018/03/13 18:05:11]

Done.

+   * RTCPeerConnection wrapper
+   *
+   * The webRequest API in Chrome does not yet allow the blocking of
+   * WebRTC connections.
+   * See https://bugs.chromium.org/p/chromium/issues/detail?id=707683
    */
   let RealCustomEvent = window.CustomEvent;
 
   // If we've been injected into a frame via contentWindow then we can simply
   // grab the copy of checkRequest left for us by the parent document. Otherwise
   // we need to set it up now, along with the event handling functions.
   if (injectedIntoContentWindow)
     checkRequest = window[eventName];
   else
   {
     let addEventListener = document.addEventListener.bind(document);
     let dispatchEvent = document.dispatchEvent.bind(document);
     let removeEventListener = document.removeEventListener.bind(document);
-    checkRequest = (requestType, url, callback) =>
-    {
-      let incomingEventName = eventName + "-" + requestType + "-" + url;
+    checkRequest = (url, callback) =>
+    {
+      let incomingEventName = eventName + "-" + url;
 
       function listener(event)
       {
         callback(event.detail);
         removeEventListener(incomingEventName, listener);
       }
       addEventListener(incomingEventName, listener);
 
-      dispatchEvent(new RealCustomEvent(eventName,
-                                        {detail: {url, requestType}}));
+      dispatchEvent(new RealCustomEvent(eventName, {detail: {url}}));
     };
   }
 
   // Only to be called before the page's code, not hardened.
   function copyProperties(src, dest, properties)
   {
     for (let name of properties)
     {
       if (src.hasOwnProperty(name))
       {
         Object.defineProperty(dest, name,
                               Object.getOwnPropertyDescriptor(src, name));
       }
     }
   }
 
-  /*
-   * RTCPeerConnection wrapper
-   *
-   * The webRequest API in Chrome does not yet allow the blocking of
-   * WebRTC connections.
-   * See https://bugs.chromium.org/p/chromium/issues/detail?id=707683
-   */
   let RealRTCPeerConnection = window.RTCPeerConnection ||
-                                window.webkitRTCPeerConnection;
+                              window.webkitRTCPeerConnection;
 
   // Firefox has the option (media.peerconnection.enabled) to disable WebRTC
   // in which case RealRTCPeerConnection is undefined.
   if (typeof RealRTCPeerConnection != "undefined")
   {
     let closeRTCPeerConnection = Function.prototype.call.bind(
       RealRTCPeerConnection.prototype.close
     );
     let RealArray = Array;
     let RealString = String;
@@ skipping 60 matching lines @@
       return createObject(configuration, {
         iceServers: {
           configurable: false, enumerable: false, writable: false,
           value: iceServers
         }
       });
     };
 
     let checkUrl = (peerconnection, url) =>
     {
-      checkRequest("webrtc", url, blocked =>
+      checkRequest(url, blocked =>
       {
         if (blocked)
         {
           // Calling .close() throws if already closed.
           try
           {
             closeRTCPeerConnection(peerconnection);
           }
           catch (e) {}
         }
@@ skipping 89 matching lines @@
     // Firefox 58 only bypasses site CSPs when assigning to 'src'.
     let url = URL.createObjectURL(new Blob([
       "(" + injected + ")('" + randomEventName + "');"
     ]));
     script.src = url;
     document.documentElement.appendChild(script);
     document.documentElement.removeChild(script);
     URL.revokeObjectURL(url);
   }
 }