Bug 1773701 - Part 1: Add email tracking data collection feature to S…

…afeBrowsing.jsm. r=dimi Differential Revision: https://phabricator.services.mozilla.com/D151521
dothq · Jul 19, 2022 · edd54f5 · edd54f5
1 parent b12089a
commit edd54f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -3788,6 +3788,8 @@ pref("urlclassifier.features.socialtracking.annotate.blacklistTables", "social-t
 pref("urlclassifier.features.socialtracking.annotate.whitelistTables", "mozstd-trackwhite-digest256,google-trackwhite-digest256");
 pref("urlclassifier.features.emailtracking.blocklistTables", "base-email-track-digest256");
 pref("urlclassifier.features.emailtracking.allowlistTables", "mozstd-trackwhite-digest256");
+pref("urlclassifier.features.emailtracking.datacollection.blocklistTables", "base-email-track-digest256,content-email-track-digest256");
+pref("urlclassifier.features.emailtracking.datacollection.allowlistTables", "mozstd-trackwhite-digest256");
 
 // These tables will never trigger a gethash call.
 pref("urlclassifier.disallow_completions", "goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,goog-passwordwhite-proto,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256,base-email-track-digest256,content-email-track-digest256");

diff --git a/toolkit/components/url-classifier/SafeBrowsing.jsm b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -272,6 +272,23 @@ const FEATURES = [
       );
     },
   },
+  {
+    name: "emailtracking-data-collection",
+    list: [
+      "urlclassifier.features.emailtracking.datacollection.blocklistTables",
+      "urlclassifier.features.emailtracking.datacollection.allowlistTables",
+    ],
+    enabled() {
+      // Data collection features are enabled by default.
+      return true;
+    },
+    update() {
+      return Services.prefs.getBoolPref(
+        "browser.safebrowsing.features.emailtracking.datacollection.update",
+        this.enabled()
+      );
+    },
+  },
 ];
 
 var SafeBrowsing = {