Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/content/snippets.js

Issue 29886700: Issue 6969 - Implement abort-on-property-read snippet (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Minor style changes Created Oct. 3, 2018, 10:19 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/content/snippets.js
===================================================================
--- a/lib/content/snippets.js
+++ b/lib/content/snippets.js
@@ -486,8 +486,57 @@
{
event.preventDefault();
}
},
true);
}
exports["prevent-inline-scripts"] = preventInlineScripts;
+
+function randomId()
+{
+ // 2176782336 is 36^6 which mean 6 chars [a-z0-9]
+ // 60466176 is 36^5
+ // 2176782336 - 60466176 = 2116316160. This ensure always 6 chars
+ // for when Math.random() returns 0.0
+ return Math.floor(Math.random() * 2116316160 + 60466176).toString(36);
+}
+
+/**
+ * Will patch a property on the window object to abort when read.
+ * It will intercept the onerror callback and block it if tagged.
+ *
+ * @todo handle properties of properties.
+ *
+ * @param {string} prop the name of the property.
+ */
+function abortOnPropertyRead(prop)
+{
+ if (!prop)
+ return;
+
+ let rid = randomId();
+
+ function canceller()
+ {
+ throw new ReferenceError(rid);
+ }
+
+ let {onerror} = window;
+ window.onerror = (message, ...rest) =>
+ {
+ if (typeof message == "string" && message.includes(rid))
+ return true;
+ if (onerror && typeof onerror == "function")
+ return onerror(this, message, ...rest);
Manish Jethani 2018/10/23 15:31:24 This needs to be onerror.call
hub 2018/10/23 18:23:17 Done.
+ };
+
+ (function(o, p)
Manish Jethani 2018/10/23 15:31:24 I think this should be a separate function: fun
hub 2018/10/23 18:23:17 Done.
+ {
+ // simple property
+ let d = Object.getOwnPropertyDescriptor(o, p);
+ if (!d || d.get != canceller)
+ Object.defineProperty(o, p, {get: canceller, set() {}});
+ })(window, prop);
+}
+
+exports["abort-on-property-read"] = makeInjector(abortOnPropertyRead, randomId);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld