From 12dc45c3eb7e282882b2c918f3dd7739f9fd5514 Mon Sep 17 00:00:00 2001
From: Narsil <narsil@noreply@nixnet.servcies>
Date: Mon, 22 Nov 2021 22:26:10 +0000
Subject: [PATCH] Update 'user.js'

---
 user.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/user.js b/user.js
index f27f03e..13b0227 100644
--- a/user.js
+++ b/user.js
@@ -521,7 +521,7 @@ user_pref("privacy.userContext.ui.enabled", true);
 // Disable WebRTC (Web Real-Time Communication)
 user_pref("media.peerconnection.enabled", false);
 // -------------------------------------
-// Limit WebRTC IP leaks if using WebRTC
+// Limit WebRTC private network address leaks
 user_pref("media.peerconnection.ice.default_address_only", true);
 user_pref("media.peerconnection.ice.no_host", true); // [FF51+]
 user_pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true); // [FF70+]
@@ -662,13 +662,6 @@ user_pref("extensions.postDownloadThirdPartyPrompt", false);
 user_pref("network.cookie.cookieBehavior", 1);
 user_pref("browser.contentblocking.category", "custom");
 // -------------------------------------
-// Set third-party cookies (if enabled, see 2701) to session-only
-user_pref("network.cookie.thirdparty.sessionOnly", true);
-user_pref("network.cookie.thirdparty.nonsecureSessionOnly", true); // [FF58+]
-// -------------------------------------
-// Delete cookies and site data on close
-user_pref("network.cookie.lifetimePolicy", 2);
-// -------------------------------------
 // Enable Enhanced Tracking Protection (ETP) in all windows
 user_pref("privacy.trackingprotection.enabled", false);
 user_pref("privacy.trackingprotection.origin_telemetry.enabled", false);
@@ -694,29 +687,44 @@ user_pref("privacy.socialtracking.block_cookies.enabled", false);
 user_pref("dom.storage.next_gen", true); // [DEFAULT: true FF92+]
 //
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-// SHUTDOWN
+// SHUTDOWN & SANITIZING
 // >>>>>>>>>>>>>>>>>>>>>
 //
+// COOKIES + SITE DATA : ALLOWS EXCEPTIONS
+//
+// Delete cookies and site data on exit
+// 0=keep until they expire (default), 2=keep until you close Firefox
+user_pref("network.cookie.lifetimePolicy", 2);
+// -------------------------------------
+// Delete cache on exit [FF96+]
+// user_pref("privacy.clearsitedata.cache.enabled", true);
+// -------------------------------------
+// Set third-party cookies to session-only
+user_pref("network.cookie.thirdparty.sessionOnly", true);
+user_pref("network.cookie.thirdparty.nonsecureSessionOnly", true); // [FF58+]
+//
+// SANITIZE ON SHUTDOWN : ALL OR NOTHING
+//
 // Enable Firefox to clear items on shutdown
 user_pref("privacy.sanitize.sanitizeOnShutdown", true);
 // -------------------------------------
 // Set/enforce what items to clear on shutdown [SETUP-CHROME]
 user_pref("privacy.clearOnShutdown.cache", true);
-user_pref("privacy.clearOnShutdown.cookies", true);
 user_pref("privacy.clearOnShutdown.downloads", true); // [DEFAULT: true]
 user_pref("privacy.clearOnShutdown.formdata", true); // [DEFAULT: true]
 user_pref("privacy.clearOnShutdown.history", true); // [DEFAULT: true]
 user_pref("privacy.clearOnShutdown.sessions", true); // [DEFAULT: true]
+user_pref("privacy.clearOnShutdown.cookies", true);
 user_pref("privacy.clearOnShutdown.offlineApps", true);
 // user_pref("privacy.clearOnShutdown.siteSettings", false); // [DEFAULT: false] Site Preferences
 // -------------------------------------
 // Reset default items to clear with Ctrl-Shift-Del [SETUP-CHROME]
 user_pref("privacy.cpd.cache", true); // [DEFAULT: true]
-user_pref("privacy.cpd.cookies", true); // [DEFAULT: true]
 user_pref("privacy.cpd.formdata", true); // Form & Search History
 user_pref("privacy.cpd.history", true); // Browsing & Download History
 user_pref("privacy.cpd.offlineApps", true); // Offline Website Data
 user_pref("privacy.cpd.sessions", true); // [DEFAULT: true]
+user_pref("privacy.cpd.cookies", false);
 user_pref("privacy.cpd.offlineApps", true);
 // user_pref("privacy.cpd.downloads", true); // not used
 // user_pref("privacy.cpd.passwords", false); // [DEFAULT: false]