Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1322415. Fix property enumeration on cross-origin windows to include indexed props, and add some tests for the ordering of the indexed, named, and symbol-named props on cross-origin objects (window and location). r=bholley

Browse Source
This commit is contained in:
Boris Zbarsky 2016-12-13 13:14:43 -05:00
parent 486c996050
commit 43e94e6458
3 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@ -1703,6 +1703,22 @@ bool
DOMXrayTraits::enumerateNames(JSContext* cx, HandleObject wrapper, unsigned flags,
AutoIdVector& props)
{
// Put the indexed properties for a window first.
nsGlobalWindow* win = AsWindow(cx, wrapper);
if (win) {
uint32_t length = win->Length();
if (!props.reserve(props.length() + length)) {
return false;
}
JS::RootedId indexId(cx);
for (uint32_t i = 0; i < length; ++i) {
if (!JS_IndexToId(cx, i, &indexId)) {
return false;
}
props.infallibleAppend(indexId);
}
}
JS::Rooted<JSObject*> obj(cx, getTargetObject(wrapper));
return XrayOwnPropertyKeys(cx, wrapper, obj, flags, props);
}

57
testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
View File

@ -70,10 +70,15 @@ addTest(function() {
* Also tests for [[GetOwnProperty]] and [[HasOwnProperty]] behavior.
*/
var whitelistedWindowIndices = ['0', '1'];
var whitelistedWindowPropNames = ['location', 'postMessage', 'window', 'frames', 'self', 'top', 'parent',
'opener', 'closed', 'close', 'blur', 'focus', 'length'];
var whitelistedSymbols = [Symbol.isConcatSpreadable, Symbol.toStringTag,
Symbol.hasInstance];
whitelistedWindowPropNames = whitelistedWindowPropNames.concat(whitelistedWindowIndices);
whitelistedWindowPropNames.sort();
var whitelistedLocationPropNames = ['href', 'replace'];
whitelistedLocationPropNames.sort();
var whitelistedSymbols = [Symbol.toStringTag, Symbol.hasInstance,
Symbol.isConcatSpreadable];
var whitelistedWindowProps = whitelistedWindowPropNames.concat(whitelistedSymbols);
addTest(function() {
@ -260,35 +265,43 @@ addTest(function() {
*/
addTest(function() {
assert_array_equals(whitelistedWindowPropNames.sort(),
Object.getOwnPropertyNames(C).sort(),
assert_array_equals(Object.getOwnPropertyNames(C).sort(),
whitelistedWindowPropNames,
"Object.getOwnPropertyNames() gives the right answer for cross-origin Window");
assert_array_equals(Object.getOwnPropertyNames(C.location).sort(), ['href', 'replace'],
assert_array_equals(Object.getOwnPropertyNames(C.location).sort(),
whitelistedLocationPropNames,
"Object.getOwnPropertyNames() gives the right answer for cross-origin Location");
}, "[[OwnPropertyKeys]] should return all properties from cross-origin objects");
// Compare two arrays that need to have the same elements but may be in
// different orders. The problem is that there's no good way to sort arrays
// containing Symbols.
function assert_arrays_equal_up_to_order(arr1, arr2, desc) {
for (let item of arr1) {
assert_in_array(item, arr2, desc);
}
for (let item of arr2) {
assert_in_array(item, arr1, desc);
}
}
addTest(function() {
assert_arrays_equal_up_to_order(Object.getOwnPropertySymbols(C),
whitelistedSymbols,
assert_array_equals(Object.getOwnPropertySymbols(C), whitelistedSymbols,
"Object.getOwnPropertySymbols() should return the three symbol-named properties that are exposed on a cross-origin Window");
assert_arrays_equal_up_to_order(Object.getOwnPropertySymbols(C.location),
whitelistedSymbols,
assert_array_equals(Object.getOwnPropertySymbols(C.location),
whitelistedSymbols,
"Object.getOwnPropertySymbols() should return the three symbol-named properties that are exposed on a cross-origin Location");
}, "[[OwnPropertyKeys]] should return the right symbol-named properties for cross-origin objects");
addTest(function() {
var allWindowProps = Reflect.ownKeys(C);
indexedWindowProps = allWindowProps.slice(0, whitelistedWindowIndices.length);
stringWindowProps = allWindowProps.slice(0, -1 * whitelistedSymbols.length);
symbolWindowProps = allWindowProps.slice(-1 * whitelistedSymbols.length);
assert_array_equals(indexedWindowProps, whitelistedWindowIndices,
"Reflect.ownKeys should start with the indices exposed on the cross-origin window.");
assert_array_equals(stringWindowProps.sort(), whitelistedWindowPropNames,
"Reflect.ownKeys should continue with the cross-origin window properties for a cross-origin Window.");
assert_array_equals(symbolWindowProps, whitelistedSymbols,
"Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Window.");
var allLocationProps = Reflect.ownKeys(C.location);
stringLocationProps = allLocationProps.slice(0, -1 * whitelistedSymbols.length);
symbolLocationProps = allLocationProps.slice(-1 * whitelistedSymbols.length);
assert_array_equals(stringLocationProps.sort(), whitelistedLocationPropNames,
"Reflect.ownKeys should start with the cross-origin window properties for a cross-origin Location.")
assert_array_equals(symbolLocationProps, whitelistedSymbols,
"Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Location.")
}, "[[OwnPropertyKeys]] should place the symbols after the property names after the subframe indices");
addTest(function() {
assert_true(B.eval('parent.C') === C, "A and B observe the same identity for C's Window");
assert_true(B.eval('parent.C.location') === C.location, "A and B observe the same identity for C's Location");

3
testing/web-platform/tests/html/browsers/origin/cross-origin-objects/frame.html
View File

@ -35,5 +35,8 @@
</script>
</head>
<body>
<!-- Two subframes to give us some indexed properties -->
<iframe></iframe>
<iframe></iframe>
</body>
</html>