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

Unified Diff: lib/content/snippets.js

Issue 29995559: Issue 7236 - Handle sub properties in abort-on-property snippets (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: use typeof instead. Remove test. Created Feb. 4, 2019, 7:54 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
@@ -693,24 +693,51 @@
// 2176782336 is 36^6 which mean 6 chars [a-z0-9]
// 60466176 is 36^5
// 2176782336 - 60466176 = 2116316160. This ensure to always have 6
// chars even if Math.random() returns its minimum value 0.0
//
return Math.floor(Math.random() * 2116316160 + 60466176).toString(36);
}
-function wrapPropertyAccess(object, property, descriptor)
+function wrapPropertyAccess(object, property, descriptor, magic)
{
- let currentDescriptor = Object.getOwnPropertyDescriptor(object, property);
- if (currentDescriptor && !currentDescriptor.configurable)
- return false;
+ let dot = property.indexOf(".");
+ if (dot == -1)
+ {
+ // simple property case.
+ let currentDescriptor = Object.getOwnPropertyDescriptor(object, property);
+ if (currentDescriptor && !currentDescriptor.configurable)
+ return false;
+
+ Object.defineProperty(object, property, descriptor);
+ return true;
+ }
+ let name = property.slice(0, dot);
+ property = property.slice(dot + 1);
+ let value = object[name];
+ if (value && typeof value == "object")
+ return wrapPropertyAccess(value, property, descriptor);
Manish Jethani 2019/02/05 14:47:17 Don't we have to pass along magic here?
hub 2019/02/05 15:20:20 Yes we do. Done.
- Object.defineProperty(object, property, descriptor);
- return true;
+ let currentDescriptor = Object.getOwnPropertyDescriptor(object, name);
+ if (currentDescriptor && currentDescriptor.set &&
+ magic && currentDescriptor.set.hasOwnProperty(magic))
Manish Jethani 2019/02/05 14:47:17 Here check for magic being truthy seems redundant
hub 2019/02/05 15:20:20 might as well remove it. It's a corner case anyway
+ {
+ return true;
+ }
+
+ let v;
+ let setter = a =>
+ {
+ v = a;
+ if (a && typeof a == "object")
+ wrapPropertyAccess(a, property, descriptor, magic);
+ };
+ setter[magic] = undefined;
+ Object.defineProperty(object, name, {get: () => v, set: setter});
}
Manish Jethani 2019/02/05 14:47:17 What about the return value here?
hub 2019/02/05 15:20:20 Done.
/**
* Overrides the <code>onerror</code> handler to discard tagged error messages
* from our property wrapping.
*
* @param {string} magic The magic string that tags the error message.
*/
@@ -744,17 +771,17 @@
let rid = randomId();
function abort()
{
throw new ReferenceError(rid);
}
- if (wrapPropertyAccess(window, property, {get: abort, set() {}}))
+ if (wrapPropertyAccess(window, property, {get: abort, set() {}}, rid))
overrideOnError(rid);
}
exports["abort-on-property-read"] = makeInjector(abortOnPropertyRead,
wrapPropertyAccess,
overrideOnError,
randomId);
@@ -776,17 +803,17 @@
let rid = randomId();
function abort()
{
throw new ReferenceError(rid);
}
- if (wrapPropertyAccess(window, property, {set: abort}))
+ if (wrapPropertyAccess(window, property, {set: abort}, rid))
overrideOnError(rid);
}
exports["abort-on-property-write"] = makeInjector(abortOnPropertyWrite,
wrapPropertyAccess,
overrideOnError,
randomId);
@@ -839,15 +866,15 @@
},
set(value)
{
abort();
currentValue = value;
}
};
- if (wrapPropertyAccess(object, name, descriptor))
+ if (wrapPropertyAccess(object, name, descriptor, rid))
overrideOnError(rid);
}
exports["abort-current-inline-script"] =
makeInjector(abortCurrentInlineScript, wrapPropertyAccess, toRegExp,
overrideOnError, regexEscape, 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