Commit 088d1b5e authored by Kathleen Brade's avatar Kathleen Brade Committed by Matthew Finkel
Browse files

Bug 32418: Allow updates to be disabled via an enterprise policy.

Restrict the Enterprise Policies mechanism to only consult a
policies.json file (avoiding the Windows Registry and macOS's
file system attributes).

Add a few disabledByPolicy() checks to the update service to
avoid extraneous (and potentially confusing) log messages when
updates are disabled by policy.

Sample content for distribution/policies.json:
{
  "policies": {
    "DisableAppUpdate": true
  }
}

On Linux, avoid reading policies from /etc/firefox/policies/policies.json
parent 5af0b360
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"]; var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"];
// To ensure that policies intended for Firefox or another browser will not
// be used, Tor Browser only looks for policies in ${InstallDir}/distribution
#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION
const { XPCOMUtils } = ChromeUtils.import( const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm" "resource://gre/modules/XPCOMUtils.jsm"
); );
...@@ -13,9 +17,11 @@ const { AppConstants } = ChromeUtils.import( ...@@ -13,9 +17,11 @@ const { AppConstants } = ChromeUtils.import(
); );
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
#ifndef AVOID_SYSTEM_POLICIES
WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm",
macOSPoliciesParser: macOSPoliciesParser:
"resource://gre/modules/policies/macOSPoliciesParser.jsm", "resource://gre/modules/policies/macOSPoliciesParser.jsm",
#endif
Policies: "resource:///modules/policies/Policies.jsm", Policies: "resource:///modules/policies/Policies.jsm",
JsonSchemaValidator: JsonSchemaValidator:
"resource://gre/modules/components-utils/JsonSchemaValidator.jsm", "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
...@@ -140,11 +146,13 @@ EnterprisePoliciesManager.prototype = { ...@@ -140,11 +146,13 @@ EnterprisePoliciesManager.prototype = {
_chooseProvider() { _chooseProvider() {
let platformProvider = null; let platformProvider = null;
#ifndef AVOID_SYSTEM_POLICIES
if (AppConstants.platform == "win") { if (AppConstants.platform == "win") {
platformProvider = new WindowsGPOPoliciesProvider(); platformProvider = new WindowsGPOPoliciesProvider();
} else if (AppConstants.platform == "macosx") { } else if (AppConstants.platform == "macosx") {
platformProvider = new macOSPoliciesProvider(); platformProvider = new macOSPoliciesProvider();
} }
#endif
let jsonProvider = new JSONPoliciesProvider(); let jsonProvider = new JSONPoliciesProvider();
if (platformProvider && platformProvider.hasPolicies) { if (platformProvider && platformProvider.hasPolicies) {
if (jsonProvider.hasPolicies) { if (jsonProvider.hasPolicies) {
...@@ -491,7 +499,7 @@ class JSONPoliciesProvider { ...@@ -491,7 +499,7 @@ class JSONPoliciesProvider {
_getConfigurationFile() { _getConfigurationFile() {
let configFile = null; let configFile = null;
#ifndef AVOID_SYSTEM_POLICIES
if (AppConstants.platform == "linux") { if (AppConstants.platform == "linux") {
let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance(
Ci.nsIFile Ci.nsIFile
...@@ -504,7 +512,7 @@ class JSONPoliciesProvider { ...@@ -504,7 +512,7 @@ class JSONPoliciesProvider {
return systemConfigFile; return systemConfigFile;
} }
} }
#endif
try { try {
let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false); let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false);
if (perUserPath) { if (perUserPath) {
...@@ -585,6 +593,7 @@ class JSONPoliciesProvider { ...@@ -585,6 +593,7 @@ class JSONPoliciesProvider {
} }
} }
#ifndef AVOID_SYSTEM_POLICIES
class WindowsGPOPoliciesProvider { class WindowsGPOPoliciesProvider {
constructor() { constructor() {
this._policies = null; this._policies = null;
...@@ -686,3 +695,4 @@ class CombinedProvider { ...@@ -686,3 +695,4 @@ class CombinedProvider {
return false; return false;
} }
} }
#endif
...@@ -19,6 +19,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": ...@@ -19,6 +19,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
EXTRA_JS_MODULES += [ EXTRA_JS_MODULES += [
"EnterprisePolicies.jsm", "EnterprisePolicies.jsm",
"EnterprisePoliciesContent.jsm", "EnterprisePoliciesContent.jsm",
]
EXTRA_PP_JS_MODULES += [
"EnterprisePoliciesParent.jsm", "EnterprisePoliciesParent.jsm",
] ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment