ETag filtering

core_js/eTagFilter.js

@@ -65,8 +65,14 @@ function generateDummyEtag(len, quotes = true, w = false) {
     return rtn;
 }
 
-browser.webRequest.onHeadersReceived.addListener(
-    eTagFilter,
-    {urls: ["<all_urls>"]},
-    ["blocking", "responseHeaders"]
-);
+/**
+ * Since Firefox 85, eTags can no longer be 
+ * used for tracking users over multiple sites.
+ */
+if(getBrowser() !== "Firefox") {
+    browser.webRequest.onHeadersReceived.addListener(
+        eTagFilter,
+        {urls: ["<all_urls>"]},
+        ["blocking", "responseHeaders"]
+    );
+}

core_js/historyListener.js

@@ -44,7 +44,7 @@ function historyCleaner(details) {
         if(urlBefore !== urlAfter) {
             browser.tabs.executeScript(details.tabId, {
                 frameId: details.frameId,
-                   code: 'history.replaceState({state: "cleaned_history"},"",'+JSON.stringify(urlAfter)+');'
+                   code: 'history.replaceState({state: null},"",'+JSON.stringify(urlAfter)+');'
             }).then(() => {}, onError);
         }
     }

core_js/settings.js

@@ -147,6 +147,20 @@ function getData() {
             changeSwitchButton("domainBlocking", "domainBlocking");
             changeSwitchButton("pingBlocking", "pingBlocking");
             changeSwitchButton("eTagFiltering", "eTagFiltering");
+        })
+        .then(() => {
+            /**
+             * Since Firefox 85, eTags can no longer be 
+             * used for tracking users over multiple sites.
+             */
+            browser.runtime.sendMessage({
+                function: "getBrowser",
+                params: []
+            }).then(resp => {
+                if(resp.response === "Firefox") {
+                    document.getElementById('etag_p').remove();
+                }
+            }, null);
         }).catch(handleError);
 }