Issue 1727 - Prevent circumvention via WebSocket

include.preload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 337 matching lines @@
 
   observer.observe(parentNode, {childList: true});
   return observer;
 }
 
 function runInPage(fn, arg)
 {
   var script = document.createElement("script");
   script.type = "application/javascript";
   script.async = false;
-
-  // include.youtube.js passes this function a RegExp which JSON.stringify would
-  // convert to "{}".
-  if (!(arg instanceof RegExp))

[Sebastian Noack, 2016/08/10 12:22:45]

Perhaps I got a better idea to avoid that special case: Just pass RegExp.source
in safari/include.youtube.js and pass it to the RegExp constructor in the
function.

[kzar, 2016/08/10 12:58:55]

Done.

-    arg = JSON.stringify(arg);
-
-  script.textContent = "(" + fn + ")(" + arg + ");";
+  script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");";
   document.documentElement.appendChild(script);
   document.documentElement.removeChild(script);
 }
 
 function protectStyleSheet(document, style)
 {
   style.id = id;
 
   runInPage(function(id)
   {
@@ skipping 41 matching lines @@
         new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
       );
     });
   });
 
   runInPage(function(eventName)
   {
     // As far as possible we must track everything we use that could be
     // sabotaged by the website later in order to circumvent us.
     var RealWebSocket = WebSocket;
-    var closeWebSocket = RealWebSocket.prototype.close;
+    var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.close);
     var addEventListener = document.addEventListener.bind(document);
     var removeEventListener = document.removeEventListener.bind(document);
     var dispatchEvent = document.dispatchEvent.bind(document);
     var CustomEvent = window.CustomEvent;
-    var boundCall = Function.prototype.call.bind(Function.prototype.call);

[Sebastian Noack, 2016/08/10 12:22:45]

Since WebSocket.prototype.close is the only method called later now, I suppose
you could simplify the logic a bit:

  var close = Function.prototype.call.bind(RealWebSocket.prototype.close);
  ...
  close(websocket);

[kzar, 2016/08/10 12:58:55]

Done.

 
     function checkRequest(url, callback)
     {
       var incomingEventName = eventName + "-" + url;
       function listener(event)
       {
         callback(event.detail);
         removeEventListener(incomingEventName, listener);
       }
       addEventListener(incomingEventName, listener);
 
       dispatchEvent(new CustomEvent(eventName, {
         detail: {url: url}
       }));
     }
 
     WebSocket = function WrappedWebSocket(url, protocols)
     {
       // Throw correct exceptions if the constructor is used improperly.
       if (!(this instanceof WrappedWebSocket)) return RealWebSocket();
       if (arguments.length < 1) return new RealWebSocket();
 
       var websocket = new RealWebSocket(url, protocols);
 
       checkRequest(websocket.url, function(blocked)
       {
         if (blocked)
-          boundCall(closeWebSocket, websocket);
+          closeWebSocket(websocket);
       });
 
       return websocket;
     }.bind();
 
-    var properties = Object.getOwnPropertyNames(RealWebSocket);
-    for (var i = 0; i < properties.length; i++)
-    {
-      var name = properties[i];
-      var desc = Object.getOwnPropertyDescriptor(RealWebSocket, name);
-      Object.defineProperty(WebSocket, name, desc);
-    }
+    Object.defineProperties(WebSocket, {
+      CONNECTING: {value: RealWebSocket.CONNECTING, enumerable: true},
+      OPEN: {value: RealWebSocket.OPEN, enumerable: true},
+      CLOSING: {value: RealWebSocket.CLOSING, enumerable: true},
+      CLOSED: {value: RealWebSocket.CLOSED, enumerable: true},
+      prototype: {value: RealWebSocket.prototype}
+    });
 
     RealWebSocket.prototype.constructor = WebSocket;
   }, eventName);
 }
 
 function init(document)
 {
   var shadow = null;
   var style = null;
   var observer = null;
@@ skipping 164 matching lines @@
   }, true);
 
   return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   window.updateStylesheet = init(document);
 }