Issue 1727 - Prevent circumvention via WebSocket

background.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 23 matching lines @@
       extractHostFromFrame(sender.frame),
       checkWhitelisted(sender.page, sender.frame,
                        RegExpFilter.typeMap.GENERICHIDE)
     );
   else
     selectors = [];
 
   return {selectors: selectors, trace: trace};
 });
 
+port.on("websocket-request", function(msg, sender)

[Sebastian Noack, 2016/06/28 16:17:51]

Please no new code in background.js. This file is matter to be removed. And this
seems to rather belong in requestBlocker.js anyway.

[kzar, 2016/06/29 13:40:30]

Done.

+{
+  var results = ext.webRequest.onBeforeRequest._dispatch(
+    new URL(msg.url),

[Sebastian Noack, 2016/06/28 16:17:51]

Is it possible to create a WebSocket with a relative URL? Then we'd have to make
sure to pass the corresponding base URL to the URl() constructor here.

[kzar, 2016/06/29 13:40:30]

No, I don't believe it's possible. (I see an exception when attempting to do
it.)

[lainverse, 2016/06/29 13:54:58]

As I understood you must pass FQDN URL. At least for now. Neither Chrome, nor
Firefox supports relative URLs and there are a lot of questions on the web
regarding this with the same answer to generate a full URL.

[Sebastian Noack, 2016/07/01 17:03:39]

Ah right. Of course it needs to be an absolute URL because it's a different
protocol anyway.

+    "OTHER",
+    sender.page,
+    sender.frame
+  );
+  return results.indexOf(false) != -1;
+});
+
 port.on("forward", function(msg, sender)
 {
   var targetPage;
   if (msg.targetPageId)
     targetPage = ext.getPage(msg.targetPageId);
   else
     targetPage = sender.page;
 
   if (targetPage)
   {
     msg.payload.sender = sender.page.id;
     if (msg.expectsResponse)
       return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
     targetPage.sendMessage(msg.payload);
   }
 });