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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 |
(...skipping 12 matching lines...) Expand all Loading... |
23 const {Subscription} = require("subscriptionClasses"); | 23 const {Subscription} = require("subscriptionClasses"); |
24 const {defaultMatcher} = require("matcher"); | 24 const {defaultMatcher} = require("matcher"); |
25 const {FilterNotifier} = require("filterNotifier"); | 25 const {FilterNotifier} = require("filterNotifier"); |
26 const {Prefs} = require("prefs"); | 26 const {Prefs} = require("prefs"); |
27 const {checkWhitelisted, getKey} = require("whitelisting"); | 27 const {checkWhitelisted, getKey} = require("whitelisting"); |
28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); | 28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); |
29 const {port} = require("messaging"); | 29 const {port} = require("messaging"); |
30 const devtools = require("devtools"); | 30 const devtools = require("devtools"); |
31 | 31 |
32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. | 32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. |
33 if (!("OBJECT_SUBREQUEST" in chrome.webRequest.ResourceType)) | 33 if (chrome.webRequest.ResourceType && |
| 34 !("OBJECT_SUBREQUEST" in chrome.webRequest.ResourceType)) |
34 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; | 35 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; |
35 | 36 |
36 // Map of content types reported by the browser to the respecitve content types | 37 // Map of content types reported by the browser to the respecitve content types |
37 // used by Adblock Plus. Other content types are simply mapped to OTHER. | 38 // used by Adblock Plus. Other content types are simply mapped to OTHER. |
38 let resourceTypes = new Map(function*() | 39 let resourceTypes = new Map(function*() |
39 { | 40 { |
40 for (let type in RegExpFilter.typeMap) | 41 for (let type in RegExpFilter.typeMap) |
41 yield [type.toLowerCase(), type]; | 42 yield [type.toLowerCase(), type]; |
42 | 43 |
43 yield ["sub_frame", "SUBDOCUMENT"]; | 44 yield ["sub_frame", "SUBDOCUMENT"]; |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 FilterNotifier.on("filter.added", onFilterChange); | 180 FilterNotifier.on("filter.added", onFilterChange); |
180 FilterNotifier.on("filter.removed", onFilterChange); | 181 FilterNotifier.on("filter.removed", onFilterChange); |
181 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); | 182 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); |
182 FilterNotifier.on("load", onFilterChange); | 183 FilterNotifier.on("load", onFilterChange); |
183 | 184 |
184 port.on("request.blockedByWrapper", (msg, sender) => | 185 port.on("request.blockedByWrapper", (msg, sender) => |
185 { | 186 { |
186 // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore | 187 // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore |
187 // messages from the wrapper here (see https://crbug.com/129353). Hopefully | 188 // messages from the wrapper here (see https://crbug.com/129353). Hopefully |
188 // WebRTC will be supported soon too (see https://crbug.com/707683). | 189 // WebRTC will be supported soon too (see https://crbug.com/707683). |
189 if (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType) | 190 // Edge supports neither webRequest.ResourceType nor WebSocket blocking yet: |
| 191 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/102973
76/ |
| 192 if (chrome.webRequest.ResourceType && |
| 193 (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType)) |
190 return false; | 194 return false; |
191 | 195 |
192 return ext.webRequest.onBeforeRequest._dispatch( | 196 return ext.webRequest.onBeforeRequest._dispatch( |
193 new URL(msg.url), | 197 new URL(msg.url), |
194 msg.requestType, | 198 msg.requestType, |
195 sender.page, | 199 sender.page, |
196 sender.frame | 200 sender.frame |
197 ).includes(false); | 201 ).includes(false); |
198 }); | 202 }); |
OLD | NEW |