summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorfahl <fahl@chromium.org>2015-04-23 12:38:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 19:38:47 +0000
commite66e7ff038eacc0c31ef442987c2bc433e8dd5cc (patch)
treec4422f7e7d716a5f8b2f77a2d3bbf890409e7406 /components
parent449b529362950ccdfc48715146a466d7278b75dd (diff)
downloadchromium_src-e66e7ff038eacc0c31ef442987c2bc433e8dd5cc.zip
chromium_src-e66e7ff038eacc0c31ef442987c2bc433e8dd5cc.tar.gz
chromium_src-e66e7ff038eacc0c31ef442987c2bc433e8dd5cc.tar.bz2
Add enterprise policy for SSL error overriding
This new feature allows enterprises to set a policy such that users will not be allowed to override any SSL errors. BUG=440949 Review URL: https://codereview.chromium.org/1060833003 Cr-Commit-Position: refs/heads/master@{#326607}
Diffstat (limited to 'components')
-rw-r--r--components/policy/resources/policy_templates.json17
1 files changed, 16 insertions, 1 deletions
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 82b162c..eb45ccb 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -123,7 +123,7 @@
# persistent IDs for all fields (but not for groups!) are needed. These are
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
# because doing so would break the deployed wire format!
-# For your editing convenience: highest ID currently used: 299
+# For your editing convenience: highest ID currently used: 300
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -7335,6 +7335,21 @@
'desc': '''If this policy is set to true, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will unconditionally maximize the the first window shown on first run.
If this policy is set to false or not configured, a heuristic will decide whether to maximize the first window shown, based on the screen size.''',
},
+ {
+ 'name': 'SSLErrorOverrideAllowed',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'],
+ 'features': {
+ 'dynamic_refresh': True,
+ 'per_profile': True,
+ },
+ 'example_value': True,
+ 'id': 300,
+ 'caption': '''Allow proceeding from the SSL warning page''',
+ 'desc': '''Chrome shows a warning page when users navigate to sites that have SSL errors. By default or when this policy is set to true, users are allowed to click through these warning pages.
+ Setting this policy to false disallows users to click through any warning page.''',
+ },
],
'messages': {
# Messages that are not associated to any policies.