From: Michael Kaply <consulting@kaply.com>
Date: Fri, 6 Apr 2018 16:49:51 +0000 (-0500)
Subject: Update Addons policy
X-Git-Tag: 0.9~17^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/a62af0a71ec72e478883e43bd8fc44be5f737e2c?hp=55d627db4cb055a696a0892ee5f78af1fbef42b1

Update Addons policy
---

diff --git a/README.md b/README.md
index b8a949a..b9c1819 100644
--- a/README.md
+++ b/README.md
@@ -350,13 +350,14 @@ This policy sets domains for which popups are allowed
 }
 ```
 ### InstallAddons
-This policy sets domains that can install extensions
+This policy sets domains that can install extensions, as well as the default behavior.
 ```
 {
   "policies": {
     "InstallAddons": {
       "Allow": ["http://example.org/",
                 "http://example.edu/"]
+      "Default": [true|false], /* If this is set to false, add-ons cannot be installed by the user */
     }
   }
 }
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index e734ff6..e3971c4 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -109,7 +109,13 @@ If this policy is disabled or not configured, no extensions are locked.</string>
       <string id="RememberPasswords">Remember Passwords</string>
       <string id="RememberPasswords_Explain">Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.</string>
       <string id="PopupsAllow_Explain">URLs to allow popups.</string>
-      <string id="AddonsAllow_Explain">URLs to allow addons.</string>
+      <string id="InstallAddons_Allow_Explain">If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well.
+
+If this policy is disabled or not configured, the default add-on policy is followed.</string>
+      <string id="InstallAddons_Default">Allow add-on installs from websites</string>
+      <string id="InstallAddons_Default_Explain">If this policy is disabled, add-ons cannot be installed.
+
+If this policy is not configured or enabled, add-ons can be installed.</string>
       <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default cookie policy is followed.</string>
@@ -196,7 +202,6 @@ If this policy is enabled, private browsing is enabled by default in both the br
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
-      <presentation id="AddonsAllow"><listBox refId="AddonsAllowDesc">Allow add-ons for websites</listBox></presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1114e00..14df4c5 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -473,13 +473,23 @@
         <list id="PopupsAllowDesc" key="Software\Policies\Mozilla\Firefox\Popups\Allow" valuePrefix=""/>
       </elements>
     </policy>
-    <policy class="Both" displayName="$(string.Allow)" explainText="$(string.AddonsAllow_Explain)" key="Software\Policies\Mozilla\Firefox" name="AddonsAllow" presentation="$(presentation.AddonsAllow)">
-      <parentCategory ref="Addons"/>
+    <policy name="InstallAddons_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.InstallAddons_Allow_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
+      <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
-        <list id="AddonsAllowDesc" key="Software\Policies\Mozilla\Firefox\InstallAddons\Allow" valuePrefix=""/>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\InstallAddons\Allow" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="InstallAddons_Default" class="Both" displayName="$(string.InstallAddons_Default)" explainText="$(string.InstallAddons_Default_Explain)" key="Software\Policies\Mozilla\Firefox\InstallAddons" valueName="Default">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="FlashPlugin_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.FlashPlugin_Allow_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Permissions)">
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>