Issue 5027 - Use updated webRequest API for WebSocket blocking

lib/csp.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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";
 
 // Before Chrome 58, the webRequest API did not intercept WebSocket
-// connections see: https://crbug.com/129353. Hence we inject CSP headers,

[Jon Sonesen, 2017/03/28 20:10:31]

Perhaps I should remove the colon.

[Sebastian Noack, 2017/03/28 20:20:43]

I wouldn't insist, but personally I'd omit the colon, but perhaps add
parentheses:

  (see https://crbug.com/129353)

You can also omit the parantheses, but then there should be a comma, before
"see". It seems this is how you did it in lib/contentBlocker.js. Either way I
would do it consistent.

[Jon Sonesen, 2017/03/28 21:33:02]

I prefer the way the parentheses look too, so I have added then

+// connections (see https://crbug.com/129353). Hence we inject CSP headers,
 // below, as a workaround.
 if (!("WEBSOCKET" in chrome.webRequest.ResourceType))
 {
   const {defaultMatcher} = require("matcher");
   const {BlockingFilter, RegExpFilter} = require("filterClasses");
   const {getDecodedHostname} = require("url");
   const {checkWhitelisted} = require("whitelisting");
 
   chrome.webRequest.onHeadersReceived.addListener(details =>
   {
@@ skipping 25 matching lines @@
     }
   }, {
     urls: ["http://*/*", "https://*/*"],
     // We must also intercept script requests since otherwise Web Workers can
     // be abused to execute scripts for which our Content Security Policy
     // won't be injected.
     // https://github.com/gorhill/uBO-Extra/issues/19
     types: ["main_frame", "sub_frame", "script"]
   }, ["blocking", "responseHeaders"]);
 }