From 1f0ac5a0e9a8efa7bb2f54cf40a1b6d5d696dfc8 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Sun, 19 May 2024 11:38:18 +0300
Subject: [PATCH] {firefox,chromium}: simplify allowlist configuration

PrivacyBadger continues having stricter rules and I am trusting it to catch what I let through
---
 etc/firefox/policies/policies.json            | 45 ++++++++++---------
 .../policies/managed/aminda-extensions.json   | 45 ++++++++++---------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 181c2932..726a8402 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -20,19 +20,18 @@
           "checkForDNTPolicy": true,
           "disabledSites": [
             "app.element.io",
-            "staging.element.io",
-            "develop.element.io",
-            "chat.pikaviestin.fi",
-            "webchat.disroot.org",
-            "learn.microsoft.com",
-            "teams.microsoft.com",
             "bittimittari.fi",
             "challenges.cloudflare.com",
-            "pp-attester-turnstile.research.cloudflare.com",
+            "chat.pikaviestin.fi",
+            "develop.element.io",
+            "ecosia.org",
             "keyoxide.org",
-            "one.one.one.one",
-            "www.ecosia.org",
-            "ac.ecosia.org"
+            "learn.microsoft.com",
+            "one.one",
+            "pp-attester-turnstile.research.cloudflare.com",
+            "staging.element.io",
+            "teams.microsoft.com",
+            "webchat.disroot.org"
           ],
           "learnInIncognito": true,
           "learnLocally": true,
@@ -47,20 +46,22 @@
         "uBlock0@raymondhill.net": {
           "toAdd": {
             "trustedSiteDirectives": [
-              "app.element.io",
-              "staging.element.io",
-              "develop.element.io",
-              "chat.pikaviestin.fi",
-              "webchat.disroot.org",
-              "learn.microsoft.com",
-              "teams.microsoft.com",
               "bittimittari.fi",
-              "challenges.cloudflare.com",
-              "pp-attester-turnstile.research.cloudflare.com",
+              "chrome-extension-scheme",
+              "cloudflare.com",
+              "disroot.org",
+              "duckduckgo.com",
+              "ecosia.org",
+              "element.io",
+              "google",
+              "google.com",
               "keyoxide.org",
-              "one.one.one.one",
-              "www.ecosia.org",
-              "ac.ecosia.org"
+              "live.com",
+              "matrix.org",
+              "microsoft.com",
+              "moz-extension-scheme",
+              "one.one",
+              "pikaviestin.fi"
             ]
           },
           "toOverwrite": {
diff --git a/etc/opt/chromium/policies/managed/aminda-extensions.json b/etc/opt/chromium/policies/managed/aminda-extensions.json
index 8d26424d..37e81705 100644
--- a/etc/opt/chromium/policies/managed/aminda-extensions.json
+++ b/etc/opt/chromium/policies/managed/aminda-extensions.json
@@ -10,20 +10,22 @@
       "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
         "toAdd": {
           "trustedSiteDirectives": [
-            "app.element.io",
-            "staging.element.io",
-            "develop.element.io",
-            "chat.pikaviestin.fi",
-            "webchat.disroot.org",
-            "learn.microsoft.com",
-            "teams.microsoft.com",
             "bittimittari.fi",
-            "challenges.cloudflare.com",
-            "pp-attester-turnstile.research.cloudflare.com",
+            "chrome-extension-scheme",
+            "cloudflare.com",
+            "disroot.org",
+            "duckduckgo.com",
+            "ecosia.org",
+            "element.io",
+            "google",
+            "google.com",
             "keyoxide.org",
-            "one.one.one.one",
-            "www.ecosia.org",
-            "ac.ecosia.org"
+            "live.com",
+            "matrix.org",
+            "microsoft.com",
+            "moz-extension-scheme",
+            "one.one",
+            "pikaviestin.fi"
           ]
         },
         "toOverwrite": {
@@ -70,19 +72,18 @@
         "checkForDNTPolicy": true,
         "disabledSites": [
           "app.element.io",
-          "staging.element.io",
-          "develop.element.io",
-          "chat.pikaviestin.fi",
-          "webchat.disroot.org",
-          "learn.microsoft.com",
-          "teams.microsoft.com",
           "bittimittari.fi",
           "challenges.cloudflare.com",
-          "pp-attester-turnstile.research.cloudflare.com",
+          "chat.pikaviestin.fi",
+          "develop.element.io",
+          "ecosia.org",
           "keyoxide.org",
-          "one.one.one.one",
-          "www.ecosia.org",
-          "ac.ecosia.org"
+          "learn.microsoft.com",
+          "one.one",
+          "pp-attester-turnstile.research.cloudflare.com",
+          "staging.element.io",
+          "teams.microsoft.com",
+          "webchat.disroot.org"
         ],
         "learnInIncognito": true,
         "learnLocally": true,