| Left: | ||
| Right: | 
| 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-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 MutationObserver = window.MutationObserver || window.WebKitMutationObserver; | 18 var MutationObserver = window.MutationObserver || window.WebKitMutationObserver; | 
| 19 var SELECTOR_GROUP_SIZE = 200; | 19 var SELECTOR_GROUP_SIZE = 200; | 
| 20 var id = Math.random().toString(36).substr(2); | |
| 20 | 21 | 
| 21 var typeMap = { | 22 var typeMap = { | 
| 22 "img": "IMAGE", | 23 "img": "IMAGE", | 
| 23 "input": "IMAGE", | 24 "input": "IMAGE", | 
| 24 "picture": "IMAGE", | 25 "picture": "IMAGE", | 
| 25 "audio": "MEDIA", | 26 "audio": "MEDIA", | 
| 26 "video": "MEDIA", | 27 "video": "MEDIA", | 
| 27 "frame": "SUBDOCUMENT", | 28 "frame": "SUBDOCUMENT", | 
| 28 "iframe": "SUBDOCUMENT", | 29 "iframe": "SUBDOCUMENT", | 
| 29 "object": "OBJECT", | 30 "object": "OBJECT", | 
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 342 var observer = new MutationObserver(function() | 343 var observer = new MutationObserver(function() | 
| 343 { | 344 { | 
| 344 if (style.parentNode != parentNode) | 345 if (style.parentNode != parentNode) | 
| 345 parentNode.appendChild(style); | 346 parentNode.appendChild(style); | 
| 346 }); | 347 }); | 
| 347 | 348 | 
| 348 observer.observe(parentNode, {childList: true}); | 349 observer.observe(parentNode, {childList: true}); | 
| 349 return observer; | 350 return observer; | 
| 350 } | 351 } | 
| 351 | 352 | 
| 353 function runInPage(fn, arg) | |
| 354 { | |
| 355 var script = document.createElement("script"); | |
| 356 script.type = "application/javascript"; | |
| 357 script.async = false; | |
| 358 | |
| 359 // include.youtube.js passes this function a RegExp which JSON.stringify would | |
| 360 // convert to "{}". | |
| 361 if (!(arg instanceof RegExp)) | |
| 362 arg = JSON.stringify(arg); | |
| 363 | |
| 364 script.textContent = "(" + fn + ")(" + arg + ");"; | |
| 365 document.documentElement.appendChild(script); | |
| 366 document.documentElement.removeChild(script); | |
| 367 } | |
| 368 | |
| 352 function protectStyleSheet(document, style) | 369 function protectStyleSheet(document, style) | 
| 353 { | 370 { | 
| 354 var id = Math.random().toString(36).substr(2) | |
| 355 style.id = id; | 371 style.id = id; | 
| 356 | 372 | 
| 357 var code = [ | 373 runInPage(function(id) | 
| 358 "(function()", | 374 { | 
| 359 "{", | 375 var style = document.getElementById(id) || | 
| 360 ' var style = document.getElementById("' + id + '") ||', | 376 document.documentElement.shadowRoot.getElementById(id); | 
| 361 ' document.documentElement.shadowRoot.getElementById("' + id + '");', | 377 style.removeAttribute("id"); | 
| 362 ' style.removeAttribute("id");' | |
| 363 ]; | |
| 364 | 378 | 
| 365 var disableables = ["style", "style.sheet"]; | 379 var disableables = [style, style.sheet]; | 
| 366 for (var i = 0; i < disableables.length; i++) | 380 for (var i = 0; i < disableables.length; i++) | 
| 381 Object.defineProperty(disableables[i], "disabled", | |
| 382 {value: false, enumerable: true}); | |
| 383 | |
| 384 var boundCall = Function.prototype.call.bind(Function.prototype.call); | |
| 
 
Sebastian Noack
2016/08/09 18:05:14
I don't think that this is necessary here. We don'
 
kzar
2016/08/09 18:50:14
OK, I removed that again.
I agree that we should
 
Sebastian Noack
2016/08/10 08:01:46
Interesting, so why do you do a much more elaborat
 
kzar
2016/08/10 08:07:33
How is it much more elaborate than what would be r
 
Sebastian Noack
2016/08/10 08:44:18
You are right, we'd need to patch Function.prototy
 
kzar
2016/08/10 10:19:44
Fair enough. How about we just go with your .bind(
 
 | |
| 385 ["deleteRule", "removeRule"].forEach(function(method) | |
| 386 { | |
| 387 var original = CSSStyleSheet.prototype[method]; | |
| 388 CSSStyleSheet.prototype[method] = function(index) | |
| 389 { | |
| 390 if (this != style.sheet) | |
| 391 boundCall(original, this, index); | |
| 392 }; | |
| 393 }); | |
| 394 }, id); | |
| 395 } | |
| 396 | |
| 397 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore | |
| 398 // some ad networks are misusing them as a way to serve adverts and circumvent | |
| 399 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket | |
| 400 // connections from being opened. | |
| 401 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353 | |
| 402 function wrapWebSocket() | |
| 403 { | |
| 404 if (typeof WebSocket == "undefined") | |
| 405 return; | |
| 406 | |
| 407 var eventName = "abpws-" + id; | |
| 408 | |
| 409 document.addEventListener(eventName, function(event) | |
| 367 { | 410 { | 
| 368 code.push(" Object.defineProperty(" + disableables[i] + ', "disabled", ' | 411 ext.backgroundPage.sendMessage({ | 
| 369 + "{value: false, enumerable: true});") ; | 412 type: "websocket-request", | 
| 370 } | 413 url: event.detail.url | 
| 414 }, function (block) | |
| 415 { | |
| 416 document.dispatchEvent( | |
| 417 new CustomEvent(eventName + "-" + event.detail.url, {detail: block}) | |
| 418 ); | |
| 419 }); | |
| 420 }); | |
| 371 | 421 | 
| 372 var methods = ["deleteRule", "removeRule"]; | 422 runInPage(function(eventName) | 
| 373 for (var j = 0; j < methods.length; j++) | |
| 374 { | 423 { | 
| 375 var method = methods[j]; | 424 // As far as possible we must track everything we use that could be | 
| 376 if (method in CSSStyleSheet.prototype) | 425 // sabotaged by the website later in order to circumvent us. | 
| 426 var RealWebSocket = WebSocket; | |
| 427 var closeWebSocket = RealWebSocket.prototype.close; | |
| 428 var addEventListener = document.addEventListener.bind(document); | |
| 429 var removeEventListener = document.removeEventListener.bind(document); | |
| 430 var dispatchEvent = document.dispatchEvent.bind(document); | |
| 431 var CustomEvent = window.CustomEvent; | |
| 432 var boundCall = Function.prototype.call.bind(Function.prototype.call); | |
| 433 var functionToString = Function.prototype.toString; | |
| 434 // (Safari 9 considers WebSocket to be an object rather than a function.) | |
| 435 var webSocketString = RealWebSocket.toString(); | |
| 436 | |
| 437 function checkRequest(url, callback) | |
| 377 { | 438 { | 
| 378 var origin = "CSSStyleSheet.prototype." + method; | 439 var incomingEventName = eventName + "-" + url; | 
| 379 code.push(" var " + method + " = " + origin + ";", | 440 function listener(event) | 
| 380 " " + origin + " = function(index)", | 441 { | 
| 381 " {", | 442 callback(event.detail); | 
| 382 " if (this != style.sheet)", | 443 removeEventListener(incomingEventName, listener); | 
| 383 " " + method + ".call(this, index);", | 444 } | 
| 384 " }"); | 445 addEventListener(incomingEventName, listener); | 
| 446 | |
| 447 dispatchEvent(new CustomEvent(eventName, { | |
| 448 detail: {url: url} | |
| 449 })); | |
| 385 } | 450 } | 
| 386 } | |
| 387 | 451 | 
| 388 code.push("})();"); | 452 function wrappedToString() | 
| 453 { | |
| 454 if (this === WebSocket) | |
| 455 return webSocketString; | |
| 456 if (this === wrappedToString) | |
| 457 return boundCall(functionToString, functionToString); | |
| 458 return boundCall(functionToString, this); | |
| 459 }; | |
| 460 Function.prototype.toString = wrappedToString; | |
| 389 | 461 | 
| 390 var script = document.createElement("script"); | 462 WebSocket = function WrappedWebSocket(url, protocols) | 
| 391 script.async = false; | 463 { | 
| 392 script.textContent = code.join("\n"); | 464 // Throw correct exceptions if the constructor is used improperly. | 
| 393 document.documentElement.appendChild(script); | 465 if (!(this instanceof WrappedWebSocket)) return RealWebSocket(); | 
| 394 document.documentElement.removeChild(script); | 466 if (arguments.length < 1) return new RealWebSocket(); | 
| 467 | |
| 468 var websocket = new RealWebSocket(url, protocols); | |
| 469 | |
| 470 checkRequest(websocket.url, function(blocked) | |
| 471 { | |
| 472 if (blocked) | |
| 473 boundCall(closeWebSocket, websocket); | |
| 474 }); | |
| 475 | |
| 476 return websocket; | |
| 477 }; | |
| 478 | |
| 479 var properties = Object.getOwnPropertyNames(RealWebSocket); | |
| 480 for (var i = 0; i < properties.length; i++) | |
| 481 { | |
| 482 var name = properties[i]; | |
| 483 var desc = Object.getOwnPropertyDescriptor(RealWebSocket, name); | |
| 484 Object.defineProperty(WebSocket, name, desc); | |
| 485 } | |
| 486 | |
| 487 RealWebSocket.prototype.constructor = WebSocket; | |
| 488 }, eventName); | |
| 395 } | 489 } | 
| 396 | 490 | 
| 397 function init(document) | 491 function init(document) | 
| 398 { | 492 { | 
| 399 var shadow = null; | 493 var shadow = null; | 
| 400 var style = null; | 494 var style = null; | 
| 401 var observer = null; | 495 var observer = null; | 
| 402 var tracer = null; | 496 var tracer = null; | 
| 403 | 497 | 
| 498 wrapWebSocket(); | |
| 499 | |
| 404 function getPropertyFilters(callback) | 500 function getPropertyFilters(callback) | 
| 405 { | 501 { | 
| 406 ext.backgroundPage.sendMessage({ | 502 ext.backgroundPage.sendMessage({ | 
| 407 type: "filters.get", | 503 type: "filters.get", | 
| 408 what: "cssproperties" | 504 what: "cssproperties" | 
| 409 }, callback); | 505 }, callback); | 
| 410 } | 506 } | 
| 411 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters, | 507 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters, | 
| 412 addElemHideSelectors); | 508 addElemHideSelectors); | 
| 413 | 509 | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 564 }, true); | 660 }, true); | 
| 565 | 661 | 
| 566 return updateStylesheet; | 662 return updateStylesheet; | 
| 567 } | 663 } | 
| 568 | 664 | 
| 569 if (document instanceof HTMLDocument) | 665 if (document instanceof HTMLDocument) | 
| 570 { | 666 { | 
| 571 checkSitekey(); | 667 checkSitekey(); | 
| 572 window.updateStylesheet = init(document); | 668 window.updateStylesheet = init(document); | 
| 573 } | 669 } | 
| OLD | NEW |