Issue 5760 - Use relative require paths

lib/csp.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";
 
 // The webRequest API doesn't support WebSocket connection blocking in Microsoft

[kzar, 2018/04/05 11:14:56]

Looks like this needs rebasing (on top of the next branch) again, since this
file has changed now.

[Jon Sonesen, 2018/04/05 23:01:20]

Acknowledged.

 // Edge and versions of Chrome before 58. Therefore for those we inject CSP
 // headers below as a workaround. See https://crbug.com/129353 and
 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/
 if (!browser.webRequest.ResourceType ||
     !("WEBSOCKET" in browser.webRequest.ResourceType))
 {
-  const {defaultMatcher} = require("matcher");
-  const {BlockingFilter, RegExpFilter} = require("filterClasses");
-  const {getDecodedHostname} = require("url");
-  const {checkWhitelisted} = require("whitelisting");
+  const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+  const {BlockingFilter, RegExpFilter} =
+    require("../adblockpluscore/lib/filterClasses");
+  const {getDecodedHostname} = require("./url");
+  const {checkWhitelisted} = require("./whitelisting");
 
   browser.webRequest.onHeadersReceived.addListener(details =>
   {
     let hostname = getDecodedHostname(new URL(details.url));
     let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET,
                                           hostname, false, null, true);
     if (match instanceof BlockingFilter &&
         !checkWhitelisted(new ext.Page({id: details.tabId}),
                           ext.getFrame(details.tabId, details.frameId)))
     {
@@ skipping 19 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"]);
 }