Merge pull request #41 from mozilla/ImportEnterpriseRoots_Policy

Add policy for reading windows certs. Fixes #29

diff --git a/README.md b/README.md
index 867fb97055c238d993b3bbd55a65b0d9b1bcfa4c..07e144a46e542f6c3c95a1705ca00b01cc84ee32 100644 (file)
--- a/README.md
+++ b/README.md
@@ -66,6 +66,17 @@ This policy removes the "Set As Desktop Background..." menuitem when right click
   }
 }
 ```
+### Certificates
+This is a Windows only policy that tells Firefox to read certificates from the Windows certificate store.
+```
+{
+  "policies": {
+    "Certificates": {
+      "ImportEnterpriseRoots": [true|false]
+    }
+  }
+}
+```
 ### CreateMasterPassword
 This policy removes the master password functionality.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 17382255d69ee89ba16aa7af26a2b47badbaf647..ff9c60525e72fc1eeb23ff30fa8aeb063fd308a4 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -9,6 +9,7 @@
       <string id="Permissions_group">Permissions</string>
       <string id="Authentication_group">Authentication</string>
       <string id="Bookmarks_group">Bookmarks</string>
+      <string id="Certificates_group">Certificates</string>
       <string id="Popups_group">Popups</string>
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>
@@ -32,6 +33,10 @@
       <string id="BlockAboutSupport_Explain">Blocks access to the about:support page.</string>
       <string id="BlockSetDesktopBackground">Block Set Desktop Background</string>
       <string id="BlockSetDesktopBackground_Explain">Prevents usage of the &quot;Set Image as Desktop Background&quot; feature.</string>
+      <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
+      <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
+
+If this policy is not configured or disabled, Firefox will not read certificates from the Windows certificate store.</string>
       <string id="CreateMasterPassword">Create Master Password</string>
       <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 351fabd7a843862f5a0ec5afee1fdf1d0f3d6799..963487aaa66108373a6411c4728f4e7128067d6c 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -39,6 +39,9 @@
     <category displayName="$(string.Authentication_group)" name="Authentication">
       <parentCategory ref="firefox"/>
     </category>
+    <category displayName="$(string.Certificates_group)" name="Certificates">
+      <parentCategory ref="firefox"/>
+    </category>
   </categories>
   <policies>
     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
@@ -112,6 +115,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="Certificates_ImportEnterpriseRoots" class="Both" displayName="$(string.Certificates_ImportEnterpriseRoots)" explainText="$(string.Certificates_ImportEnterpriseRoots_Explain)" key="Software\Policies\Mozilla\Firefox\Certificates" valueName="ImportEnterpriseRoots">
+      <parentCategory ref="Certificates"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="CreateMasterPassword" class="Both" displayName="$(string.CreateMasterPassword)" explainText="$(string.CreateMasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CreateMasterPassword">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>