Merge pull request #530 from mozilla/EnableTrackingProtection_Updates

Add Exceptions to tracking protection.

diff --git a/README.md b/README.md
index 7c803518d182f6f9bcc4516b0234e50be79580f3..68dfd3f92c66948a5ba9e6ef1fc5383d6429638c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1325,8 +1325,10 @@ If `Cryptomining` is set to true, cryptomining scripts on websites are blocked.
 
 If `Fingerprinting` is set to true, fingerprinting scripts on websites are blocked.
 
-**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2)\
-**CCK2 Equivalent:** `dontCheckDefaultBrowser`\
+`Exceptions` are origins for which tracking protection is not enabled.
+
+**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5)\
+**CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.trackingprotection.enabled`,`privacy.trackingprotection.pbmode.enabled`,`privacy.trackingprotection.cryptomining.enabled`,`privacy.trackingprotection.fingerprinting.enabled`
 
 #### Windows (GPO)
@@ -1335,6 +1337,7 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Value = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Cryptomining = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions\1 = "https://example.com"
 ```
 #### macOS
 ```
@@ -1343,12 +1346,16 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1
   <dict>
     <key>Value</key>
     <true/> | <false/>
-    <key><Locked/key>
+    <key><Locked</key>
     <true/> | <false/>
-    <key><Cryptomining/key>
+    <key><Cryptomining</key>
     <true/> | <false/>
-    <key><Fingerprinting/key>
+    <key><Fingerprinting</key>
     <true/> | <false/>
+    <key>Exceptions</key>
+    <array>
+      <string>https://example.com</string>
+    </array>
   </dict>
 </dict>
 ```
@@ -1360,7 +1367,8 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1
       "Value": [true, false],
       "Locked": [true, false],
       "Cryptomining": [true, false],
-      "Fingerprinting": [true, false]
+      "Fingerprinting": [true, false],
+      "Exceptions": ["https://example.com"]
     }
 }
 ```

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index d9ddf5a8be49844b94371cd6ae548af3210bb703..1d489be52f6e66d257789d2872b34eebda7af8f9 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -180,6 +180,10 @@
                <true/>
                <key>Fingerprinting</key>
                <true/>
+               <key>Exceptions</key>
+               <array>
+                       <string>https://example.com</string>
+               </array>
        </dict>
        <key>Extensions</key>
        <dict>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index a426772cdb167250f3ea2881f34e93f0c797358c..af2c857e2c0f2d0f4b53860ea8b8361f64ebeab4 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -700,6 +700,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
         <checkBox refId="TrackingProtectionLocked">Änderungen am Schutz vor Aktivitäten Verfolgung nicht erlauben</checkBox>
         <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>
         <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>
+        <text>Exceptions:</text>
+        <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index b418dec9be81b431c68bbfd2eb403496c46d8fde..09a6d3f9c50aa734416745cb164c60c231c92886 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -699,6 +699,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
         <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>
         <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>
+        <text>Exceptions:</text>
+        <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 80697c92d4c0cee88eefb678cd85167a29984558..f3ffe7ec0ac2b04a3f546064bc59ee9c4b5b8a0a 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -699,6 +699,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <checkBox refId="TrackingProtectionLocked">No permitir que se cambien las preferencias de protección contra rastreo.</checkBox>
         <checkBox refId="Cryptomining">Bloquear scripts de minado de criptomonedas.</checkBox>
         <checkBox refId="Fingerprinting">Bloquear scripts de huellas digitales.</checkBox>
+        <text>Exceptions:</text>
+        <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">

diff --git a/windows/firefox.admx b/windows/firefox.admx
index b80d9020b20fcc8842ca5563dc050b21c0e390ca..fe8cc962eb4c5a0310d3e254a69c45d0e1c841bb 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2388,6 +2388,7 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
+        <list id="TrackingProtection_Exceptions" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions" valuePrefix=""/>
       </elements>
     </policy>
     <!-- Alphabetization is based on name, so had to add B -->

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 2c60929cb27df0240feba51d87f909a40cb7746d..6cce77f67fd800b3aa6438155f017f59ba7f7254 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -699,6 +699,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <checkBox refId="TrackingProtectionLocked">Ne pas autoriser la modification des préférences de protection du suivi.</checkBox>\r
         <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>\r
         <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>\r
+        <text>Exceptions:</text>\r
+        <listBox refId="TrackingProtection_Exceptions"/>\r
       </presentation>\r
       <presentation id="OverridePage">\r
         <textBox refId="OverridePage">\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 07422c6bc295213831a6bc275a3e6a90c16c8be0..28d894d6db35069fb63dbdbcf3d1872eea7fc40f 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -699,6 +699,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <checkBox refId="TrackingProtectionLocked">Non consentire la modifica delle preferenze relative alla protezione antitracciamento.</checkBox>
         <checkBox refId="Cryptomining">Blocca script cryptominer.</checkBox>
         <checkBox refId="Fingerprinting">Blocca script fingerprinter.</checkBox>
+        <text>Exceptions:</text>
+        <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 83e155c82fbf156853e4f9f5a236bd8958921f27..4aca9e56fed7530ed7407d693c256bd9feb2a72f 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -697,6 +697,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
         <checkBox refId="TrackingProtectionLocked">不允許調整追蹤保護偏好設定。</checkBox>
         <checkBox refId="Cryptomining">封鎖加密貨幣採礦程式。</checkBox>
         <checkBox refId="Fingerprinting">封鎖數位指紋追蹤程式。</checkBox>
+        <text>Exceptions:</text>
+        <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">