Skip to content

Commit d033918

Browse files
committed
Bug 2066822 - Enables enterprise storage encryption by default
- Flips security.storage.encryption.enabled to true - Removes the policy EnterpriseStorageEncryption
1 parent 721a41b commit d033918

8 files changed

Lines changed: 3 additions & 46 deletions

File tree

browser/components/enterprisepolicies/Policies.sys.mjs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,15 +1899,6 @@ export var Policies = {
18991899
},
19001900
},
19011901

1902-
EnterpriseStorageEncryption: {
1903-
onBeforeUIStartup(manager, param) {
1904-
lazy.PoliciesUtils.setAndLockPref(
1905-
"security.storage.encryption.enabled",
1906-
param
1907-
);
1908-
},
1909-
},
1910-
19111902
ExemptDomainFileTypePairsFromFileTypeDownloadWarnings: {
19121903
// This policy is handled directly in EnterprisePoliciesParent.sys.mjs
19131904
// and requires no validation (It's done by the schema).
@@ -3055,7 +3046,6 @@ export var Policies = {
30553046
"security.pki.certificate_transparency.disable_for_hosts",
30563047
"security.pki.certificate_transparency.disable_for_spki_hashes",
30573048
"security.pki.certificate_transparency.mode",
3058-
"security.storage.encryption.enabled",
30593049
"security.ssl.enable_ocsp_stapling",
30603050
"security.ssl.errorReporting.enabled",
30613051
"security.ssl.require_safe_negotiation",

browser/components/enterprisepolicies/helpers/sample_enterprise_storage_encryption.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

browser/components/enterprisepolicies/helpers/sample_storage_encryption.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

browser/components/enterprisepolicies/schemas/policies-schema.json

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,19 +2118,6 @@
21182118
}
21192119
},
21202120

2121-
"EnterpriseStorageEncryption": {
2122-
"type": "boolean",
2123-
"x-category": "Miscellaneous",
2124-
"x-compatibility": {
2125-
"firefox": { "version_added": false },
2126-
"firefox_esr": { "version_added": false },
2127-
"firefox_enterprise": { "version_added": "149" }
2128-
},
2129-
"x-restart-required": true,
2130-
"description": "Enable an enterprise-managed primary password so that stored credentials and other sensitive profile data are kept encrypted at rest.",
2131-
"examples": [true]
2132-
},
2133-
21342121
"ExemptDomainFileTypePairsFromFileTypeDownloadWarnings": {
21352122
"type": "array",
21362123
"x-category": "Network security",

browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -888,13 +888,6 @@ const POLICIES_TESTS = [
888888
},
889889
},
890890

891-
// POLICY: EnterpriseStorageEncryption
892-
893-
{
894-
policies: { EnterpriseStorageEncryption: true },
895-
lockedPrefs: { "security.storage.encryption.enabled": true },
896-
},
897-
898891
// POLICY: PDFjs
899892

900893
{

browser/locales/en-US/browser/enterprise/enterprise-policies-descriptions.ftl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ policy-ContentAnalysisTelemetry = Enable and configure security logging/telemetr
99
policy-DataLossPrevention = Enable and configure built-in data loss prevention (DLP) engine.
1010
policy-DisableLocalPolicies = Disable all local policy sources (policies.json, Windows GPO and macOS plist).
1111
policy-DownloadTelemetry = Enable and configure security logging/telemetry when a download is triggered.
12-
policy-EnterpriseStorageEncryption = Enable enterprise-managed primary password for encrypted storage.
1312
policy-PrintPageTelemetry = Enable and configure security logging/telemetry when a page is printed.
1413
policy-Sync = Enable or disable sync and define which data to include.
1514
policy-CrashReportsSubmit = Configure crash report submission settings.

modules/libpref/init/StaticPrefList.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19246,11 +19246,13 @@
1924619246
value: true
1924719247
mirror: always
1924819248

19249+
#if defined(MOZ_ENTERPRISE) && !defined(MOZ_THUNDERBIRD)
1924919250
# Enable storage encryption functionality.
1925019251
- name: security.storage.encryption.enabled
1925119252
type: bool
19252-
value: false
19253+
value: true
1925319254
mirror: always
19255+
#endif
1925419256

1925519257
# INTERNAL -- DO NOT ENABLE. Master switch for SQLite database encryption
1925619258
# via obfsvfs; enabling without the rest of the key-management stack will

security/manager/ssl/tests/unit/test_sdr_enterprise_logout.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
do_get_profile();
1414

1515
add_task(async function test_enterprise_logout_keeps_token_unlocked() {
16-
Services.prefs.setBoolPref("security.storage.encryption.enabled", true);
17-
registerCleanupFunction(() =>
18-
Services.prefs.clearUserPref("security.storage.encryption.enabled")
19-
);
2016

2117
const secret = "primary-secret";
2218
let token = Cc["@mozilla.org/security/internalkeytoken;1"].createInstance(

0 commit comments

Comments
 (0)