Bug 1541508 - Use Services.env in security/ r=keeler

Differential Revision: https://phabricator.services.mozilla.com/D160145
iaxat · Nov 25, 2022 · fd3a3d1 · fd3a3d1
1 parent a616981
commit fd3a3d1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 44 deletions.
diff --git a/security/manager/ssl/tests/unit/head_psm.js b/security/manager/ssl/tests/unit/head_psm.js
@@ -686,16 +686,13 @@ async function asyncStartTLSTestServer(
 
   const CALLBACK_PORT = 8444;
 
-  let envSvc = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
   let greBinDir = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-  envSvc.set("DYLD_LIBRARY_PATH", greBinDir.path);
+  Services.env.set("DYLD_LIBRARY_PATH", greBinDir.path);
   // TODO(bug 1107794): Android libraries are in /data/local/xpcb, but "GreBinD"
   // does not return this path on Android, so hard code it here.
-  envSvc.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
-  envSvc.set("MOZ_TLS_SERVER_DEBUG_LEVEL", "3");
-  envSvc.set("MOZ_TLS_SERVER_CALLBACK_PORT", CALLBACK_PORT);
+  Services.env.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
+  Services.env.set("MOZ_TLS_SERVER_DEBUG_LEVEL", "3");
+  Services.env.set("MOZ_TLS_SERVER_CALLBACK_PORT", CALLBACK_PORT);
 
   let httpServer = new HttpServer();
   let serverReady = new Promise(resolve => {
@@ -1173,14 +1170,11 @@ function getSubjectAndSPKIHash(nsCert) {
 }
 
 function run_certutil_on_directory(directory, args, expectSuccess = true) {
-  let envSvc = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
   let greBinDir = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-  envSvc.set("DYLD_LIBRARY_PATH", greBinDir.path);
+  Services.env.set("DYLD_LIBRARY_PATH", greBinDir.path);
   // TODO(bug 1107794): Android libraries are in /data/local/xpcb, but "GreBinD"
   // does not return this path on Android, so hard code it here.
-  envSvc.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
+  Services.env.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
   let certutilBin = _getBinaryUtil("certutil");
   let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
   process.init(certutilBin);

diff --git a/security/manager/ssl/tests/unit/test_broken_fips.js b/security/manager/ssl/tests/unit/test_broken_fips.js
@@ -13,14 +13,11 @@
 
 function run_test() {
   // Append a single quote and non-ASCII characters to the profile path.
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  let profd = env.get("XPCSHELL_TEST_PROFILE_DIR");
+  let profd = Services.env.get("XPCSHELL_TEST_PROFILE_DIR");
   let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
   file.initWithPath(profd);
   file.append("'÷1");
-  env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
+  Services.env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
 
   let profile = do_get_profile(); // must be called before getting nsIX509CertDB
   Assert.ok(

diff --git a/security/manager/ssl/tests/unit/test_nonascii_path.js b/security/manager/ssl/tests/unit/test_nonascii_path.js
@@ -8,14 +8,11 @@
 // Tests to make sure that the certificate DB works with non-ASCII paths.
 
 // Append a single quote and non-ASCII characters to the profile path.
-let env = Cc["@mozilla.org/process/environment;1"].getService(
-  Ci.nsIEnvironment
-);
-let profd = env.get("XPCSHELL_TEST_PROFILE_DIR");
+let profd = Services.env.get("XPCSHELL_TEST_PROFILE_DIR");
 let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
 file.initWithPath(profd);
 file.append("'÷1");
-env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
+Services.env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
 
 file = do_get_profile(); // must be called before getting nsIX509CertDB
 Assert.ok(
@@ -24,7 +21,7 @@ Assert.ok(
 );
 
 // Restore the original value.
-env.set("XPCSHELL_TEST_PROFILE_DIR", profd);
+Services.env.set("XPCSHELL_TEST_PROFILE_DIR", profd);
 
 const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
   Ci.nsIX509CertDB

diff --git a/security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js b/security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js
@@ -54,14 +54,11 @@ function run_test() {
   });
 
   // Append a single quote and non-ASCII characters to the profile path.
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  let profd = env.get("XPCSHELL_TEST_PROFILE_DIR");
+  let profd = Services.env.get("XPCSHELL_TEST_PROFILE_DIR");
   let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
   file.initWithPath(profd);
   file.append("'÷1");
-  env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
+  Services.env.set("XPCSHELL_TEST_PROFILE_DIR", file.path);
 
   let profile = do_get_profile(); // must be called before getting nsIX509CertDB
   Assert.ok(

diff --git a/security/sandbox/test/browser_bug1393259.js b/security/sandbox/test/browser_bug1393259.js
@@ -16,10 +16,6 @@
 const kPageURL =
   "http://example.com/browser/security/sandbox/test/bug1393259.html";
 
-const environment = Cc["@mozilla.org/process/environment;1"].getService(
-  Ci.nsIEnvironment
-);
-
 // Parameters for running the python script that registers/unregisters fonts.
 const kPythonPath = "/usr/bin/python";
 const kFontInstallerPath = "browser/security/sandbox/test/mac_register_font.py";

diff --git a/security/sandbox/test/browser_content_sandbox_fs_snap.js b/security/sandbox/test/browser_content_sandbox_fs_snap.js
@@ -17,7 +17,7 @@ Services.scriptloader.loadSubScript(
 
 add_task(async function() {
   // Ensure that SNAP is there
-  const snap = GetEnvironmentVariable("SNAP");
+  const snap = Services.env.get("SNAP");
   ok(snap.length > 1, "SNAP is defined");
 
   // If it is there, do actual testing

diff --git a/security/sandbox/test/browser_content_sandbox_fs_tests.js b/security/sandbox/test/browser_content_sandbox_fs_tests.js
@@ -407,7 +407,7 @@ async function testFileAccessLinuxOnly() {
   // allows to handle both $HOME/.config/ or $XDG_CONFIG_HOME
   let configDir = GetHomeSubdir(".config");
 
-  const xdgConfigHome = GetEnvironmentVariable("XDG_CONFIG_HOME");
+  const xdgConfigHome = Services.env.get("XDG_CONFIG_HOME");
 
   if (xdgConfigHome.length > 1) {
     configDir = GetDir(xdgConfigHome);
@@ -633,7 +633,7 @@ async function testFileAccessLinuxSnap() {
 
   // Assert that if we run with SNAP= env, then we allow access to it in the
   // content process
-  let snap = GetEnvironmentVariable("SNAP");
+  let snap = Services.env.get("SNAP");
   let snapExpectedResult = false;
   if (snap.length > 1) {
     snapExpectedResult = true;

diff --git a/security/sandbox/test/browser_content_sandbox_fs_xdg.js b/security/sandbox/test/browser_content_sandbox_fs_xdg.js
@@ -17,7 +17,7 @@ Services.scriptloader.loadSubScript(
 
 add_task(async function() {
   // Ensure that XDG_CONFIG_HOME is there
-  const xdgConfigHome = GetEnvironmentVariable("XDG_CONFIG_HOME");
+  const xdgConfigHome = Services.env.get("XDG_CONFIG_HOME");
   ok(xdgConfigHome.length > 1, "XDG_CONFIG_HOME is defined");
 
   // If it is there, do actual testing

diff --git a/security/sandbox/test/browser_content_sandbox_utils.js b/security/sandbox/test/browser_content_sandbox_utils.js
@@ -3,9 +3,6 @@
 "use strict";
 
 const uuidGenerator = Services.uuid;
-const environment = Cc["@mozilla.org/process/environment;1"].getService(
-  Ci.nsIEnvironment
-);
 
 /*
  * Utility functions for the browser content sandbox tests.
@@ -307,7 +304,7 @@ function GetDir(path) {
 }
 
 function GetDirFromEnvVariable(varName) {
-  return GetDir(environment.get(varName));
+  return GetDir(Services.env.get(varName));
 }
 
 function GetFile(path) {
@@ -316,10 +313,6 @@ function GetFile(path) {
   return file;
 }
 
-function GetEnvironmentVariable(varName) {
-  return environment.get(varName);
-}
-
 function GetBrowserType(type) {
   let browserType = undefined;