diff --git a/firefox/extension_settings/CanvasBlocker-settings.json b/firefox/extension_settings/CanvasBlocker-settings.json index a04f3f9..06366ba 100755 --- a/firefox/extension_settings/CanvasBlocker-settings.json +++ b/firefox/extension_settings/CanvasBlocker-settings.json @@ -2,10 +2,7 @@ "logLevel": 1, "urlSettings": [], "hiddenSettings": {}, - "expandStatus": { - "protectNavigator": true, - "section_notifications": false - }, + "expandStatus": {}, "displayHiddenSettings": false, "whiteList": "", "sessionWhiteList": "", @@ -29,12 +26,12 @@ "storePersistentRnd": false, "persistentRndClearIntervalValue": 0, "persistentRndClearIntervalUnit": "days", - "lastPersistentRndClearing": 1609058822726, + "lastPersistentRndClearing": 1679940153673, "sharePersistentRndBetweenDomains": false, "askOnlyOnce": "individual", "askDenyMode": "block", "showCanvasWhileAsking": true, - "showNotifications": false, + "showNotifications": true, "highlightPageAction": "none", "highlightBrowserAction": "color", "displayBadge": false, @@ -51,23 +48,38 @@ "audioNoiseLevel": "minimal", "useAudioCache": true, "audioUseFixedIndices": true, - "audioFixedIndices": "14", + "audioFixedIndices": "8", "historyLengthThreshold": 2, - "protectWindow": false, - "allowWindowNameInFrames": false, + "protectWindow": true, + "allowWindowNameInFrames": true, "protectDOMRect": true, "domRectIntegerFactor": 4, + "protectSVG": true, "protectTextMetrics": true, "blockDataURLs": true, "protectNavigator": false, - "navigatorDetails": {}, - "protectScreen": true, + "navigatorDetails": { + "osPreset": "Windows", + "windowManager": "Windows", + "platform": "Win32", + "platformDetails": "Windows NT 10.0; Win64; x64", + "oscpu": "{platformDetails}", + "browserPreset": "Firefox", + "appVersion": "5.0 ({windowManager})", + "buildID": "20181001000000", + "productSub": "20100101", + "userAgent": "Mozilla/5.0 ({platformDetails}; rv:{firefoxVersion}) Gecko/20100101 Firefox/{firefoxVersion}", + "firefoxVersion": "{real Firefox version}" + }, + "protectScreen": false, "screenSize": "", "fakeMinimalScreenSize": true, - "displayAdvancedSettings": false, + "displayAdvancedSettings": true, "displayDescriptions": true, "theme": "auto", "dontShowOptionsOnUpdate": false, + "disruptSessionOnUpdate": false, + "updatePending": false, "isStillDefault": false, "storageVersion": 1 } \ No newline at end of file diff --git a/firefox/extension_settings/ublock.txt b/firefox/extension_settings/ublock.txt index 9b68cea..39239f6 100755 --- a/firefox/extension_settings/ublock.txt +++ b/firefox/extension_settings/ublock.txt @@ -1,16 +1,12 @@ { - "timeStamp": 1645230051113, - "version": "1.41.4", + "timeStamp": 1679923042940, + "version": "1.47.4", "userSettings": { - "advancedUserEnabled": true, - "alwaysDetachLogger": false, - "externalLists": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt", - "importedLists": [ - "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt" - ], - "showIconBadge": false, - "tooltipsDisabled": true, - "webrtcIPAddressHidden": true + "contextMenuEnabled": false, + "firewallPaneMinimized": false, + "importedLists": [], + "popupPanelSections": 15, + "showIconBadge": false }, "selectedFilterLists": [ "user-filters", @@ -29,29 +25,26 @@ "urlhaus-1", "fanboy-thirdparty_social", "fanboy-social", + "curben-phishing", + "adguard-annoyance", + "adguard-social", "ublock-annoyances", "DEU-0", "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt" ], - "hiddenSettings": { - "autoUpdatePeriod": 7, - "manualUpdateAssetFetchPeriod": 2000 - }, + "hiddenSettings": {}, "whitelist": [ "about-scheme", "chrome-extension-scheme", "chrome-scheme", - "fritz.box", - "mail.protonmail.com", + "edge-scheme", "moz-extension-scheme", - "office.mailbox.org", "opera-scheme", - "posteo.de", - "speedport.ip", - "vivaldi-scheme" + "vivaldi-scheme", + "wyciwyg-scheme" ], - "dynamicFilteringString": "behind-the-scene * * noop\nbehind-the-scene * inline-script noop\nbehind-the-scene * 1p-script noop\nbehind-the-scene * 3p-script noop\nbehind-the-scene * 3p-frame noop\nbehind-the-scene * image noop\nbehind-the-scene * 3p noop", + "dynamicFilteringString": "behind-the-scene * * noop\nbehind-the-scene * inline-script noop\nbehind-the-scene * 1p-script noop\nbehind-the-scene * 3p-script noop\nbehind-the-scene * 3p-frame noop\nbehind-the-scene * image noop\nbehind-the-scene * 3p noop\n* facebook.net * block\n* facebook.com * block\n* fbcdn.net * block\nfacebook.com facebook.com * noop\nfacebook.com facebook.net * noop\nfacebook.com fbcdn.net * noop", "urlFilteringString": "", - "hostnameSwitchesString": "no-csp-reports: * true\nno-large-media: behind-the-scene false\nno-csp-reports: noscript-csp.invalid false", - "userFilters": "||127.*^$important,third-party\n||10.*^$important,third-party\n||192.168.*^$important,third-party\n||172.16.*^$important,third-party\n||172.17.*^$important,third-party\n||172.18.*^$important,third-party\n||172.19.*^$important,third-party\n||172.20.*^$important,third-party\n||172.21.*^$important,third-party\n||172.22.*^$important,third-party\n||172.23.*^$important,third-party\n||172.24.*^$important,third-party\n||172.25.*^$important,third-party\n||172.26.*^$important,third-party\n||172.27.*^$important,third-party\n||172.28.*^$important,third-party\n||172.29.*^$important,third-party\n||172.30.*^$important,third-party\n||172.31.*^$important,third-party\n||localhost^$important,third-party\n||speedport.ip^$important,third-party\n||fritz.box^$important,third-party\n||fritz.nas^$important,third-party\n||*.fritz.box^$important,third-party\n||giga.cube^$important,third-party\n||easy.box^$important,third-party\n||connect.box^$important,third-party\n||*.local/^$important,third-party\n||fonts.googleapis.com$important,third-party\n" + "hostnameSwitchesString": "no-large-media: behind-the-scene false\nno-csp-reports: * true\nno-csp-reports: noscript-csp.invalid false", + "userFilters": "||facebook.com/plugins/$3p,frame,redirect=click2load.html\n||fonts.googleapis.com\n" } \ No newline at end of file diff --git a/firefox/user-overrides.js b/firefox/user-overrides.js index 1d3a7f3..c642ace 100755 --- a/firefox/user-overrides.js +++ b/firefox/user-overrides.js @@ -37,16 +37,20 @@ user_pref("general.warnOnAboutConfig", false); /* DNS over HTTPS adjust the following to your liking - 0 = use system DNS, 2 = use DNS-over-HTTPS resolver, select one in UI under network, otherwise you might end up with cloudflare + 0 = automatically decide, 1 = use system DNS, 2 = use DNS-over-HTTPS resolver, select one in UI under network, otherwise you might end up with cloudflare */ user_pref("network.trr.mode", 0); user_pref("network.trr.uri", "https://dns.myservermanager.com/dns-query"); -user_pref("network.trr.resolvers", '[{ "name": "Cloudflare", "url": "https://mozilla.cloudflare-dns.com/dns-query" },{ "name": "NextDNS", "url": "https://trr.dns.nextdns.io/" },{ "name": "dnsforge.de", "url": "https://dnsforge.de/dns-query" },{ "name": "Digitale Gesellschaft (CH)", "url": "https://dns.digitale-gesellschaft.ch/dns-query" }, { "name": "Freifunk Muenchen", "url": "https://doh.ffmuc.net" }, { "name": "BlahDNS (DE)", "url": "https://doh-de.blahdns.com/dns-query" }, { "name": "BlahDNS (FI)", "url": "https://doh-fi.blahdns.com/dns-query" }, { "name": "Quad9", "url": "https://dns.quad9.net/dns-query" }, { "name": "dns.myservermanager.com", "url": "https://dns.myservermanager.com/dns-query" }]'); +user_pref("network.trr.resolvers", '[{ "name": "dns.myservermanager.com", "url": "https://dns.myservermanager.com/dns-query" }]'); +user_pref("network.trr.excluded-domains", "fritz.box,fritz.nas"); +//user_pref("security.OCSP.enabled", 0); +//user_pref("security.OCSP.require", false); /* Disable some default extensions */ user_pref("extensions.pocket.enabled", false); user_pref("extensions.screenshots.disabled", true); user_pref("extensions.systemAddon.update.enabled", false); +user_pref("extensions.quarantinedDomains.enabled", false); /* Enable keyword search */ user_pref("keyword.enabled", true);