| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 /** @module whitelisting */ | 18 /** @module whitelisting */ |
| 19 | 19 |
| 20 "use strict"; | 20 "use strict"; |
| 21 | 21 |
| 22 const {defaultMatcher} = require("matcher"); | 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| 23 const {Filter, RegExpFilter} = require("filterClasses"); | 23 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
| 24 const {FilterNotifier} = require("filterNotifier"); | 24 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| 25 const {FilterStorage} = require("filterStorage"); | 25 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage"); |
| 26 const {stringifyURL, getDecodedHostname, | 26 const {stringifyURL, getDecodedHostname, |
| 27 extractHostFromFrame, isThirdParty} = require("url"); | 27 extractHostFromFrame, isThirdParty} = require("./url"); |
| 28 const {port} = require("messaging"); | 28 const {port} = require("./messaging"); |
| 29 const devtools = require("devtools"); | 29 const devtools = require("./devtools"); |
| 30 const {verifySignature} = require("rsa"); | 30 const {verifySignature} = require("../adblockpluscore/lib/rsa"); |
| 31 | 31 |
| 32 let sitekeys = new ext.PageMap(); | 32 let sitekeys = new ext.PageMap(); |
| 33 | 33 |
| 34 function match(page, url, typeMask, docDomain, sitekey) | 34 function match(page, url, typeMask, docDomain, sitekey) |
| 35 { | 35 { |
| 36 let thirdParty = !!docDomain && isThirdParty(url, docDomain); | 36 let thirdParty = !!docDomain && isThirdParty(url, docDomain); |
| 37 let urlString = stringifyURL(url); | 37 let urlString = stringifyURL(url); |
| 38 | 38 |
| 39 if (!docDomain) | 39 if (!docDomain) |
| 40 docDomain = getDecodedHostname(url); | 40 docDomain = getDecodedHostname(url); |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 { | 225 { |
| 226 browser.webRequest.onHeadersReceived.addListener( | 226 browser.webRequest.onHeadersReceived.addListener( |
| 227 onHeadersReceived, | 227 onHeadersReceived, |
| 228 { | 228 { |
| 229 urls: ["http://*/*", "https://*/*"], | 229 urls: ["http://*/*", "https://*/*"], |
| 230 types: ["main_frame", "sub_frame"] | 230 types: ["main_frame", "sub_frame"] |
| 231 }, | 231 }, |
| 232 ["responseHeaders"] | 232 ["responseHeaders"] |
| 233 ); | 233 ); |
| 234 } | 234 } |
| OLD | NEW |