| 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-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 |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 484 if ((!selector || target.matches(selector)) && | 484 if ((!selector || target.matches(selector)) && |
| 485 (!re || re.test(target.textContent))) | 485 (!re || re.test(target.textContent))) |
| 486 { | 486 { |
| 487 event.preventDefault(); | 487 event.preventDefault(); |
| 488 } | 488 } |
| 489 }, | 489 }, |
| 490 true); | 490 true); |
| 491 } | 491 } |
| 492 | 492 |
| 493 exports["prevent-inline-scripts"] = preventInlineScripts; | 493 exports["prevent-inline-scripts"] = preventInlineScripts; |
| 494 | |
| 495 /** | |
| 496 * Generates a random alphanumeric ID consisting 6 base-36 digits | |
|
Manish Jethani
2018/10/28 21:34:06
Nit: consisting *of*
hub
2018/10/29 16:34:02
Done.
| |
| 497 * from the range 100000..zzzzzz (both inclusive). | |
| 498 * | |
| 499 * @returns {string} The random ID. | |
| 500 */ | |
| 501 function randomId() | |
| 502 { | |
| 503 // 2176782336 is 36^6 which mean 6 chars [a-z0-9] | |
| 504 // 60466176 is 36^5 | |
| 505 // 2176782336 - 60466176 = 2116316160. This ensure to always have 6 | |
| 506 // chars even if Math.random() returns its minimum value 0.0 | |
| 507 // | |
| 508 return Math.floor(Math.random() * 2116316160 + 60466176).toString(36); | |
| 509 } | |
| 510 | |
| 511 function wrapPropertyAccess(object, property, descriptor) | |
| 512 { | |
| 513 let currentDescriptor = Object.getOwnPropertyDescriptor(object, property); | |
| 514 if (!currentDescriptor) | |
| 515 currentDescriptor = {}; | |
| 516 if (typeof descriptor.get != "undefined") | |
| 517 currentDescriptor.get = descriptor.get; | |
| 518 if (typeof descriptor.set != "undefined") | |
| 519 currentDescriptor.set = descriptor.set; | |
| 520 Object.defineProperty(object, property, currentDescriptor); | |
| 521 } | |
| 522 | |
| 523 /** | |
| 524 * Will patch a property on the window object to abort when read. | |
|
Manish Jethani
2018/10/28 21:34:05
Suggestion: Patches a property on the window objec
hub
2018/10/29 16:34:02
Done.
| |
| 525 * It will intercept the onerror callback and block it if tagged. | |
|
Manish Jethani
2018/10/28 21:34:05
I don't think the onerror part is necessary, it re
hub
2018/10/29 16:34:02
I'll rephrase as "no error will be printed in the
| |
| 526 * The idea originates from | |
|
Manish Jethani
2018/10/28 21:34:05
Since we are now using JSDoc, how about using a li
hub
2018/10/29 16:34:02
Done.
| |
| 527 * https://github.com/uBlockOrigin/uAssets/blob/80b195436f8f8d78ba713237bfc268ec fc9d9d2b/filters/resources.txt#L1703 | |
| 528 * | |
| 529 * @todo handle properties of properties. | |
|
Manish Jethani
2018/10/28 21:34:05
I searched adblockpluscore, adblockpluschrome, and
hub
2018/10/29 16:34:03
I'll remove it.
| |
| 530 * | |
| 531 * @param {string} property the name of the property. | |
|
Manish Jethani
2018/10/28 21:34:05
Suggestion:
@param {string} property The name o
hub
2018/10/29 16:34:02
Done.
| |
| 532 */ | |
| 533 function abortOnPropertyRead(property) | |
| 534 { | |
| 535 if (!property) | |
| 536 return; | |
| 537 | |
| 538 let rid = randomId(); | |
| 539 | |
| 540 function abort() | |
| 541 { | |
| 542 throw new ReferenceError(rid); | |
| 543 } | |
| 544 | |
| 545 let {onerror} = window; | |
| 546 window.onerror = (message, ...rest) => | |
| 547 { | |
| 548 if (typeof message == "string" && message.includes(rid)) | |
| 549 return true; | |
| 550 if (typeof onerror == "function") | |
| 551 return (() => {}).call.call(onerror, this, message, ...rest); | |
| 552 }; | |
| 553 | |
| 554 wrapPropertyAccess(window, property, {get: abort, set() {}}); | |
| 555 } | |
| 556 | |
| 557 exports["abort-on-property-read"] = makeInjector(abortOnPropertyRead, | |
| 558 wrapPropertyAccess, | |
| 559 randomId); | |
| OLD | NEW |