mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 13:18:45 +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
84 lines
3.8 KiB
JavaScript
84 lines
3.8 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/
|
|
*/
|
|
|
|
// Tests that PerrmissionsUtils.jsm works as expected, including:
|
|
// * PermissionsUtils.importfromPrefs()
|
|
// <ROOT>.[whitelist|blacklist].add preferences are emptied when
|
|
// converted into permissions on startup.
|
|
|
|
|
|
const PREF_ROOT = "testpermissions.";
|
|
const TEST_PERM = "test-permission";
|
|
|
|
const {PermissionsUtils} = ChromeUtils.import("resource://gre/modules/PermissionsUtils.jsm");
|
|
|
|
function run_test() {
|
|
test_importfromPrefs();
|
|
}
|
|
|
|
|
|
function test_importfromPrefs() {
|
|
// Create own preferences to test
|
|
Services.prefs.setCharPref(PREF_ROOT + "whitelist.add.EMPTY", "");
|
|
Services.prefs.setCharPref(PREF_ROOT + "whitelist.add.EMPTY2", ",");
|
|
Services.prefs.setCharPref(PREF_ROOT + "whitelist.add.TEST", "http://whitelist.example.com");
|
|
Services.prefs.setCharPref(PREF_ROOT + "whitelist.add.TEST2", "https://whitelist2-1.example.com,http://whitelist2-2.example.com:8080,about:home");
|
|
Services.prefs.setCharPref(PREF_ROOT + "whitelist.add.TEST3", "whitelist3-1.example.com,about:config"); // legacy style - host only
|
|
Services.prefs.setCharPref(PREF_ROOT + "blacklist.add.EMPTY", "");
|
|
Services.prefs.setCharPref(PREF_ROOT + "blacklist.add.TEST", "http://blacklist.example.com,");
|
|
Services.prefs.setCharPref(PREF_ROOT + "blacklist.add.TEST2", ",https://blacklist2-1.example.com,http://blacklist2-2.example.com:8080,about:mozilla");
|
|
Services.prefs.setCharPref(PREF_ROOT + "blacklist.add.TEST3", "blacklist3-1.example.com,about:preferences"); // legacy style - host only
|
|
|
|
// Check they are unknown in the permission manager prior to importing.
|
|
let whitelisted = ["http://whitelist.example.com",
|
|
"https://whitelist2-1.example.com",
|
|
"http://whitelist2-2.example.com:8080",
|
|
"http://whitelist3-1.example.com",
|
|
"https://whitelist3-1.example.com",
|
|
"about:config",
|
|
"about:home"];
|
|
let blacklisted = ["http://blacklist.example.com",
|
|
"https://blacklist2-1.example.com",
|
|
"http://blacklist2-2.example.com:8080",
|
|
"http://blacklist3-1.example.com",
|
|
"https://blacklist3-1.example.com",
|
|
"about:preferences",
|
|
"about:mozilla"];
|
|
let untouched = ["https://whitelist.example.com",
|
|
"https://blacklist.example.com",
|
|
"http://whitelist2-1.example.com",
|
|
"http://blacklist2-1.example.com",
|
|
"https://whitelist2-2.example.com:8080",
|
|
"https://blacklist2-2.example.com:8080"];
|
|
let unknown = whitelisted.concat(blacklisted).concat(untouched);
|
|
for (let url of unknown) {
|
|
let uri = Services.io.newURI(url);
|
|
Assert.equal(Services.perms.testPermission(uri, TEST_PERM), Services.perms.UNKNOWN_ACTION);
|
|
}
|
|
|
|
// Import them
|
|
PermissionsUtils.importFromPrefs(PREF_ROOT, TEST_PERM);
|
|
|
|
// Get list of preferences to check
|
|
let preferences = Services.prefs.getChildList(PREF_ROOT, {});
|
|
|
|
// Check preferences were emptied
|
|
for (let pref of preferences) {
|
|
Assert.equal(Services.prefs.getCharPref(pref), "");
|
|
}
|
|
|
|
// Check they were imported into the permissions manager
|
|
for (let url of whitelisted) {
|
|
let uri = Services.io.newURI(url);
|
|
Assert.equal(Services.perms.testPermission(uri, TEST_PERM), Services.perms.ALLOW_ACTION);
|
|
}
|
|
for (let url of blacklisted) {
|
|
let uri = Services.io.newURI(url);
|
|
Assert.equal(Services.perms.testPermission(uri, TEST_PERM), Services.perms.DENY_ACTION);
|
|
}
|
|
for (let url of untouched) {
|
|
let uri = Services.io.newURI(url);
|
|
Assert.equal(Services.perms.testPermission(uri, TEST_PERM), Services.perms.UNKNOWN_ACTION);
|
|
}
|
|
}
|