mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 14:20:14 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
110 lines
3.4 KiB
JavaScript
110 lines
3.4 KiB
JavaScript
"use strict";
|
|
|
|
const {SandboxManager} = ChromeUtils.import("resource://normandy/lib/SandboxManager.jsm");
|
|
|
|
// wrapAsync should wrap privileged Promises with Promises that are usable by
|
|
// the sandbox.
|
|
add_task(async function() {
|
|
const manager = new SandboxManager();
|
|
manager.addHold("testing");
|
|
|
|
manager.cloneIntoGlobal("driver", {
|
|
async privileged() {
|
|
return "privileged";
|
|
},
|
|
wrapped: manager.wrapAsync(async function() {
|
|
return "wrapped";
|
|
}),
|
|
aValue: "aValue",
|
|
wrappedThis: manager.wrapAsync(async function() {
|
|
return this.aValue;
|
|
}),
|
|
}, {cloneFunctions: true});
|
|
|
|
// Assertion helpers
|
|
manager.addGlobal("ok", ok);
|
|
manager.addGlobal("equal", equal);
|
|
|
|
const sandboxResult = await new Promise(resolve => {
|
|
manager.addGlobal("resolve", result => resolve(result));
|
|
manager.evalInSandbox(`
|
|
// Unwrapped privileged promises are not accessible in the sandbox
|
|
try {
|
|
const privilegedResult = driver.privileged().then(() => false);
|
|
ok(false, "The sandbox could not use a privileged Promise");
|
|
} catch (err) { }
|
|
|
|
// Wrapped functions return promises that the sandbox can access.
|
|
const wrappedResult = driver.wrapped();
|
|
ok("then" in wrappedResult);
|
|
|
|
// Resolve the Promise around the sandbox with the wrapped result to test
|
|
// that the Promise in the sandbox works.
|
|
wrappedResult.then(resolve);
|
|
`);
|
|
});
|
|
equal(sandboxResult, "wrapped", "wrapAsync methods return Promises that work in the sandbox");
|
|
|
|
await manager.evalInSandbox(`
|
|
(async function sandboxTest() {
|
|
equal(
|
|
await driver.wrappedThis(),
|
|
"aValue",
|
|
"wrapAsync preserves the behavior of the this keyword",
|
|
);
|
|
})();
|
|
`);
|
|
|
|
manager.removeHold("testing");
|
|
});
|
|
|
|
// wrapAsync cloning options
|
|
add_task(async function() {
|
|
const manager = new SandboxManager();
|
|
manager.addHold("testing");
|
|
|
|
// clonedArgument stores the argument passed to cloned(), which we use to test
|
|
// that arguments from within the sandbox are cloned outside.
|
|
let clonedArgument = null;
|
|
manager.cloneIntoGlobal("driver", {
|
|
uncloned: manager.wrapAsync(async function() {
|
|
return {value: "uncloned"};
|
|
}),
|
|
cloned: manager.wrapAsync(async function(argument) {
|
|
clonedArgument = argument;
|
|
return {value: "cloned"};
|
|
}, {cloneInto: true, cloneArguments: true}),
|
|
}, {cloneFunctions: true});
|
|
|
|
// Assertion helpers
|
|
manager.addGlobal("ok", ok);
|
|
manager.addGlobal("deepEqual", deepEqual);
|
|
|
|
await new Promise(resolve => {
|
|
manager.addGlobal("resolve", resolve);
|
|
manager.evalInSandbox(`
|
|
(async function() {
|
|
// The uncloned return value should be privileged and inaccesible.
|
|
const uncloned = await driver.uncloned();
|
|
ok(!("value" in uncloned), "The sandbox could not use an uncloned return value");
|
|
|
|
// The cloned return value should be usable.
|
|
deepEqual(
|
|
await driver.cloned({value: "insidesandbox"}),
|
|
{value: "cloned"},
|
|
"The sandbox could use the cloned return value",
|
|
);
|
|
})().then(resolve);
|
|
`);
|
|
});
|
|
|
|
// Removing the hold nukes the sandbox. Afterwards, because cloned() has the
|
|
// cloneArguments option, the clonedArgument variable should still be
|
|
// accessible.
|
|
manager.removeHold("testing");
|
|
deepEqual(
|
|
clonedArgument,
|
|
{value: "insidesandbox"},
|
|
"cloneArguments allowed an argument from within the sandbox to persist after it was nuked",
|
|
);
|
|
});
|