corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 13d1bdd6e8ce (bug 1452104) per developer's request on IRC on a CLOSED TREE

Browse Source
This commit is contained in:
shindli
2018-04-06 23:14:49 +03:00
parent 0f6b49587d
commit 2c8b5661c6
7 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
browser/components/enterprisepolicies/Policies.jsm
View File

@@ -108,6 +108,14 @@ var Policies = {
}
},
"BlockSetDesktopBackground": {
onBeforeUIStartup(manager, param) {
if (param) {
manager.disallowFeature("setDesktopBackground", true);
}
}
},
"Bookmarks": {
onAllWindowsRestored(manager, param) {
BookmarksPolicies.processBookmarks(param);
@@ -147,7 +155,7 @@ var Policies = {
if (param.Default !== undefined && !param.Default) {
newCookieBehavior = REJECT_ALL_COOKIES;
} else if (param.AcceptThirdParty) {
if (param.AcceptThirdParty == "never") {
if (param.AcceptThirdParty == "none") {
newCookieBehavior = REJECT_THIRD_PARTY_COOKIES;
} else if (param.AcceptThirdParty == "from-visited") {
newCookieBehavior = REJECT_UNVISITED_THIRD_PARTY;
@@ -179,6 +187,14 @@ var Policies = {
}
},
"CreateMasterPassword": {
onBeforeUIStartup(manager, param) {
if (!param) {
manager.disallowFeature("createMasterPassword");
}
}
},
"DisableAppUpdate": {
onBeforeAddons(manager, param) {
if (param) {
@@ -257,14 +273,6 @@ var Policies = {
}
},
"DisableMasterPasswordCreation": {
onBeforeUIStartup(manager, param) {
if (param) {
manager.disallowFeature("createMasterPassword");
}
}
},
"DisablePocket": {
onBeforeAddons(manager, param) {
if (param) {
@@ -321,15 +329,7 @@ var Policies = {
}
},
"DisableSetDesktopBackground": {
onBeforeUIStartup(manager, param) {
if (param) {
manager.disallowFeature("setDesktopBackground", true);
}
}
},
"DisableSystemAddonUpdate": {
"DisableSysAddonUpdate": {
onBeforeAddons(manager, param) {
if (param) {
manager.disallowFeature("SysAddonUpdate");
@@ -342,7 +342,6 @@ var Policies = {
if (param) {
setAndLockPref("datareporting.healthreport.uploadEnabled", false);
setAndLockPref("datareporting.policy.dataSubmissionEnabled", false);
manager.disallowFeature("about:telemetry");
}
}
},
@@ -526,7 +525,7 @@ var Policies = {
}
},
"InstallAddonsPermission": {
"InstallAddons": {
onBeforeUIStartup(manager, param) {
if ("Allow" in param) {
addAllowDenyPermissions("install", param.Allow, null);
@@ -548,12 +547,6 @@ var Policies = {
}
},
"OfferToSaveLogins": {
onBeforeUIStartup(manager, param) {
setAndLockPref("signon.rememberSignons", param);
}
},
"OverrideFirstRunPage": {
onProfileAfterChange(manager, param) {
let url = param ? param.spec : "";
@@ -599,6 +592,12 @@ var Policies = {
}
},
"RememberPasswords": {
onBeforeUIStartup(manager, param) {
setAndLockPref("signon.rememberSignons", param);
}
},
"SanitizeOnShutdown": {
onBeforeUIStartup(manager, param) {
setAndLockPref("privacy.sanitize.sanitizeOnShutdown", param);

54
browser/components/enterprisepolicies/schemas/policies-schema.json
View File

@@ -58,6 +58,13 @@
"type": "boolean"
},
"BlockSetDesktopBackground": {
"description": "Prevents usage of the \"Set Image as Desktop Background\" feature.",
"first_available": "60.0",
"type": "boolean"
},
"Bookmarks": {
"description": "Allows the creation of bookmarks in the Bookmarks bar, Bookmarks menu, or a specified folder inside them.",
"first_available": "60.0",
@@ -92,7 +99,7 @@
},
"Certificates": {
"description": "Whether or not to use built in certs. This policy is Windows only at this time.",
"description": "Whether or not to use built in certs.",
"first_available": "60.0",
"type": "object",
@@ -129,7 +136,7 @@
"AcceptThirdParty": {
"type": "string",
"enum": ["always", "never", "from-visited"]
"enum": ["all", "none", "from-visited"]
},
"ExpireAtSessionEnd": {
@@ -142,6 +149,13 @@
}
},
"CreateMasterPassword": {
"description": "If false, removes access to create a master password.",
"first_available": "60.0",
"type": "boolean"
},
"DisableAppUpdate": {
"description": "Prevent the browser from updating.",
"first_available": "60.0",
@@ -206,13 +220,6 @@
"type": "boolean"
},
"DisableMasterPasswordCreation": {
"description": "If true, removes access to create a master password.",
"first_available": "60.0",
"type": "boolean"
},
"DisablePocket": {
"description": "Prevents ability to save webpages to Pocket.",
"first_available": "60.0",
@@ -242,7 +249,7 @@
},
"DisableSafeMode": {
"description": "Prevents ability to restart in safe mode. You can only prevent the Shift key by using GPO on Windows.",
"description": "Prevents ability to restart in safe mode.",
"first_available": "60.0",
"type": "boolean"
@@ -264,14 +271,7 @@
}
},
"DisableSetDesktopBackground": {
"description": "Prevents usage of the \"Set Image as Desktop Background\" feature.",
"first_available": "60.0",
"type": "boolean"
},
"DisableSystemAddonUpdate": {
"DisableSysAddonUpdate": {
"description": "Prevent the browser from installing and updating system addons.",
"first_available": "60.0",
"enterprise_only": true,
@@ -405,8 +405,8 @@
"required": ["URL"]
},
"InstallAddonsPermission": {
"description": "Allow webites to install add-ons.",
"InstallAddons": {
"description": "Allow or deny popup websites to install webextensions.",
"first_available": "60.0",
"type": "object",
@@ -430,13 +430,6 @@
"type": "boolean"
},
"OfferToSaveLogins": {
"description": "Enforces the setting to allow Firefox to offer to remember saved logins and passwords. Both true and false values are accepted.",
"first_available": "60.0",
"type": "boolean"
},
"OverrideFirstRunPage": {
"description": "Override the first run page. Set this policy to blank if you want to disable the first run page.",
"first_available": "60.0",
@@ -534,6 +527,13 @@
}
},
"RememberPasswords": {
"description": "Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.",
"first_available": "60.0",
"type": "boolean"
},
"SanitizeOnShutdown": {
"description": "Clears ALL browser data on shutdown.",
"first_available": "60.0",

6
browser/components/enterprisepolicies/tests/browser/browser_policies_simple_pref_policies.js
View File

@@ -31,11 +31,11 @@ const POLICIES_TESTS = [
// POLICY: RememberPasswords
{
policies: { "OfferToSaveLogins": false },
policies: { "RememberPasswords": false },
lockedPrefs: { "signon.rememberSignons": false },
},
{
policies: { "OfferToSaveLogins": true },
policies: { "RememberPasswords": true },
lockedPrefs: { "signon.rememberSignons": true },
},
@@ -122,7 +122,7 @@ const POLICIES_TESTS = [
// POLICY: InstallAddons.Default (block addon installs)
{
policies: {
"InstallAddonsPermission": {
"InstallAddons": {
"Default": false,
}
},

2
browser/components/enterprisepolicies/tests/browser/browser_policy_block_set_desktop_background.js
View File

@@ -5,7 +5,7 @@
add_task(async function setup() {
await setupPolicyEngineWithJson({
"policies": {
"DisableSetDesktopBackground": true
"BlockSetDesktopBackground": true
}
});
});

8
browser/components/enterprisepolicies/tests/browser/browser_policy_cookie_settings.js
View File

@@ -132,7 +132,7 @@ add_task(async function test_third_party_disabled() {
await setupPolicyEngineWithJson({
"policies": {
"Cookies": {
"AcceptThirdParty": "never"
"AcceptThirdParty": "none"
}
}
});
@@ -151,7 +151,7 @@ add_task(async function test_disabled_and_third_party_disabled() {
"policies": {
"Cookies": {
"Default": false,
"AcceptThirdParty": "never"
"AcceptThirdParty": "none"
}
}
});
@@ -170,7 +170,7 @@ add_task(async function test_disabled_and_third_party_disabled_locked() {
"policies": {
"Cookies": {
"Default": false,
"AcceptThirdParty": "never",
"AcceptThirdParty": "none",
"Locked": true
}
}
@@ -245,7 +245,7 @@ add_task(async function test_disabled_cookie_expire_locked() {
"policies": {
"Cookies": {
"Default": false,
"AcceptThirdParty": "never",
"AcceptThirdParty": "none",
"ExpireAtSessionEnd": true,
"Locked": true
}

4
browser/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
View File

@@ -53,11 +53,11 @@ add_task(async function test_policy_disable_masterpassword() {
await setupPolicyEngineWithJson({
"policies": {
"DisableMasterPasswordCreation": true
"CreateMasterPassword": false
}
});
// With the `DisableMasterPasswordCreation: true` policy active, the
// With the `CreateMasterPassword: false` policy active, the
// UI entry points for creating a Master Password should be disabled.
await checkDeviceManager({buttonIsDisabled: true});
await checkAboutPreferences({checkboxIsDisabled: true});

2
browser/components/enterprisepolicies/tests/browser/config_popups_cookies_addons_flash.json
View File

@@ -19,7 +19,7 @@
]
},
"InstallAddonsPermission": {
"InstallAddons": {
"Allow": [
"https://www.allow.com",
"https://www.pre-existing-deny.com"