forked from mirrors/gecko-dev
e930b89c34
***
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
56 lines
1.4 KiB
JavaScript
56 lines
1.4 KiB
JavaScript
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
"use strict";
|
|
|
|
const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
|
|
|
|
const ADDON_ID = "test@web.extension";
|
|
|
|
const aps = Cc["@mozilla.org/addons/policy-service;1"]
|
|
.getService(Ci.nsIAddonPolicyService);
|
|
|
|
let policy = null;
|
|
|
|
function setAddonCSP(csp) {
|
|
if (policy) {
|
|
policy.active = false;
|
|
}
|
|
|
|
policy = new WebExtensionPolicy({
|
|
id: ADDON_ID,
|
|
mozExtensionHostname: ADDON_ID,
|
|
baseURL: "file:///",
|
|
|
|
allowedOrigins: new MatchPatternSet([]),
|
|
localizeCallback() {},
|
|
|
|
contentSecurityPolicy: csp,
|
|
});
|
|
|
|
policy.active = true;
|
|
}
|
|
|
|
registerCleanupFunction(() => {
|
|
policy.active = false;
|
|
});
|
|
|
|
add_task(async function test_addon_csp() {
|
|
equal(aps.baseCSP, Preferences.get("extensions.webextensions.base-content-security-policy"),
|
|
"Expected base CSP value");
|
|
|
|
equal(aps.defaultCSP, Preferences.get("extensions.webextensions.default-content-security-policy"),
|
|
"Expected default CSP value");
|
|
|
|
|
|
const CUSTOM_POLICY = "script-src: 'self' https://xpcshell.test.custom.csp; object-src: 'none'";
|
|
|
|
setAddonCSP(CUSTOM_POLICY);
|
|
|
|
equal(aps.getAddonCSP(ADDON_ID), CUSTOM_POLICY, "CSP should point to add-on's custom policy");
|
|
|
|
|
|
setAddonCSP(null);
|
|
|
|
equal(aps.getAddonCSP(ADDON_ID), aps.defaultCSP,
|
|
"CSP should revert to default when set to null");
|
|
});
|