diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /browser/components/enterprisepolicies/Policies.sys.mjs | |
parent | Adding debian version 124.0.1-1. (diff) | |
download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/enterprisepolicies/Policies.sys.mjs')
-rw-r--r-- | browser/components/enterprisepolicies/Policies.sys.mjs | 71 |
1 files changed, 64 insertions, 7 deletions
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs index 24f2f9d516..41fc89957c 100644 --- a/browser/components/enterprisepolicies/Policies.sys.mjs +++ b/browser/components/enterprisepolicies/Policies.sys.mjs @@ -43,7 +43,7 @@ ChromeUtils.defineLazyGetter(lazy, "log", () => { "resource://gre/modules/Console.sys.mjs" ); return new ConsoleAPI({ - prefix: "Policies.jsm", + prefix: "Policies", // tip: set maxLogLevel to "debug" and use log.debug() to create detailed // messages during development. See LOG_LEVELS in Console.sys.mjs for details. maxLogLevel: "error", @@ -233,12 +233,12 @@ export var Policies = { return true; }, - // No additional implementation needed here. UpdateService.jsm will check + // No additional implementation needed here. UpdateService.sys.mjs will check // for this policy directly when determining the update URL. }, AppUpdateURL: { - // No implementation needed here. UpdateService.jsm will check for this + // No implementation needed here. UpdateService.sys.mjs will check for this // policy directly when determining the update URL. }, @@ -313,6 +313,18 @@ export var Policies = { }, }, + AutofillAddressEnabled: { + onBeforeAddons(manager, param) { + setAndLockPref("extensions.formautofill.addresses.enabled", param); + }, + }, + + AutofillCreditCardEnabled: { + onBeforeAddons(manager, param) { + setAndLockPref("extensions.formautofill.creditCards.enabled", param); + }, + }, + AutoLaunchProtocolsFromOrigins: { onBeforeAddons(manager, param) { for (let info of param) { @@ -497,10 +509,57 @@ export var Policies = { }, ContentAnalysis: { - onBeforeUIStartup(manager, param) { + onBeforeAddons(manager, param) { + if ("PipePathName" in param) { + setAndLockPref( + "browser.contentanalysis.pipe_path_name", + param.PipePathName + ); + } + if ("AgentTimeout" in param) { + if (!Number.isInteger(param.AgentTimeout)) { + lazy.log.error( + `Non-integer value for AgentTimeout: ${param.AgentTimeout}` + ); + } else { + setAndLockPref( + "browser.contentanalysis.agent_timeout", + param.AgentTimeout + ); + } + } + if ("AllowUrlRegexList" in param) { + setAndLockPref( + "browser.contentanalysis.allow_url_regex_list", + param.AllowUrlRegexList + ); + } + if ("DenyUrlRegexList" in param) { + setAndLockPref( + "browser.contentanalysis.deny_url_regex_list", + param.DenyUrlRegexList + ); + } + let boolPrefs = [ + ["IsPerUser", "is_per_user"], + ["ShowBlockedResult", "show_blocked_result"], + ["DefaultAllow", "default_allow"], + ]; + for (let pref of boolPrefs) { + if (pref[0] in param) { + setAndLockPref( + `browser.contentanalysis.${pref[1]}`, + !!param[pref[0]] + ); + } + } if ("Enabled" in param) { let enabled = !!param.Enabled; setAndLockPref("browser.contentanalysis.enabled", enabled); + let ca = Cc["@mozilla.org/contentanalysis;1"].getService( + Ci.nsIContentAnalysis + ); + ca.isSetByEnterprisePolicy = true; } }, }, @@ -618,8 +677,6 @@ export var Policies = { "browser.download.dir", replacePathVariables(param) ); - // If a custom download directory is being used, just lock folder list to 2. - setAndLockPref("browser.download.folderList", 2); }, }, @@ -1061,7 +1118,7 @@ export var Policies = { }, ExemptDomainFileTypePairsFromFileTypeDownloadWarnings: { - // This policy is handled directly in EnterprisePoliciesParent.jsm + // This policy is handled directly in EnterprisePoliciesParent.sys.mjs // and requires no validation (It's done by the schema). }, |