From 5035c4446dd2004bb7c5dc8a78c0a474ff2eb53d Mon Sep 17 00:00:00 2001
From: fxbrit <fxbrit@tuta.io>
Date: Mon, 31 Jan 2022 19:27:52 +0100
Subject: [PATCH] start re-organizing the file

---
 librewolf.cfg | 72 ++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/librewolf.cfg b/librewolf.cfg
index 4a3c6d1..8381641 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -1,65 +1,61 @@
-//----------------------|
-//  LibreWolf settings  |
-//----------------------|
-
-/**
- 
- NOTE: please take the time to read and understand, but also to customize the settings to find your own setup.
- the answers to the most common questions are at this link https://librewolf.net/docs/faq/
- 
+/** LIBREWOLF SETTINGS
+ * 
+ * please take the time to read and understand, but also to customize the settings to find your own setup.
+ * the answers to the most common questions are at this link https://librewolf.net/docs/faq/
  */
-
 defaultPref("librewolf.cfg.version", "5.5");
 
-// -------------------------------
-// # SANITIZING, TP, SESSIONS
-// -------------------------------
 
 /**
- strict mode includes:
- - dFPI for both normal and private browsing
- - strict blocking lists for trackers, including crypto, fping and socialtracking
- - shims to avoid breakage caused by blocking lists
- - stricter policies for xorigin referrers
- - cookie cleaning mechanism specific to dFPI
-*/
-pref("browser.contentblocking.category", "strict");
+ * the file is organized in categories, and each one has a number of sections
+ * - PRIVACY
+ *   - ISOLATION
+ *   - SANITIZING
+ *   - HISTORY AND SESSION RESTORE 
+ *   - QUERY STRIPPING
+ */
 
-defaultPref("network.cookie.cookieBehavior", 5); // dFPI is default for strict mode, but enforce
-defaultPref("network.cookie.lifetimePolicy", 2); // keep cookies until end of the session, then clear
+
+/** [CATEGORY] PRIVACY */
+
+/** [SECTION] ISOLATION
+ * default to strict mode, which includes:
+ * 1. dFPI for both normal and private windows
+ * 2. strict blocking lists for trackers
+ * 3. shims to avoid breakage caused by blocking lists
+ * 4. stricter policies for xorigin referrers
+ * 5. dFPI specific cookie cleaning mechanism
+ */
+pref("browser.contentblocking.category", "strict");
+defaultPref("network.cookie.cookieBehavior", 5); // enforce dFPI
 defaultPref("privacy.partition.serviceWorkers", true); // isolate service workers
 
+/** [SECTION] SANITIZING */
+defaultPref("network.cookie.lifetimePolicy", 2); // keep cookies until end of the session, then clear
 // make third party and http cookies session-only
 defaultPref("network.cookie.thirdparty.sessionOnly", true);
 defaultPref("network.cookie.thirdparty.nonsecureSessionOnly", true);
-
 /**
- this way of sanitizing cookies would override the exceptions set by the users and just delete everything,
- we disable it but cookies and site data are still cleared per session unless exceptions are set.
- all the cleaning prefs true by default except for siteSetting and offlineApps, which is what we want.
-*/
+ * this way of sanitizing cookies would override the exceptions set by the users and just delete everything,
+ * we disable it but cookies and site data are still cleared per session unless exceptions are set.
+ * all the cleaning prefs true by default except for siteSetting and offlineApps, which is what we want.
+ */
 defaultPref("privacy.clearOnShutdown.cookies", false);
 defaultPref("privacy.sanitize.sanitizeOnShutdown", true);
 defaultPref("privacy.sanitize.timeSpan", 0);
 
+/** [SECTION] HISTORY AND SESSION RESTORE */
 defaultPref("browser.formfill.enable", false); // disable form history
+defaultPref("browser.sessionstore.privacy_level", 2); // prevent websites from storing session data like cookies and forms
+defaultPref("browser.sessionstore.interval", 60000); // increase time between session saves
 
-// prevent websites from storing session data like cookies and forms, increase time between session saves
-defaultPref("browser.sessionstore.privacy_level", 2);
-defaultPref("browser.sessionstore.interval", 60000);
-
-// -----------------
-// QUERY STRIPPING
-// -----------------
-
-/**
+/** [SECTION] QUERY STRIPPING
  * enable query stripping and set the strip list.
  * currently we use the same one that brave uses:
  * https://github.com/brave/brave-core/blob/f337a47cf84211807035581a9f609853752a32fb/browser/net/brave_site_hacks_network_delegate_helper.cc#L29
  */ 
 defaultPref("privacy.query_stripping.enabled", true);
 defaultPref("privacy.query_stripping.strip_list", "__hsfp __hssc __hstc __s _hsenc _openstat dclid fbclid gbraid gclid hsCtaTracking igshid mc_eid ml_subscriber ml_subscriber_hash msclkid oly_anon_id oly_enc_id rb_clickid s_cid twclid vero_conv vero_id wbraid wickedid yclid");
-
 /**
  * librewolf specific pref that allows to include the query stripping lists in uBO by default.
  * the asset file is fetched every 7 days.