Policy for EnableTrackingProtection. Fixes #21

diff --git a/README.md b/README.md
index b6d3bc6db6e1d11da85fe7aca609ed7bf02edbd0..6496527f39031fceeec355e5ebc3dc2f0abb1117 100644 (file)
--- a/README.md
+++ b/README.md
@@ -188,6 +188,24 @@ This policy stops Firefox from checking if it is the default browser at startup.
   }
 }
 ```
   }
 }
 ```

+### EnableTrackingProtection
+This policy enables affects tracking protection.
+
+If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+
+If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
+
+If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
+```
+{
+  "policies": {
+    "EnableTrackingProtection": {
+      "Value": [true, false],
+      "Locked": [true, false]
+    }
+  }
+}
+```

 ### RememberPasswords
 This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
 ```
 ### RememberPasswords
 This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 06beb4b42e885854def8814b8ed1418a0f90d454..e32018fcbabd724e3251aa5705c3c9a6cfe9c5cb 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -77,6 +77,12 @@
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>
       <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>
       <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>

+      <string id="TrackingProtection">Tracking Protection</string>
+      <string id="TrackingProtection_Explain">If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+
+If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
+
+If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>

     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>


@@ -85,6 +91,9 @@
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>

+      <presentation id="TrackingProtection">
+        <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
+      </presentation>

       <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">
       <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 198dc65f05cb05fbd04a498e450ede16f2d7f830..c393ef91c97af625ce39cc647457b0202725ab83 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -238,6 +238,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+      <elements >
+        <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>

     <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
     <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>