forked from mirrors/gecko-dev
This patch gently removes support for __exposedProps__ by changing ExposedPropertiesOnly::check() to always return false, while still failing silently in deny for some kinds of access. The tests that I changed all involve testing the behavior with __exposedProps__. I adjusted them to expect it to fail, or to adjust the error message they get when they fail. That seemed better than deleting them entirely. Note that test_bug1065185.html had a bug, so that it never executed the first case. I fixed that, and then fixed up the test to work when __exposedProps__ is not supported. This also removes various bits of the test framework that use __exposedProps__, but don't actually need to. MozReview-Commit-ID: 8fvkAmITmXY --HG-- extra : rebase_source : ef7e2c55adc12511f17f3865ebb46c343875f0b3
118 lines
3.8 KiB
JavaScript
118 lines
3.8 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
"use strict";
|
|
|
|
const { resolveURI, Require,
|
|
unload, override, descriptor } = require('../../toolkit/loader');
|
|
const { ensure } = require('../system/unload');
|
|
const addonWindow = require('../addon/window');
|
|
const { PlainTextConsole } = require('sdk/console/plain-text');
|
|
|
|
var defaultGlobals = override(require('../system/globals'), {
|
|
console: console
|
|
});
|
|
|
|
function CustomLoader(module, globals, packaging, overrides={}) {
|
|
let options = packaging || require("@loader/options");
|
|
options = override(options, {
|
|
id: overrides.id || options.id,
|
|
globals: override(defaultGlobals, globals || {}),
|
|
modules: override(override(options.modules || {}, overrides.modules || {}), {
|
|
'sdk/addon/window': addonWindow
|
|
})
|
|
});
|
|
|
|
let loaderModule = options.isNative ? '../../toolkit/loader' : '../loader/cuddlefish';
|
|
let { Loader } = require(loaderModule);
|
|
let loader = Loader(options);
|
|
let wrapper = Object.create(loader, descriptor({
|
|
require: Require(loader, module),
|
|
sandbox: function(id) {
|
|
let requirement = loader.resolve(id, module.id);
|
|
if (!requirement)
|
|
requirement = id;
|
|
let uri = resolveURI(requirement, loader.mapping);
|
|
return loader.sandboxes[uri];
|
|
},
|
|
unload: function(reason) {
|
|
unload(loader, reason);
|
|
}
|
|
}));
|
|
ensure(wrapper);
|
|
return wrapper;
|
|
};
|
|
exports.Loader = CustomLoader;
|
|
|
|
function HookedPlainTextConsole(hook, print, innerID) {
|
|
this.log = hook.bind(null, "log", innerID);
|
|
this.info = hook.bind(null, "info", innerID);
|
|
this.warn = hook.bind(null, "warn", innerID);
|
|
this.error = hook.bind(null, "error", innerID);
|
|
this.debug = hook.bind(null, "debug", innerID);
|
|
this.exception = hook.bind(null, "exception", innerID);
|
|
this.time = hook.bind(null, "time", innerID);
|
|
this.timeEnd = hook.bind(null, "timeEnd", innerID);
|
|
}
|
|
|
|
// Creates a custom loader instance whose console module is hooked in order
|
|
// to avoid printing messages to the console, and instead, expose them in the
|
|
// returned `messages` array attribute
|
|
exports.LoaderWithHookedConsole = function (module, callback) {
|
|
let messages = [];
|
|
function hook(type, innerID, msg) {
|
|
messages.push({ type: type, msg: msg, innerID: innerID });
|
|
if (callback)
|
|
callback(type, msg, innerID);
|
|
}
|
|
|
|
return {
|
|
loader: CustomLoader(module, {
|
|
console: new HookedPlainTextConsole(hook, null, null)
|
|
}, null, {
|
|
modules: {
|
|
'sdk/console/plain-text': {
|
|
PlainTextConsole: HookedPlainTextConsole.bind(null, hook)
|
|
}
|
|
}
|
|
}),
|
|
messages: messages
|
|
};
|
|
}
|
|
|
|
// Same than LoaderWithHookedConsole with lower level, instead we get what is
|
|
// actually printed to the command line console
|
|
exports.LoaderWithHookedConsole2 = function (module, callback) {
|
|
let messages = [];
|
|
return {
|
|
loader: CustomLoader(module, {
|
|
console: new PlainTextConsole(function (msg) {
|
|
messages.push(msg);
|
|
if (callback)
|
|
callback(msg);
|
|
})
|
|
}),
|
|
messages: messages
|
|
};
|
|
}
|
|
|
|
// Creates a custom loader with a filtered console. The callback is passed every
|
|
// console message type and message and if it returns false the message will
|
|
// not be logged normally
|
|
exports.LoaderWithFilteredConsole = function (module, callback) {
|
|
function hook(type, innerID, msg) {
|
|
if (callback && callback(type, msg, innerID) == false)
|
|
return;
|
|
console[type](msg);
|
|
}
|
|
|
|
return CustomLoader(module, {
|
|
console: new HookedPlainTextConsole(hook, null, null)
|
|
}, null, {
|
|
modules: {
|
|
'sdk/console/plain-text': {
|
|
PlainTextConsole: HookedPlainTextConsole.bind(null, hook)
|
|
}
|
|
}
|
|
});
|
|
}
|