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 20 matching lines...) Expand all Loading... |
31 | 31 |
32 // Chrome and Firefox (WebExtensions) can't distinguish between | 32 // Chrome and Firefox (WebExtensions) can't distinguish between |
33 // OBJECT_SUBREQUEST and OBJECT requests. | 33 // OBJECT_SUBREQUEST and OBJECT requests. |
34 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; | 34 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; |
35 | 35 |
36 // Map of content types reported by the browser to the respecitve content types | 36 // 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. | 37 // used by Adblock Plus. Other content types are simply mapped to OTHER. |
38 let resourceTypes = new Map(function*() | 38 let resourceTypes = new Map(function*() |
39 { | 39 { |
40 for (let type in RegExpFilter.typeMap) | 40 for (let type in RegExpFilter.typeMap) |
41 yield [type.toLowerCase(), type]; | 41 yield [type, type]; |
42 | 42 |
43 yield ["sub_frame", "SUBDOCUMENT"]; | 43 yield ["SUB_FRAME", "SUBDOCUMENT"]; |
44 | 44 |
45 // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the | 45 // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the |
46 // same concept - merely generalized. | 46 // same concept - merely generalized. |
47 yield ["beacon", "PING"]; | 47 yield ["BEACON", "PING"]; |
48 | 48 |
49 // Treat <img srcset> and <picture> the same as other images. | 49 // Treat <img srcset> and <picture> the same as other images. |
50 yield ["imageset", "IMAGE"]; | 50 yield ["IMAGESET", "IMAGE"]; |
51 }()); | 51 }()); |
52 | 52 |
53 function onBeforeRequestAsync(page, url, type, docDomain, | 53 function onBeforeRequestAsync(page, url, type, docDomain, |
54 thirdParty, sitekey, | 54 thirdParty, sitekey, |
55 specificOnly, filter) | 55 specificOnly, filter) |
56 { | 56 { |
57 if (filter) | 57 if (filter) |
58 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); | 58 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); |
59 | 59 |
60 if (devtools) | 60 if (devtools) |
(...skipping 13 matching lines...) Expand all Loading... |
74 | 74 |
75 let urlString = stringifyURL(url); | 75 let urlString = stringifyURL(url); |
76 let docDomain = extractHostFromFrame(frame); | 76 let docDomain = extractHostFromFrame(frame); |
77 let thirdParty = isThirdParty(url, docDomain); | 77 let thirdParty = isThirdParty(url, docDomain); |
78 let sitekey = getKey(page, frame); | 78 let sitekey = getKey(page, frame); |
79 | 79 |
80 let specificOnly = !!checkWhitelisted( | 80 let specificOnly = !!checkWhitelisted( |
81 page, frame, RegExpFilter.typeMap.GENERICBLOCK | 81 page, frame, RegExpFilter.typeMap.GENERICBLOCK |
82 ); | 82 ); |
83 | 83 |
84 let mappedType = resourceTypes.get(type) || "OTHER"; | 84 let mappedType = resourceTypes.get(type.toUpperCase()) || "OTHER"; |
85 | 85 |
86 let filter = defaultMatcher.matchesAny( | 86 let filter = defaultMatcher.matchesAny( |
87 urlString, RegExpFilter.typeMap[mappedType], | 87 urlString, RegExpFilter.typeMap[mappedType], |
88 docDomain, thirdParty, sitekey, specificOnly | 88 docDomain, thirdParty, sitekey, specificOnly |
89 ); | 89 ); |
90 | 90 |
91 setTimeout(onBeforeRequestAsync, 0, page, urlString, | 91 setTimeout(onBeforeRequestAsync, 0, page, urlString, |
92 mappedType, docDomain, | 92 mappedType, docDomain, |
93 thirdParty, sitekey, | 93 thirdParty, sitekey, |
94 specificOnly, filter); | 94 specificOnly, filter); |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 if (msg.requestType in chrome.webRequest.ResourceType) | 182 if (msg.requestType in chrome.webRequest.ResourceType) |
183 return false; | 183 return false; |
184 | 184 |
185 return ext.webRequest.onBeforeRequest._dispatch( | 185 return ext.webRequest.onBeforeRequest._dispatch( |
186 new URL(msg.url), | 186 new URL(msg.url), |
187 msg.requestType, | 187 msg.requestType, |
188 sender.page, | 188 sender.page, |
189 sender.frame | 189 sender.frame |
190 ).includes(false); | 190 ).includes(false); |
191 }); | 191 }); |
OLD | NEW |