Commit 2ea9213a authored by Michael Kaply's avatar Michael Kaply
Browse files

Bug 1577149 - Additional preferences managed by policy requested by users. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D48217

--HG--
extra : moz-landing-system : lando
parent d0da7de7
......@@ -112,14 +112,14 @@ var Policies = {
);
}
if ("AllowNonFQDN" in param) {
if (param.AllowNonFQDN.NTLM) {
if ("NTLM" in param.AllowNonFQDN) {
setDefaultPref(
"network.automatic-ntlm-auth.allow-non-fqdn",
param.AllowNonFQDN.NTLM,
locked
);
}
if (param.AllowNonFQDN.SPNEGO) {
if ("SPNEGO" in param.AllowNonFQDN) {
setDefaultPref(
"network.negotiate-auth.allow-non-fqdn",
param.AllowNonFQDN.SPNEGO,
......@@ -127,6 +127,22 @@ var Policies = {
);
}
}
if ("AllowProxies" in param) {
if ("NTLM" in param.AllowProxies) {
setDefaultPref(
"network.automatic-ntlm-auth.allow-proxies",
param.AllowProxies.NTLM,
locked
);
}
if ("SPNEGO" in param.AllowProxies) {
setDefaultPref(
"network.negotiate-auth.allow-proxies",
param.AllowProxies.SPNEGO,
locked
);
}
}
},
},
......
......@@ -54,6 +54,18 @@
}
}
},
"AllowProxies": {
"type": "object",
"properties": {
"SPNEGO": {
"type": "boolean"
},
"NTLM": {
"type": "boolean"
}
}
},
"Locked": {
"type": "boolean"
}
......@@ -669,15 +681,37 @@
"Preferences": {
"type": "object",
"properties": {
"accessibility.force_disabled": {
"type": "number",
"enum": [-1, 0, 1]
},
"app.update.auto": {
"type": "boolean"
},
"browser.bookmarks.autoExportHTML": {
"type": "boolean"
},
"browser.bookmarks.file": {
"type": "string"
},
"browser.places.importBookmarksHTML": {
"type": "boolean"
},
"browser.bookmarks.restore_default_bookmarks": {
"type": "boolean"
},
"browser.cache.disk.enable": {
"type": "boolean"
},
"browser.fixup.dns_first_for_single_words": {
"type": "boolean"
},
"browser.safebrowsing.phishing.enabled": {
"type": "boolean"
},
"browser.safebrowsing.malware.enabled": {
"type": "boolean"
},
"browser.search.update": {
"type": "boolean"
},
......@@ -687,6 +721,15 @@
"browser.cache.disk.parent_directory": {
"type": "string"
},
"browser.slowStartup.notificationDisabled": {
"type": "boolean"
},
"browser.taskbar.previews.enable": {
"type": "boolean"
},
"browser.urlbar.suggest.bookmark": {
"type": "boolean"
},
"browser.urlbar.suggest.openpage": {
"type": "boolean"
},
......@@ -696,7 +739,7 @@
"datareporting.policy.dataSubmissionPolicyBypassNotification": {
"type": "boolean"
},
"browser.urlbar.suggest.bookmark": {
"dom.allow_scripts_to_close_windows": {
"type": "boolean"
},
"dom.disable_window_flip": {
......@@ -714,9 +757,21 @@
"dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl": {
"type": "string"
},
"extensions.blocklist.enabled": {
"type": "boolean"
},
"extensions.getAddons.showPane": {
"type": "boolean"
},
"geo.enabled": {
"type": "boolean"
},
"intl.accept_languages": {
"type": "string"
},
"media.eme.enabled": {
"type": "boolean"
},
"media.gmp-gmpopenh264.enabled": {
"type": "boolean"
},
......@@ -732,6 +787,9 @@
"places.history.enabled": {
"type": "boolean"
},
"print.save_print_settings": {
"type": "boolean"
},
"privacy.file_unique_origin": {
"type": "boolean"
},
......@@ -741,6 +799,9 @@
"security.ssl.errorReporting.enabled": {
"type": "boolean"
},
"security.mixed_content.block_active_content": {
"type": "boolean"
},
"ui.key.menuAccessKeyFocuses": {
"type": "boolean"
}
......
......@@ -121,6 +121,10 @@ const POLICIES_TESTS = [
SPNEGO: true,
NTLM: true,
},
AllowProxies: {
SPNEGO: false,
NTLM: false,
},
},
},
lockedPrefs: {
......@@ -129,6 +133,8 @@ const POLICIES_TESTS = [
"network.automatic-ntlm-auth.trusted-uris": "a.com, b.com",
"network.automatic-ntlm-auth.allow-non-fqdn": true,
"network.negotiate-auth.allow-non-fqdn": true,
"network.automatic-ntlm-auth.allow-proxies": false,
"network.negotiate-auth.allow-proxies": false,
},
},
......@@ -143,6 +149,10 @@ const POLICIES_TESTS = [
SPNEGO: true,
NTLM: true,
},
AllowProxies: {
SPNEGO: false,
NTLM: false,
},
Locked: false,
},
},
......@@ -152,6 +162,8 @@ const POLICIES_TESTS = [
"network.automatic-ntlm-auth.trusted-uris": "a.com, b.com",
"network.automatic-ntlm-auth.allow-non-fqdn": true,
"network.negotiate-auth.allow-non-fqdn": true,
"network.automatic-ntlm-auth.allow-proxies": false,
"network.negotiate-auth.allow-proxies": false,
},
},
......
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