mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +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
156 lines
6 KiB
JavaScript
156 lines
6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {ClientID} = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
|
|
const {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js");
|
|
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
|
const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
|
|
const PREF_CACHED_CLIENTID = "toolkit.telemetry.cachedClientID";
|
|
|
|
function run_test() {
|
|
do_get_profile();
|
|
run_next_test();
|
|
}
|
|
|
|
add_task(async function() {
|
|
const drsPath = OS.Path.join(OS.Constants.Path.profileDir, "datareporting", "state.json");
|
|
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
const invalidIDs = [
|
|
[-1, "setIntPref"],
|
|
[0.5, "setIntPref"],
|
|
["INVALID-UUID", "setStringPref"],
|
|
[true, "setBoolPref"],
|
|
["", "setStringPref"],
|
|
["3d1e1560-682a-4043-8cf2-aaaaaaaaaaaZ", "setStringPref"],
|
|
];
|
|
|
|
// If there is no DRS file, we should get a new client ID.
|
|
await ClientID._reset();
|
|
let clientID = await ClientID.getClientID();
|
|
Assert.equal(typeof(clientID), "string");
|
|
Assert.ok(uuidRegex.test(clientID));
|
|
|
|
// We should be guarded against invalid DRS json.
|
|
await ClientID._reset();
|
|
await OS.File.writeAtomic(drsPath, "abcd", {encoding: "utf-8", tmpPath: drsPath + ".tmp"});
|
|
clientID = await ClientID.getClientID();
|
|
Assert.equal(typeof(clientID), "string");
|
|
Assert.ok(uuidRegex.test(clientID));
|
|
|
|
// If the DRS data is broken, we should end up with a new client ID.
|
|
for (let [invalidID ] of invalidIDs) {
|
|
await ClientID._reset();
|
|
await CommonUtils.writeJSON({clientID: invalidID}, drsPath);
|
|
clientID = await ClientID.getClientID();
|
|
Assert.equal(typeof(clientID), "string");
|
|
Assert.ok(uuidRegex.test(clientID));
|
|
}
|
|
|
|
// Assure that cached IDs are being checked for validity.
|
|
for (let [invalidID, prefFunc] of invalidIDs) {
|
|
await ClientID._reset();
|
|
Services.prefs[prefFunc](PREF_CACHED_CLIENTID, invalidID);
|
|
let cachedID = ClientID.getCachedClientID();
|
|
Assert.strictEqual(cachedID, null, "ClientID should ignore invalid cached IDs");
|
|
Assert.ok(!Services.prefs.prefHasUserValue(PREF_CACHED_CLIENTID),
|
|
"ClientID should reset invalid cached IDs");
|
|
Assert.ok(Services.prefs.getPrefType(PREF_CACHED_CLIENTID) == Ci.nsIPrefBranch.PREF_INVALID,
|
|
"ClientID should reset invalid cached IDs");
|
|
}
|
|
});
|
|
|
|
add_task(async function test_setClientID() {
|
|
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
const invalidIDs = [
|
|
-1,
|
|
0.5,
|
|
"INVALID-UUID",
|
|
true,
|
|
"",
|
|
"3d1e1560-682a-4043-8cf2-aaaaaaaaaaaZ",
|
|
];
|
|
const KNOWN_UUID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
|
|
|
|
await ClientID._reset();
|
|
|
|
// We should be able to set a valid UUID
|
|
await ClientID.setClientID(KNOWN_UUID);
|
|
let clientID = await ClientID.getClientID();
|
|
Assert.equal(KNOWN_UUID, clientID);
|
|
|
|
// Setting invalid UUIDs should always fail and not modify the client ID
|
|
for (let invalidID of invalidIDs) {
|
|
await ClientID._reset();
|
|
let prevClientID = await ClientID.getClientID();
|
|
await ClientID.setClientID(invalidID)
|
|
.then(() => Assert.ok(false, `Invalid client ID '${invalidID}' should be rejected`))
|
|
.catch(() => Assert.ok(true));
|
|
|
|
clientID = await ClientID.getClientID();
|
|
Assert.equal(typeof(clientID), "string");
|
|
Assert.ok(uuidRegex.test(clientID));
|
|
Assert.equal(prevClientID, clientID);
|
|
}
|
|
});
|
|
|
|
add_task(async function test_resetClientID() {
|
|
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
|
|
// We should get a valid UUID after reset
|
|
await ClientID._reset();
|
|
let firstClientID = await ClientID.getClientID();
|
|
Assert.equal(typeof(firstClientID), "string");
|
|
Assert.ok(uuidRegex.test(firstClientID));
|
|
|
|
// When resetting again we should get a new ID
|
|
let nextClientID = await ClientID.resetClientID();
|
|
Assert.equal(typeof(nextClientID), "string");
|
|
Assert.ok(uuidRegex.test(nextClientID));
|
|
Assert.notEqual(firstClientID, nextClientID, "After reset client ID should be different.");
|
|
|
|
let cachedID = ClientID.getCachedClientID();
|
|
Assert.equal(nextClientID, cachedID);
|
|
|
|
let prefClientID = Services.prefs.getStringPref(PREF_CACHED_CLIENTID, null);
|
|
Assert.equal(nextClientID, prefClientID);
|
|
});
|
|
|
|
add_task(async function test_resetParallelGet() {
|
|
// We should get a valid UUID after reset
|
|
let firstClientID = await ClientID.resetClientID();
|
|
|
|
// We should get the same ID twice when requesting it in parallel to a reset.
|
|
let p = ClientID.resetClientID();
|
|
let newClientID = await ClientID.getClientID();
|
|
let otherClientID = await p;
|
|
|
|
Assert.notEqual(firstClientID, newClientID, "After reset client ID should be different.");
|
|
Assert.equal(newClientID, otherClientID, "Getting the client ID in parallel to a reset should give the same id.");
|
|
});
|
|
|
|
add_task({
|
|
skip_if: () => AppConstants.platform != "android",
|
|
}, async function test_FennecCanaryDetect() {
|
|
const KNOWN_UUID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
|
|
|
|
// We should get a valid UUID after reset
|
|
let firstClientID = await ClientID.resetClientID();
|
|
Assert.notEqual(KNOWN_UUID, firstClientID, "Client ID should be random.");
|
|
|
|
// Set the canary client ID.
|
|
await ClientID.setClientID(KNOWN_UUID);
|
|
Assert.equal(KNOWN_UUID, await ClientID.getClientID(), "Client ID should be known canary.");
|
|
|
|
let newClientID = await ClientID.resetClientID();
|
|
Assert.notEqual(KNOWN_UUID, newClientID, "After reset Client ID should be random.");
|
|
Assert.notEqual(firstClientID, newClientID, "After reset Client ID should be new.");
|
|
Assert.ok(ClientID.wasCanaryClientID(), "After reset we should have detected a canary client ID");
|
|
|
|
let clientID = await ClientID.resetClientID();
|
|
Assert.notEqual(KNOWN_UUID, clientID, "After reset Client ID should be random.");
|
|
Assert.notEqual(newClientID, clientID, "After reset Client ID should be new.");
|
|
Assert.ok(!ClientID.wasCanaryClientID(), "After reset we should not have detected a canary client ID");
|
|
});
|