LEFT | RIGHT |
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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 var typeMap = { | 18 "use strict"; |
| 19 |
| 20 const typeMap = { |
19 "img": "IMAGE", | 21 "img": "IMAGE", |
20 "input": "IMAGE", | 22 "input": "IMAGE", |
21 "picture": "IMAGE", | 23 "picture": "IMAGE", |
22 "audio": "MEDIA", | 24 "audio": "MEDIA", |
23 "video": "MEDIA", | 25 "video": "MEDIA", |
24 "frame": "SUBDOCUMENT", | 26 "frame": "SUBDOCUMENT", |
25 "iframe": "SUBDOCUMENT", | 27 "iframe": "SUBDOCUMENT", |
26 "object": "OBJECT", | 28 "object": "OBJECT", |
27 "embed": "OBJECT" | 29 "embed": "OBJECT" |
28 }; | 30 }; |
29 | 31 |
30 function getURLsFromObjectElement(element) | 32 function getURLsFromObjectElement(element) |
31 { | 33 { |
32 var url = element.getAttribute("data"); | 34 let url = element.getAttribute("data"); |
33 if (url) | 35 if (url) |
34 return [url]; | 36 return [url]; |
35 | 37 |
36 for (var i = 0; i < element.children.length; i++) | 38 for (let child of element.children) |
37 { | 39 { |
38 var child = element.children[i]; | |
39 if (child.localName != "param") | 40 if (child.localName != "param") |
40 continue; | 41 continue; |
41 | 42 |
42 var name = child.getAttribute("name"); | 43 let name = child.getAttribute("name"); |
43 if (name != "movie" && // Adobe Flash | 44 if (name != "movie" && // Adobe Flash |
44 name != "source" && // Silverlight | 45 name != "source" && // Silverlight |
45 name != "src" && // Real Media + Quicktime | 46 name != "src" && // Real Media + Quicktime |
46 name != "FileName") // Windows Media | 47 name != "FileName") // Windows Media |
47 continue; | 48 continue; |
48 | 49 |
49 var value = child.getAttribute("value"); | 50 let value = child.getAttribute("value"); |
50 if (!value) | 51 if (!value) |
51 continue; | 52 continue; |
52 | 53 |
53 return [value]; | 54 return [value]; |
54 } | 55 } |
55 | 56 |
56 return []; | 57 return []; |
57 } | 58 } |
58 | 59 |
59 function getURLsFromAttributes(element) | 60 function getURLsFromAttributes(element) |
60 { | 61 { |
61 var urls = []; | 62 let urls = []; |
62 | 63 |
63 if (element.src) | 64 if (element.src) |
64 urls.push(element.src); | 65 urls.push(element.src); |
65 | 66 |
66 if (element.srcset) | 67 if (element.srcset) |
67 { | 68 { |
68 var candidates = element.srcset.split(","); | 69 for (let candidate of element.srcset.split(",")) |
69 for (var i = 0; i < candidates.length; i++) | 70 { |
70 { | 71 let url = candidate.trim().replace(/\s+\S+$/, ""); |
71 var url = candidates[i].trim().replace(/\s+\S+$/, ""); | |
72 if (url) | 72 if (url) |
73 urls.push(url); | 73 urls.push(url); |
74 } | 74 } |
75 } | 75 } |
76 | 76 |
77 return urls; | 77 return urls; |
78 } | 78 } |
79 | 79 |
80 function getURLsFromMediaElement(element) | 80 function getURLsFromMediaElement(element) |
81 { | 81 { |
82 var urls = getURLsFromAttributes(element); | 82 let urls = getURLsFromAttributes(element); |
83 | 83 |
84 for (var i = 0; i < element.children.length; i++) | 84 for (let child of element.children) |
85 { | 85 { |
86 var child = element.children[i]; | |
87 if (child.localName == "source" || child.localName == "track") | 86 if (child.localName == "source" || child.localName == "track") |
88 urls.push.apply(urls, getURLsFromAttributes(child)); | 87 urls.push.apply(urls, getURLsFromAttributes(child)); |
89 } | 88 } |
90 | 89 |
91 if (element.poster) | 90 if (element.poster) |
92 urls.push(element.poster); | 91 urls.push(element.poster); |
93 | 92 |
94 return urls; | 93 return urls; |
95 } | 94 } |
96 | 95 |
97 function getURLsFromElement(element) | 96 function getURLsFromElement(element) |
98 { | 97 { |
99 var urls; | 98 let urls; |
100 switch (element.localName) | 99 switch (element.localName) |
101 { | 100 { |
102 case "object": | 101 case "object": |
103 urls = getURLsFromObjectElement(element); | 102 urls = getURLsFromObjectElement(element); |
104 break; | 103 break; |
105 | 104 |
106 case "video": | 105 case "video": |
107 case "audio": | 106 case "audio": |
108 case "picture": | 107 case "picture": |
109 urls = getURLsFromMediaElement(element); | 108 urls = getURLsFromMediaElement(element); |
110 break; | 109 break; |
111 | 110 |
112 default: | 111 default: |
113 urls = getURLsFromAttributes(element); | 112 urls = getURLsFromAttributes(element); |
114 break; | 113 break; |
115 } | 114 } |
116 | 115 |
117 for (var i = 0; i < urls.length; i++) | 116 for (let i = 0; i < urls.length; i++) |
118 { | 117 { |
119 if (/^(?!https?:)[\w-]+:/i.test(urls[i])) | 118 if (/^(?!https?:)[\w-]+:/i.test(urls[i])) |
120 urls.splice(i--, 1); | 119 urls.splice(i--, 1); |
121 } | 120 } |
122 | 121 |
123 return urls; | 122 return urls; |
124 } | 123 } |
125 | 124 |
126 function checkCollapse(element) | 125 function checkCollapse(element) |
127 { | 126 { |
128 var mediatype = typeMap[element.localName]; | 127 let mediatype = typeMap[element.localName]; |
129 if (!mediatype) | 128 if (!mediatype) |
130 return; | 129 return; |
131 | 130 |
132 var urls = getURLsFromElement(element); | 131 let urls = getURLsFromElement(element); |
133 if (urls.length == 0) | 132 if (urls.length == 0) |
134 return; | 133 return; |
135 | 134 |
136 ext.backgroundPage.sendMessage( | 135 ext.backgroundPage.sendMessage( |
137 { | 136 { |
138 type: "filters.collapse", | 137 type: "filters.collapse", |
139 urls: urls, | 138 urls: urls, |
140 mediatype: mediatype, | 139 mediatype: mediatype, |
141 baseURL: document.location.href | 140 baseURL: document.location.href |
142 }, | 141 }, |
143 | 142 |
144 function(collapse) | 143 collapse => |
145 { | 144 { |
146 function collapseElement() | 145 function collapseElement() |
147 { | 146 { |
148 var propertyName = "display"; | 147 let propertyName = "display"; |
149 var propertyValue = "none"; | 148 let propertyValue = "none"; |
150 if (element.localName == "frame") | 149 if (element.localName == "frame") |
151 { | 150 { |
152 propertyName = "visibility"; | 151 propertyName = "visibility"; |
153 propertyValue = "hidden"; | 152 propertyValue = "hidden"; |
154 } | 153 } |
155 | 154 |
156 if (element.style.getPropertyValue(propertyName) != propertyValue || | 155 if (element.style.getPropertyValue(propertyName) != propertyValue || |
157 element.style.getPropertyPriority(propertyName) != "important") | 156 element.style.getPropertyPriority(propertyName) != "important") |
158 element.style.setProperty(propertyName, propertyValue, "important"); | 157 element.style.setProperty(propertyName, propertyValue, "important"); |
159 } | 158 } |
160 | 159 |
161 if (collapse) | 160 if (collapse) |
162 { | 161 { |
163 collapseElement(); | 162 collapseElement(); |
164 | 163 |
165 new MutationObserver(collapseElement).observe( | 164 new MutationObserver(collapseElement).observe( |
166 element, { | 165 element, { |
167 attributes: true, | 166 attributes: true, |
168 attributeFilter: ["style"] | 167 attributeFilter: ["style"] |
169 } | 168 } |
170 ); | 169 ); |
171 } | 170 } |
172 } | 171 } |
173 ); | 172 ); |
174 } | 173 } |
175 | 174 |
176 function checkSitekey() | 175 function checkSitekey() |
177 { | 176 { |
178 var attr = document.documentElement.getAttribute("data-adblockkey"); | 177 let attr = document.documentElement.getAttribute("data-adblockkey"); |
179 if (attr) | 178 if (attr) |
180 ext.backgroundPage.sendMessage({type: "filters.addKey", token: attr}); | 179 ext.backgroundPage.sendMessage({type: "filters.addKey", token: attr}); |
181 } | 180 } |
182 | 181 |
183 function getContentDocument(element) | 182 function getContentDocument(element) |
184 { | 183 { |
185 try | 184 try |
186 { | 185 { |
187 return element.contentDocument; | 186 return element.contentDocument; |
188 } | 187 } |
189 catch (e) | 188 catch (e) |
190 { | 189 { |
191 return null; | 190 return null; |
192 } | 191 } |
193 } | 192 } |
194 | 193 |
195 function ElementHidingTracer() | 194 function ElementHidingTracer() |
196 { | 195 { |
197 this.filters = {}; | 196 this.selectors = []; |
| 197 this.filters = []; |
198 | 198 |
199 this.changedNodes = []; | 199 this.changedNodes = []; |
200 this.timeout = null; | 200 this.timeout = null; |
201 this.started = false; | |
202 | 201 |
203 this.observer = new MutationObserver(this.observe.bind(this)); | 202 this.observer = new MutationObserver(this.observe.bind(this)); |
204 this.trace = this.trace.bind(this); | 203 this.trace = this.trace.bind(this); |
| 204 |
| 205 if (document.readyState == "loading") |
| 206 document.addEventListener("DOMContentLoaded", this.trace); |
| 207 else |
| 208 this.trace(); |
205 } | 209 } |
206 ElementHidingTracer.prototype = { | 210 ElementHidingTracer.prototype = { |
207 start: function() | 211 addSelectors(selectors, filters) |
208 { | 212 { |
209 let _start = () => { | 213 if (document.readyState != "loading") |
210 this.trace(); | 214 this.checkNodes([document], selectors, filters); |
211 this.started = true; | 215 |
212 }; | 216 this.selectors.push(...selectors); |
213 | 217 this.filters.push(...filters); |
214 if (document.readyState == "loading") | 218 }, |
215 document.addEventListener("DOMContentLoaded", _start); | 219 |
216 else | 220 checkNodes(nodes, selectors, filters) |
217 _start(); | 221 { |
218 }, | 222 let matchedSelectors = []; |
219 | 223 |
220 addFilters: function(filters) | 224 for (let i = 0; i < selectors.length; i++) |
221 { | 225 { |
222 if (this.started) | 226 nodes: for (let node of nodes) |
223 window.setTimeout(() => { | 227 { |
224 this.checkNodes([document], filters); | 228 let elements = node.querySelectorAll(selectors[i]); |
225 }, 0); | 229 |
226 | 230 for (let element of elements) |
227 Object.assign(this.filters, filters); | |
228 }, | |
229 | |
230 checkNodes: function(nodes, filters) | |
231 { | |
232 let matchedFilters = []; | |
233 | |
234 for (let filter of Object.keys(this.filters)) | |
235 { | |
236 let selectors = this.filters[filter]; | |
237 | |
238 for (let i = 0; i < selectors.length; i++) | |
239 { | |
240 for (var j = 0; j < nodes.length; j++) | |
241 { | 231 { |
242 var elements = nodes[j].querySelectorAll(selectors[i]); | 232 // Only consider selectors that actually have an effect on the |
243 var matched = false; | 233 // computed styles, and aren't overridden by rules with higher |
244 | 234 // priority, or haven't been circumvented in a different way. |
245 for (var k = 0; k < elements.length; k++) | 235 if (getComputedStyle(element).display == "none") |
246 { | 236 { |
247 // Only consider selectors that actually have an effect on the | 237 matchedSelectors.push(filters[i].replace(/^.*?##/, "")); |
248 // computed styles, and aren't overridden by rules with higher | 238 break nodes; |
249 // priority, or haven't been circumvented in a different way. | |
250 if (getComputedStyle(elements[k]).display == "none") | |
251 { | |
252 matchedFilters.push(filter.replace(/^.*?##/, "")); | |
253 matched = true; | |
254 break; | |
255 } | |
256 } | 239 } |
257 | |
258 if (matched) | |
259 break; | |
260 } | 240 } |
261 } | 241 } |
262 } | 242 } |
263 | 243 |
264 if (matchedFilters.length > 0) | 244 if (matchedSelectors.length > 0) |
265 ext.backgroundPage.sendMessage({ | 245 ext.backgroundPage.sendMessage({ |
266 type: "devtools.traceElemHide", | 246 type: "devtools.traceElemHide", |
267 selectors: matchedFilters | 247 selectors: matchedSelectors |
268 }); | 248 }); |
269 }, | 249 }, |
270 | 250 |
271 onTimeout: function() | 251 onTimeout() |
272 { | 252 { |
273 this.checkNodes(this.changedNodes, this.selectors); | 253 this.checkNodes(this.changedNodes, this.selectors, this.filters); |
274 this.changedNodes = []; | 254 this.changedNodes = []; |
275 this.timeout = null; | 255 this.timeout = null; |
276 }, | 256 }, |
277 | 257 |
278 observe: function(mutations) | 258 observe(mutations) |
279 { | 259 { |
280 // Forget previously changed nodes that are no longer in the DOM. | 260 // Forget previously changed nodes that are no longer in the DOM. |
281 for (var i = 0; i < this.changedNodes.length; i++) | 261 for (let i = 0; i < this.changedNodes.length; i++) |
282 { | 262 { |
283 if (!document.contains(this.changedNodes[i])) | 263 if (!document.contains(this.changedNodes[i])) |
284 this.changedNodes.splice(i--, 1); | 264 this.changedNodes.splice(i--, 1); |
285 } | 265 } |
286 | 266 |
287 for (var j = 0; j < mutations.length; j++) | 267 for (let mutation of mutations) |
288 { | 268 { |
289 var mutation = mutations[j]; | 269 let node = mutation.target; |
290 var node = mutation.target; | |
291 | 270 |
292 // Ignore mutations of nodes that aren't in the DOM anymore. | 271 // Ignore mutations of nodes that aren't in the DOM anymore. |
293 if (!document.contains(node)) | 272 if (!document.contains(node)) |
294 continue; | 273 continue; |
295 | 274 |
296 // Since querySelectorAll() doesn't consider the root itself | 275 // Since querySelectorAll() doesn't consider the root itself |
297 // and since CSS selectors can also match siblings, we have | 276 // and since CSS selectors can also match siblings, we have |
298 // to consider the parent node for attribute mutations. | 277 // to consider the parent node for attribute mutations. |
299 if (mutation.type == "attributes") | 278 if (mutation.type == "attributes") |
300 node = node.parentNode; | 279 node = node.parentNode; |
301 | 280 |
302 var addNode = true; | 281 let addNode = true; |
303 for (var k = 0; k < this.changedNodes.length; k++) | 282 for (let i = 0; i < this.changedNodes.length; i++) |
304 { | 283 { |
305 var previouslyChangedNode = this.changedNodes[k]; | 284 let previouslyChangedNode = this.changedNodes[i]; |
306 | 285 |
307 // If we are already going to check an ancestor of this node, | 286 // If we are already going to check an ancestor of this node, |
308 // we can ignore this node, since it will be considered anyway | 287 // we can ignore this node, since it will be considered anyway |
309 // when checking one of its ancestors. | 288 // when checking one of its ancestors. |
310 if (previouslyChangedNode.contains(node)) | 289 if (previouslyChangedNode.contains(node)) |
311 { | 290 { |
312 addNode = false; | 291 addNode = false; |
313 break; | 292 break; |
314 } | 293 } |
315 | 294 |
316 // If this node is an ancestor of a node that previously changed, | 295 // If this node is an ancestor of a node that previously changed, |
317 // we can ignore that node, since it will be considered anyway | 296 // we can ignore that node, since it will be considered anyway |
318 // when checking one of its ancestors. | 297 // when checking one of its ancestors. |
319 if (node.contains(previouslyChangedNode)) | 298 if (node.contains(previouslyChangedNode)) |
320 this.changedNodes.splice(k--, 1); | 299 this.changedNodes.splice(i--, 1); |
321 } | 300 } |
322 | 301 |
323 if (addNode) | 302 if (addNode) |
324 this.changedNodes.push(node); | 303 this.changedNodes.push(node); |
325 } | 304 } |
326 | 305 |
327 // Check only nodes whose descendants have changed, and not more often | 306 // Check only nodes whose descendants have changed, and not more often |
328 // than once a second. Otherwise large pages with a lot of DOM mutations | 307 // than once a second. Otherwise large pages with a lot of DOM mutations |
329 // (like YouTube) freeze when the devtools panel is active. | 308 // (like YouTube) freeze when the devtools panel is active. |
330 if (this.timeout == null) | 309 if (this.timeout == null) |
331 this.timeout = setTimeout(this.onTimeout.bind(this), 1000); | 310 this.timeout = setTimeout(this.onTimeout.bind(this), 1000); |
332 }, | 311 }, |
333 | 312 |
334 trace: function() | 313 trace() |
335 { | 314 { |
336 this.checkNodes([document], this.selectors); | 315 this.checkNodes([document], this.selectors, this.filters); |
337 | 316 |
338 this.observer.observe( | 317 this.observer.observe( |
339 document, | 318 document, |
340 { | 319 { |
341 childList: true, | 320 childList: true, |
342 attributes: true, | 321 attributes: true, |
343 subtree: true | 322 subtree: true |
344 } | 323 } |
345 ); | 324 ); |
346 }, | 325 }, |
347 | 326 |
348 disconnect: function() | 327 disconnect() |
349 { | 328 { |
350 document.removeEventListener("DOMContentLoaded", this.trace); | 329 document.removeEventListener("DOMContentLoaded", this.trace); |
351 this.observer.disconnect(); | 330 this.observer.disconnect(); |
352 clearTimeout(this.timeout); | 331 clearTimeout(this.timeout); |
353 } | 332 } |
354 }; | 333 }; |
355 | 334 |
356 function runInPageContext(fn, arg) | 335 function runInPageContext(fn, arg) |
357 { | 336 { |
358 var script = document.createElement("script"); | 337 let script = document.createElement("script"); |
359 script.type = "application/javascript"; | 338 script.type = "application/javascript"; |
360 script.async = false; | 339 script.async = false; |
361 script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");"; | 340 script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");"; |
362 document.documentElement.appendChild(script); | 341 document.documentElement.appendChild(script); |
363 document.documentElement.removeChild(script); | 342 document.documentElement.removeChild(script); |
364 } | 343 } |
365 | 344 |
366 // Chrome doesn't allow us to intercept WebSockets[1], and therefore | 345 // Chrome doesn't allow us to intercept WebSockets[1], and therefore |
367 // some ad networks are misusing them as a way to serve adverts and circumvent | 346 // some ad networks are misusing them as a way to serve adverts and circumvent |
368 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket | 347 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket |
369 // connections from being opened. | 348 // connections from being opened. |
370 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353 | 349 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353 |
371 function wrapWebSocket() | 350 function wrapWebSocket() |
372 { | 351 { |
373 var eventName = "abpws-" + Math.random().toString(36).substr(2); | 352 let eventName = "abpws-" + Math.random().toString(36).substr(2); |
374 | 353 |
375 document.addEventListener(eventName, function(event) | 354 document.addEventListener(eventName, event => |
376 { | 355 { |
377 ext.backgroundPage.sendMessage({ | 356 ext.backgroundPage.sendMessage({ |
378 type: "request.websocket", | 357 type: "request.websocket", |
379 url: event.detail.url | 358 url: event.detail.url |
380 }, function (block) | 359 }, block => |
381 { | 360 { |
382 document.dispatchEvent( | 361 document.dispatchEvent( |
383 new CustomEvent(eventName + "-" + event.detail.url, {detail: block}) | 362 new CustomEvent(eventName + "-" + event.detail.url, {detail: block}) |
384 ); | 363 ); |
385 }); | 364 }); |
386 }); | 365 }); |
387 | 366 |
388 runInPageContext(function(eventName) | 367 runInPageContext(eventName => |
389 { | 368 { |
390 // As far as possible we must track everything we use that could be | 369 // As far as possible we must track everything we use that could be |
391 // sabotaged by the website later in order to circumvent us. | 370 // sabotaged by the website later in order to circumvent us. |
392 var RealWebSocket = WebSocket; | 371 let RealWebSocket = WebSocket; |
393 var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.cl
ose); | 372 let closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.cl
ose); |
394 var addEventListener = document.addEventListener.bind(document); | 373 let addEventListener = document.addEventListener.bind(document); |
395 var removeEventListener = document.removeEventListener.bind(document); | 374 let removeEventListener = document.removeEventListener.bind(document); |
396 var dispatchEvent = document.dispatchEvent.bind(document); | 375 let dispatchEvent = document.dispatchEvent.bind(document); |
397 var CustomEvent = window.CustomEvent; | 376 let CustomEvent = window.CustomEvent; |
398 | 377 |
399 function checkRequest(url, callback) | 378 function checkRequest(url, callback) |
400 { | 379 { |
401 var incomingEventName = eventName + "-" + url; | 380 let incomingEventName = eventName + "-" + url; |
402 function listener(event) | 381 function listener(event) |
403 { | 382 { |
404 callback(event.detail); | 383 callback(event.detail); |
405 removeEventListener(incomingEventName, listener); | 384 removeEventListener(incomingEventName, listener); |
406 } | 385 } |
407 addEventListener(incomingEventName, listener); | 386 addEventListener(incomingEventName, listener); |
408 | 387 |
409 dispatchEvent(new CustomEvent(eventName, { | 388 dispatchEvent(new CustomEvent(eventName, { |
410 detail: {url: url} | 389 detail: {url: url} |
411 })); | 390 })); |
412 } | 391 } |
413 | 392 |
414 function WrappedWebSocket(url) | 393 function WrappedWebSocket(url) |
415 { | 394 { |
416 // Throw correct exceptions if the constructor is used improperly. | 395 // Throw correct exceptions if the constructor is used improperly. |
417 if (!(this instanceof WrappedWebSocket)) return RealWebSocket(); | 396 if (!(this instanceof WrappedWebSocket)) return RealWebSocket(); |
418 if (arguments.length < 1) return new RealWebSocket(); | 397 if (arguments.length < 1) return new RealWebSocket(); |
419 | 398 |
420 var websocket; | 399 let websocket; |
421 if (arguments.length == 1) | 400 if (arguments.length == 1) |
422 websocket = new RealWebSocket(url); | 401 websocket = new RealWebSocket(url); |
423 else | 402 else |
424 websocket = new RealWebSocket(url, arguments[1]); | 403 websocket = new RealWebSocket(url, arguments[1]); |
425 | 404 |
426 checkRequest(websocket.url, function(blocked) | 405 checkRequest(websocket.url, blocked => |
427 { | 406 { |
428 if (blocked) | 407 if (blocked) |
429 closeWebSocket(websocket); | 408 closeWebSocket(websocket); |
430 }); | 409 }); |
431 | 410 |
432 return websocket; | 411 return websocket; |
433 } | 412 } |
434 WrappedWebSocket.prototype = RealWebSocket.prototype; | 413 WrappedWebSocket.prototype = RealWebSocket.prototype; |
435 WebSocket = WrappedWebSocket.bind(); | 414 WebSocket = WrappedWebSocket.bind(); |
436 Object.defineProperties(WebSocket, { | 415 Object.defineProperties(WebSocket, { |
437 CONNECTING: {value: RealWebSocket.CONNECTING, enumerable: true}, | 416 CONNECTING: {value: RealWebSocket.CONNECTING, enumerable: true}, |
438 OPEN: {value: RealWebSocket.OPEN, enumerable: true}, | 417 OPEN: {value: RealWebSocket.OPEN, enumerable: true}, |
439 CLOSING: {value: RealWebSocket.CLOSING, enumerable: true}, | 418 CLOSING: {value: RealWebSocket.CLOSING, enumerable: true}, |
440 CLOSED: {value: RealWebSocket.CLOSED, enumerable: true}, | 419 CLOSED: {value: RealWebSocket.CLOSED, enumerable: true}, |
441 prototype: {value: RealWebSocket.prototype} | 420 prototype: {value: RealWebSocket.prototype} |
442 }); | 421 }); |
443 | 422 |
444 RealWebSocket.prototype.constructor = WebSocket; | 423 RealWebSocket.prototype.constructor = WebSocket; |
445 }, eventName); | 424 }, eventName); |
446 } | 425 } |
447 | 426 |
448 function ElemHide() | 427 function ElemHide() |
449 { | 428 { |
450 this.shadow = this.createShadowTree(); | 429 this.shadow = this.createShadowTree(); |
451 this.style = null; | 430 this.style = null; |
452 this.tracer = null; | 431 this.tracer = null; |
453 | 432 |
454 this.elemHideEmulation = new ElemHideEmulation( | 433 this.elemHideEmulation = new ElemHideEmulation( |
455 window, | 434 window, |
456 function(callback) | 435 callback => |
457 { | 436 { |
458 ext.backgroundPage.sendMessage({ | 437 ext.backgroundPage.sendMessage({ |
459 type: "filters.get", | 438 type: "filters.get", |
460 what: "elemhideemulation" | 439 what: "elemhideemulation" |
461 }, callback); | 440 }, callback); |
462 }, | 441 }, |
463 this.addSelectors.bind(this) | 442 this.addSelectors.bind(this) |
464 ); | 443 ); |
465 } | 444 } |
466 ElemHide.prototype = { | 445 ElemHide.prototype = { |
467 selectorGroupSize: 200, | 446 selectorGroupSize: 200, |
468 | 447 |
469 createShadowTree: function() | 448 createShadowTree() |
470 { | 449 { |
471 // Use Shadow DOM if available as to not mess with with web pages that | 450 // Use Shadow DOM if available as to not mess with with web pages that |
472 // rely on the order of their own <style> tags (#309). However, creating | 451 // rely on the order of their own <style> tags (#309). However, creating |
473 // a shadow root breaks running CSS transitions. So we have to create | 452 // a shadow root breaks running CSS transitions. So we have to create |
474 // the shadow root before transistions might start (#452). | 453 // the shadow root before transistions might start (#452). |
475 if (!("createShadowRoot" in document.documentElement)) | 454 if (!("createShadowRoot" in document.documentElement)) |
476 return null; | 455 return null; |
477 | 456 |
478 // Using shadow DOM causes issues on some Google websites, | 457 // Using shadow DOM causes issues on some Google websites, |
479 // including Google Docs, Gmail and Blogger (#1770, #2602, #2687). | 458 // including Google Docs, Gmail and Blogger (#1770, #2602, #2687). |
480 if (/\.(?:google|blogger)\.com$/.test(document.domain)) | 459 if (/\.(?:google|blogger)\.com$/.test(document.domain)) |
481 return null; | 460 return null; |
482 | 461 |
483 // Finally since some users have both AdBlock and Adblock Plus installed we | 462 // Finally since some users have both AdBlock and Adblock Plus installed we |
484 // have to consider how the two extensions interact. For example we want to | 463 // have to consider how the two extensions interact. For example we want to |
485 // avoid creating the shadowRoot twice. | 464 // avoid creating the shadowRoot twice. |
486 var shadow = document.documentElement.shadowRoot || | 465 let shadow = document.documentElement.shadowRoot || |
487 document.documentElement.createShadowRoot(); | 466 document.documentElement.createShadowRoot(); |
488 shadow.appendChild(document.createElement("shadow")); | 467 shadow.appendChild(document.createElement("shadow")); |
489 | 468 |
490 // Stop the website from messing with our shadow root (#4191, #4298). | 469 // Stop the website from messing with our shadow root (#4191, #4298). |
491 if ("shadowRoot" in Element.prototype) | 470 if ("shadowRoot" in Element.prototype) |
492 { | 471 { |
493 runInPageContext(function() | 472 runInPageContext(() => |
494 { | 473 { |
495 var ourShadowRoot = document.documentElement.shadowRoot; | 474 let ourShadowRoot = document.documentElement.shadowRoot; |
496 if (!ourShadowRoot) | 475 if (!ourShadowRoot) |
497 return; | 476 return; |
498 var desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoo
t"); | 477 let desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoo
t"); |
499 var shadowRoot = Function.prototype.call.bind(desc.get); | 478 let shadowRoot = Function.prototype.call.bind(desc.get); |
500 | 479 |
501 Object.defineProperty(Element.prototype, "shadowRoot", { | 480 Object.defineProperty(Element.prototype, "shadowRoot", { |
502 configurable: true, enumerable: true, get: function() | 481 configurable: true, enumerable: true, get() |
503 { | 482 { |
504 var shadow = shadowRoot(this); | 483 let shadow = shadowRoot(this); |
505 return shadow == ourShadowRoot ? null : shadow; | 484 return shadow == ourShadowRoot ? null : shadow; |
506 } | 485 } |
507 }); | 486 }); |
508 }, null); | 487 }, null); |
509 } | 488 } |
510 | 489 |
511 return shadow; | 490 return shadow; |
512 }, | 491 }, |
513 | 492 |
514 addSelectors: function(filters) | 493 addSelectors(selectors, filters) |
515 { | 494 { |
516 if (!filters) | 495 if (selectors.length == 0) |
517 return; | 496 return; |
518 | |
519 if (this.tracer) | |
520 this.tracer.addFilters(filters); | |
521 | |
522 let selectors = []; | |
523 for (let filter of Object.keys(filters)) | |
524 { | |
525 let filterSelectors = filters[filter]; | |
526 for (let i = 0; i < filterSelectors.length; i++) | |
527 selectors.push(filterSelectors[i]); | |
528 } | |
529 | 497 |
530 if (!this.style) | 498 if (!this.style) |
531 { | 499 { |
532 // Create <style> element lazily, only if we add styles. Add it to | 500 // Create <style> element lazily, only if we add styles. Add it to |
533 // the shadow DOM if possible. Otherwise fallback to the <head> or | 501 // the shadow DOM if possible. Otherwise fallback to the <head> or |
534 // <html> element. If we have injected a style element before that | 502 // <html> element. If we have injected a style element before that |
535 // has been removed (the sheet property is null), create a new one. | 503 // has been removed (the sheet property is null), create a new one. |
536 this.style = document.createElement("style"); | 504 this.style = document.createElement("style"); |
537 (this.shadow || document.head | 505 (this.shadow || document.head |
538 || document.documentElement).appendChild(this.style); | 506 || document.documentElement).appendChild(this.style); |
539 | 507 |
540 // It can happen that the frame already navigated to a different | 508 // It can happen that the frame already navigated to a different |
541 // document while we were waiting for the background page to respond. | 509 // document while we were waiting for the background page to respond. |
542 // In that case the sheet property will stay null, after addind the | 510 // In that case the sheet property will stay null, after addind the |
543 // <style> element to the shadow DOM. | 511 // <style> element to the shadow DOM. |
544 if (!this.style.sheet) | 512 if (!this.style.sheet) |
545 return; | 513 return; |
546 } | 514 } |
547 | 515 |
548 // If using shadow DOM, we have to add the ::content pseudo-element | 516 // If using shadow DOM, we have to add the ::content pseudo-element |
549 // before each selector, in order to match elements within the | 517 // before each selector, in order to match elements within the |
550 // insertion point. | 518 // insertion point. |
| 519 let preparedSelectors = []; |
551 if (this.shadow) | 520 if (this.shadow) |
552 { | 521 { |
553 var preparedSelectors = []; | 522 for (let selector of selectors) |
554 for (var i = 0; i < selectors.length; i++) | 523 { |
555 { | 524 let subSelectors = splitSelector(selector); |
556 var subSelectors = splitSelector(selectors[i]); | 525 for (let subSelector of subSelectors) |
557 for (var j = 0; j < subSelectors.length; j++) | 526 preparedSelectors.push("::content " + subSelector); |
558 preparedSelectors.push("::content " + subSelectors[j]); | 527 } |
559 } | 528 } |
560 selectors = preparedSelectors; | 529 else |
| 530 { |
| 531 preparedSelectors = selectors; |
561 } | 532 } |
562 | 533 |
563 // Safari only allows 8192 primitive selectors to be injected at once[1], we | 534 // Safari only allows 8192 primitive selectors to be injected at once[1], we |
564 // therefore chunk the inserted selectors into groups of 200 to be safe. | 535 // therefore chunk the inserted selectors into groups of 200 to be safe. |
565 // (Chrome also has a limit, larger... but we're not certain exactly what it | 536 // (Chrome also has a limit, larger... but we're not certain exactly what it |
566 // is! Edge apparently has no such limit.) | 537 // is! Edge apparently has no such limit.) |
567 // [1] - https://github.com/WebKit/webkit/blob/1cb2227f6b2a1035f7bdc46e5ab69
debb75fc1de/Source/WebCore/css/RuleSet.h#L68 | 538 // [1] - https://github.com/WebKit/webkit/blob/1cb2227f6b2a1035f7bdc46e5ab69
debb75fc1de/Source/WebCore/css/RuleSet.h#L68 |
568 for (var i = 0; i < selectors.length; i += this.selectorGroupSize) | 539 for (let i = 0; i < preparedSelectors.length; i += this.selectorGroupSize) |
569 { | 540 { |
570 var selector = selectors.slice(i, i + this.selectorGroupSize).join(", "); | 541 let selector = preparedSelectors.slice(i, i + this.selectorGroupSize).join
(", "); |
571 this.style.sheet.insertRule(selector + "{display: none !important;}", | 542 this.style.sheet.insertRule(selector + "{display: none !important;}", |
572 this.style.sheet.cssRules.length); | 543 this.style.sheet.cssRules.length); |
573 } | 544 } |
574 }, | 545 |
575 | 546 if (this.tracer) |
576 apply: function() | 547 this.tracer.addSelectors(selectors, filters || selectors); |
577 { | 548 }, |
578 var selectors = null; | 549 |
579 | 550 apply() |
580 var checkLoaded = function() | 551 { |
| 552 ext.backgroundPage.sendMessage({type: "get-selectors"}, response => |
581 { | 553 { |
582 if (this.tracer) | 554 if (this.tracer) |
583 this.tracer.disconnect(); | 555 this.tracer.disconnect(); |
584 this.tracer = null; | 556 this.tracer = null; |
585 | 557 |
586 if (selectors.trace) | |
587 this.tracer = new ElementHidingTracer(); | |
588 | |
589 if (this.style && this.style.parentElement) | 558 if (this.style && this.style.parentElement) |
590 this.style.parentElement.removeChild(this.style); | 559 this.style.parentElement.removeChild(this.style); |
591 this.style = null; | 560 this.style = null; |
592 | 561 |
593 if (selectors.selectors) | 562 if (response.trace) |
594 { | 563 this.tracer = new ElementHidingTracer(); |
595 let filters = {}; | 564 |
596 for (let i = 0; i < selectors.selectors.length; i++) | 565 this.addSelectors(response.selectors); |
597 filters[selectors.selectors[i]] = [selectors.selectors[i]]; | |
598 this.addSelectors(filters); | |
599 } | |
600 this.elemHideEmulation.apply(); | 566 this.elemHideEmulation.apply(); |
601 | |
602 if (this.tracer) | |
603 this.tracer.start(); | |
604 }.bind(this); | |
605 | |
606 ext.backgroundPage.sendMessage({type: "get-selectors"}, response => | |
607 { | |
608 selectors = response; | |
609 this.elemHideEmulation.load(checkLoaded); | |
610 }); | 567 }); |
611 } | 568 } |
612 }; | 569 }; |
613 | 570 |
614 if (document instanceof HTMLDocument) | 571 if (document instanceof HTMLDocument) |
615 { | 572 { |
616 checkSitekey(); | 573 checkSitekey(); |
617 wrapWebSocket(); | 574 wrapWebSocket(); |
618 | 575 |
| 576 // This variable is also used by our other content scripts, outside of the |
| 577 // current scope. |
619 var elemhide = new ElemHide(); | 578 var elemhide = new ElemHide(); |
620 elemhide.apply(); | 579 elemhide.apply(); |
621 | 580 |
622 document.addEventListener("error", function(event) | 581 document.addEventListener("error", event => |
623 { | 582 { |
624 checkCollapse(event.target); | 583 checkCollapse(event.target); |
625 }, true); | 584 }, true); |
626 | 585 |
627 document.addEventListener("load", function(event) | 586 document.addEventListener("load", event => |
628 { | 587 { |
629 var element = event.target; | 588 let element = event.target; |
630 if (/^i?frame$/.test(element.localName)) | 589 if (/^i?frame$/.test(element.localName)) |
631 checkCollapse(element); | 590 checkCollapse(element); |
632 }, true); | 591 }, true); |
633 } | 592 } |
LEFT | RIGHT |