Bug 1863204 - Correct ESLint scope for some privileged globals and remove importGlobalProperties from more places. r=Gijs,sessionstore-reviewers,dom-storage-reviewers,sclements,asuth

Standard8 · Standard8 · commit 5eb21717309a · 2023-11-10T08:29:10.000Z
Differential Revision: https://phabricator.services.mozilla.com/D192806
diff --git a/browser/components/newtab/test/xpcshell/head.js b/browser/components/newtab/test/xpcshell/head.js
@@ -12,8 +12,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
 });
 
-XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
-
 function assertValidates(validator, obj, msg) {
   const result = validator.validate(obj);
   Assert.ok(
diff --git a/browser/components/sessionstore/test/unit/test_final_write_cleanup.js b/browser/components/sessionstore/test/unit/test_final_write_cleanup.js
@@ -22,8 +22,6 @@ const {
 const MAX_ENTRIES = 9;
 const URL = "http://example.com/#";
 
-Cu.importGlobalProperties(["structuredClone"]);
-
 async function prepareWithLimit(back, fwd) {
   SessionWriter.init("empty", false, Paths, {
     maxSerializeBack: back,
diff --git a/dom/cache/test/xpcshell/head.js b/dom/cache/test/xpcshell/head.js
@@ -47,8 +47,7 @@ add_setup(function () {
 
   enableTesting();
 
-  // Expose Cache and Fetch symbols on the global
-  Cu.importGlobalProperties(["caches", "fetch"]);
+  Cu.importGlobalProperties(["caches"]);
 
   registerCleanupFunction(resetTesting);
 });
diff --git a/dom/indexedDB/test/test_message_manager_ipc.html b/dom/indexedDB/test/test_message_manager_ipc.html
@@ -26,8 +26,6 @@
     const blobText = blobData.join("");
     const blobType = "text/plain";
 
-    Cu.importGlobalProperties(["indexedDB"]);
-
     function info(msg) {
       sendAsyncMessage(mmName, { op: "info", msg });
     }
diff --git a/dom/indexedDB/test/unit/GlobalObjectsChild.js b/dom/indexedDB/test/unit/GlobalObjectsChild.js
@@ -19,8 +19,6 @@ function finishTest() {
 function run_test() {
   const name = "Splendid Test";
 
-  Cu.importGlobalProperties(["indexedDB"]);
-
   do_test_pending();
 
   let keyRange = IDBKeyRange.only(42);
diff --git a/dom/indexedDB/test/unit/test_sandbox.js b/dom/indexedDB/test/unit/test_sandbox.js
@@ -77,7 +77,6 @@ function run_test() {
     sb
   );
 
-  Cu.importGlobalProperties(["indexedDB"]);
   do_test_pending();
   Promise.all([innerPromise, exerciseInterface()]).then(do_test_finished);
 }
diff --git a/dom/indexedDB/test/unit/xpcshell-head-parent-process.js b/dom/indexedDB/test/unit/xpcshell-head-parent-process.js
@@ -46,8 +46,6 @@ if (!this.runTest) {
       enableExperimental();
     }
 
-    Cu.importGlobalProperties(["indexedDB"]);
-
     // In order to support converting tests to using async functions from using
     // generator functions, we detect async functions by checking the name of
     // function's constructor.
diff --git a/dom/localstorage/test/unit/head.js b/dom/localstorage/test/unit/head.js
@@ -21,8 +21,6 @@ add_setup(function () {
 
   enableTesting();
 
-  Cu.importGlobalProperties(["crypto"]);
-
   registerCleanupFunction(resetTesting);
 });
 
diff --git a/dom/push/test/xpcshell/test_crypto_encrypt.js b/dom/push/test/xpcshell/test_crypto_encrypt.js
@@ -1,8 +1,6 @@
 // Test PushCrypto.encrypt()
 "use strict";
 
-Cu.importGlobalProperties(["crypto"]);
-
 const { PushCrypto } = ChromeUtils.importESModule(
   "resource://gre/modules/PushCrypto.sys.mjs"
 );
diff --git a/dom/push/test/xpcshell/test_service_child.js b/dom/push/test/xpcshell/test_service_child.js
@@ -3,8 +3,6 @@
 
 "use strict";
 
-Cu.importGlobalProperties(["crypto"]);
-
 var db;
 
 function done() {
diff --git a/dom/streams/test/xpcshell/fetch.js b/dom/streams/test/xpcshell/fetch.js
@@ -12,7 +12,6 @@ AddonTestUtils.createAppInfo(
   "42"
 );
 
-Cu.importGlobalProperties(["fetch"]);
 add_task(async function helper() {
   do_get_profile();
 
diff --git a/dom/tests/unit/test_Fetch.js b/dom/tests/unit/test_Fetch.js
@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.importGlobalProperties(["fetch"]);
 const { HttpServer } = ChromeUtils.importESModule(
   "resource://testing-common/httpd.sys.mjs"
 );
diff --git a/js/xpconnect/tests/unit/test_structuredClone.js b/js/xpconnect/tests/unit/test_structuredClone.js
@@ -27,7 +27,6 @@ function run_test() {
     sb
   );
 
-  Cu.importGlobalProperties(["structuredClone"]);
   const clone = structuredClone({ b: 2 });
   Assert.equal(clone.b, 2);
 }
diff --git a/netwerk/test/unit/test_dooh.js b/netwerk/test/unit/test_dooh.js
@@ -5,8 +5,6 @@
 
 /* import-globals-from trr_common.js */
 
-Cu.importGlobalProperties(["fetch"]);
-
 const { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"
 );
diff --git a/services/crypto/tests/unit/test_jwcrypto.js b/services/crypto/tests/unit/test_jwcrypto.js
@@ -7,8 +7,6 @@ ChromeUtils.defineESModuleGetters(this, {
   jwcrypto: "resource://services-crypto/jwcrypto.sys.mjs",
 });
 
-Cu.importGlobalProperties(["crypto"]);
-
 // Enable logging from jwcrypto.jsm.
 Services.prefs.setCharPref("services.crypto.jwcrypto.log.level", "Debug");
 
diff --git a/services/fxaccounts/tests/xpcshell/test_pairing.js b/services/fxaccounts/tests/xpcshell/test_pairing.js
@@ -12,7 +12,6 @@ const { EventEmitter } = ChromeUtils.importESModule(
 ChromeUtils.defineESModuleGetters(this, {
   jwcrypto: "resource://services-crypto/jwcrypto.sys.mjs",
 });
-XPCOMUtils.defineLazyGlobalGetters(this, ["crypto"]);
 
 const CHANNEL_ID = "sW-UA97Q6Dljqen7XRlYPw";
 const CHANNEL_KEY = crypto.getRandomValues(new Uint8Array(32));
diff --git a/services/settings/test/unit/test_remote_settings_dump_lastmodified.js b/services/settings/test/unit/test_remote_settings_dump_lastmodified.js
@@ -4,8 +4,6 @@ const { Utils } = ChromeUtils.importESModule(
   "resource://services-settings/Utils.sys.mjs"
 );
 
-Cu.importGlobalProperties(["fetch"]);
-
 async function getLocalDumpLastModified(bucket, collection) {
   let res;
   try {
diff --git a/services/settings/test/unit/test_remote_settings_worker.js b/services/settings/test/unit/test_remote_settings_worker.js
@@ -17,8 +17,6 @@ const { Database } = ChromeUtils.importESModule(
   "resource://services-settings/Database.sys.mjs"
 );
 
-XPCOMUtils.defineLazyGlobalGetters(this, ["indexedDB"]);
-
 const IS_ANDROID = AppConstants.platform == "android";
 
 add_task(async function test_canonicaljson() {
diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js
@@ -7,8 +7,6 @@ const { JsonSchema } = ChromeUtils.importESModule(
   "resource://gre/modules/JsonSchema.sys.mjs"
 );
 
-Cu.importGlobalProperties(["fetch"]);
-
 ChromeUtils.defineLazyGetter(this, "fetchSchema", () => {
   return fetch("resource://nimbus/schemas/NimbusEnrollment.schema.json", {
     credentials: "omit",
diff --git a/toolkit/components/normandy/test/unit/test_NormandyApi.js b/toolkit/components/normandy/test/unit/test_NormandyApi.js
@@ -11,8 +11,6 @@ load("utils.js");
 NormandyTestUtils.init({ add_task });
 const { decorate_task } = NormandyTestUtils;
 
-Cu.importGlobalProperties(["fetch"]);
-
 decorate_task(withMockApiServer(), async function test_get({ serverUrl }) {
   // Test that NormandyApi can fetch from the test server.
   const response = await NormandyApi.get(`${serverUrl}/api/v1/`);
diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
@@ -21,8 +21,6 @@ ChromeUtils.defineESModuleGetters(this, {
   updateAppInfo: "resource://testing-common/AppInfo.sys.mjs",
 });
 
-XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
-
 const GLOBAL_SCOPE = this;
 const TEST_DEBUG = Services.env.get("TEST_DEBUG");
 
diff --git a/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js b/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js
@@ -3,8 +3,6 @@
 
 "use strict";
 
-Cu.importGlobalProperties(["structuredClone"]);
-
 const CONFIG = [
   {
     // Engine initially default, but the defaults will be changed to engine-pref.
diff --git a/toolkit/components/search/tests/xpcshell/test_validate_manifests.js b/toolkit/components/search/tests/xpcshell/test_validate_manifests.js
@@ -3,8 +3,6 @@
 
 "use strict";
 
-Cu.importGlobalProperties(["fetch"]);
-
 const { ExtensionData } = ChromeUtils.importESModule(
   "resource://gre/modules/Extension.sys.mjs"
 );
diff --git a/toolkit/components/shopping/test/xpcshell/head.js b/toolkit/components/shopping/test/xpcshell/head.js
@@ -4,8 +4,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 /* exported createHttpServer, loadJSONfromFile, readFile */
 
-Cu.importGlobalProperties(["fetch"]);
-
 const { AddonTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/AddonTestUtils.sys.mjs"
 );
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -804,7 +804,6 @@ add_task(async function test_encryptedPing() {
     // The underlying jwcrypto module being used here is not currently available on Android.
     return;
   }
-  Cu.importGlobalProperties(["crypto"]);
 
   const ECDH_PARAMS = {
     name: "ECDH",
@@ -1050,7 +1049,6 @@ add_task(async function test_encryptedPing_overrideId() {
     // The underlying jwcrypto module being used here is not currently available on Android.
     return;
   }
-  Cu.importGlobalProperties(["crypto"]);
 
   const publicKey = {
     crv: "P-256",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -1147,7 +1147,6 @@ function copyBlocklistToProfile(blocklistFile) {
 }
 
 async function mockGfxBlocklistItemsFromDisk(path) {
-  Cu.importGlobalProperties(["fetch"]);
   let response = await fetch(Services.io.newFileURI(do_get_file(path)).spec);
   let json = await response.json();
   return mockGfxBlocklistItems(json);
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js
@@ -38,7 +38,6 @@ async function load_mlbf_record_as_blob() {
   const url = Services.io.newFileURI(
     do_get_file("../data/mlbf-blocked1-unblocked2.bin")
   ).spec;
-  Cu.importGlobalProperties(["fetch"]);
   return (await fetch(url)).blob();
 }
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_mlbf_dump.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_mlbf_dump.js
@@ -32,7 +32,6 @@ const nonBlockedAddon = {
 };
 
 async function sha256(arrayBuffer) {
-  Cu.importGlobalProperties(["crypto"]);
   let hash = await crypto.subtle.digest("SHA-256", arrayBuffer);
   const toHex = b => b.toString(16).padStart(2, "0");
   return Array.from(new Uint8Array(hash), toHex).join("");
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/jsm.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/jsm.js
@@ -21,11 +21,5 @@ module.exports = {
     // JS can run. It's definitely available in JSMs. So even if this is not
     // the perfect place to add it, it's not wrong, and we can move it later.
     WebAssembly: false,
-    // These are hard-coded and available in .jsm scopes.
-    // See BackstagePass::Resolve.
-    fetch: false,
-    crypto: false,
-    indexedDB: false,
-    structuredClone: false,
   },
 };
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/privileged.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/privileged.js
@@ -810,5 +810,11 @@ module.exports = {
     XULScrollElement: false,
     XULTextElement: false,
     console: false,
+    // These are hard-coded and available in privileged scopes.
+    // See BackstagePass::Resolve.
+    fetch: false,
+    crypto: false,
+    indexedDB: false,
+    structuredClone: false,
   },
 };
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/tests/reject-importGlobalProperties.js b/tools/lint/eslint/eslint-plugin-mozilla/tests/reject-importGlobalProperties.js
@@ -23,11 +23,11 @@ ruleTester.run("reject-importGlobalProperties", rule, {
     },
     {
       options: ["allownonwebidl"],
-      code: "Cu.importGlobalProperties(['fetch'])",
+      code: "Cu.importGlobalProperties(['caches'])",
     },
     {
       options: ["allownonwebidl"],
-      code: "XPCOMUtils.defineLazyGlobalGetters(this, ['fetch'])",
+      code: "XPCOMUtils.defineLazyGlobalGetters(this, ['caches'])",
     },
   ],
   invalid: [

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`const blobText = blobData.join("");`
`27`	`27`	`const blobType = "text/plain";`
`28`	`28`
`29`		`- Cu.importGlobalProperties(["indexedDB"]);`
`30`		`-`
`31`	`29`	`function info(msg) {`
`32`	`30`	`sendAsyncMessage(mmName, { op: "info", msg });`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ function run_test() {`
`77`	`77`	`sb`
`78`	`78`	`);`
`79`	`79`
`80`		`- Cu.importGlobalProperties(["indexedDB"]);`
`81`	`80`	`do_test_pending();`
`82`	`81`	`Promise.all([innerPromise, exerciseInterface()]).then(do_test_finished);`
`83`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ if (!this.runTest) {`
`46`	`46`	`enableExperimental();`
`47`	`47`	`}`
`48`	`48`
`49`		`- Cu.importGlobalProperties(["indexedDB"]);`
`50`		`-`
`51`	`49`	`// In order to support converting tests to using async functions from using`
`52`	`50`	`// generator functions, we detect async functions by checking the name of`
`53`	`51`	`// function's constructor.`