From ef2232bb2b70176bcbfc0acba1f2a88d2e92d845 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Tue, 21 May 2024 17:42:56 +0300
Subject: [PATCH] firefox: give fingerprintingprotection another chance

---
 conf/firefox-forbidden-policies.js | 31 +++++++++++++++---------------
 etc/firefox/policies/policies.json | 10 +++++-----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/conf/firefox-forbidden-policies.js b/conf/firefox-forbidden-policies.js
index cf99dfbd..3f784c6c 100644
--- a/conf/firefox-forbidden-policies.js
+++ b/conf/firefox-forbidden-policies.js
@@ -41,25 +41,24 @@ lockPref("privacy.donottrackheader.enabled", true);
 lockPref("privacy.donottrackheader.value", 1);
 
 // More tunable privacy.resistfingerprinting. I have lost the privacy game
-// many times before this point, so this is nothing.
-//lockPref("privacy.fingerprintingProtection", true);
-
+// many times before this point, so this is nothing.  For the options,
+// refer to https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/RFPTargets.inc
+lockPref("privacy.fingerprintingProtection", true);
 // Somehow I cannot clearPref this, so...
 //clearPref("privacy.fingerprintingProtection");
-lockPref("privacy.fingerprintingProtection", false);
-
-//pref(
-//	"privacy.fingerprintingProtection.overrides",
-//	"+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack",
-//);
-clearPref("privacy.fingerprintingProtection.overrides");
-//lockPref("privacy.fingerprintingProtection.pbmode", true);
-clearPref("privacy.fingerprintingProtection.pbmode");
+//lockPref("privacy.fingerprintingProtection", false);
+pref(
+	"privacy.fingerprintingProtection.overrides",
+	"+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack",
+);
+//clearPref("privacy.fingerprintingProtection.overrides");
+lockPref("privacy.fingerprintingProtection.pbmode", true);
+//clearPref("privacy.fingerprintingProtection.pbmode");
 // (Incompatible with the above)
-//lockPref("privacy.resistFingerprinting", false);
-clearPref("privacy.resistFingerprinting");
-//lockPref("privacy.resistFingerprinting.block_mozAddonManage", true);
-clearPref("privacy.resistFingerprinting.block_mozAddonManage");
+lockPref("privacy.resistFingerprinting", false);
+//clearPref("privacy.resistFingerprinting");
+lockPref("privacy.resistFingerprinting.block_mozAddonManage", true);
+//clearPref("privacy.resistFingerprinting.block_mozAddonManage");
 // Letterboxing from Tor Browser, I like it in general.
 lockPref("privacy.resistFingerprinting.letterboxing", true);
 // Still Incompatible with the above
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index b995436a..3f2d88d3 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -610,19 +610,19 @@
       },
       "privacy.fingerprintingProtection": {
         "Comment": "Preference not allowed for stability reasons. :(",
-        "Status": "clear",
+        "Status": "locked",
         "Type": "boolean",
         "Value": true
       },
       "privacy.fingerprintingProtection.overrides": {
-        "Comment": "Preference not allowed for stability reasons. :(",
-        "Status": "clear",
+        "Comment": "Preference not allowed for stability reasons. :( https://searchfox.org/mozilla-central/source/toolkit/components/resistfingerprinting/RFPTargets.inc",
+        "Status": "locked",
         "Type": "string",
         "Value": "+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack"
       },
       "privacy.fingerprintingProtection.pbmode": {
         "Comment": "Preference not allowed for stability reasons. :(",
-        "Status": "clear",
+        "Status": "locked",
         "Type": "boolean",
         "Value": true
       },
@@ -633,7 +633,7 @@
       },
       "privacy.resistFingerprinting": {
         "Comment": "Preference not allowed for stability reasons. :(",
-        "Status": "clear",
+        "Status": "locked",
         "Type": "boolean",
         "Value": false
       },