From 6caca3e2f62ea70e4acd18f4d31dc3220587cb92 Mon Sep 17 00:00:00 2001 From: fxbrit Date: Mon, 3 May 2021 12:48:32 +0200 Subject: [PATCH] removed redundant stuff --- Changelog.md | 55 ++++++++++++++++++++++++++++++++++ librewolf.cfg | 82 +++++++++++++++++++-------------------------------- 2 files changed, 86 insertions(+), 51 deletions(-) diff --git a/Changelog.md b/Changelog.md index 7089899..6be563b 100755 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ defaultPref("pdfjs.enableScripting", false); lockPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway ======= lockPref("privacy.trackingprotection.testing.report_blocked_node", false); +<<<<<<< HEAD lockPref("browser.contentblocking.report.endpoint_url", ""); lockPref("browser.contentblocking.report.monitor.home_page_url", ""); lockPref("browser.contentblocking.report.monitor.preferences", ""); @@ -18,6 +19,8 @@ lockPref("browser.contentblocking.report.vpn-android.url", ""); lockPref("browser.contentblocking.category", "custom"); >>>>>>> 034d451 (reorganized tracking section + 3rd set of changes) ======= +======= +>>>>>>> 48fecfd (removed redundant stuff) lockPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway >>>>>>> a35eb4b (re-organized and reviewed) lockPref("browser.contentblocking.cfr-milestone.enabled", false); @@ -54,6 +57,7 @@ defaultPref("browser.display.use_system_colors", false); ======= defaultPref("intl.accept_languages", "en-US, en"); lockPref("app.normandy.dev_mode", false); +<<<<<<< HEAD lockPref("services.sync.prefs.sync.browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); lockPref("services.sync.prefs.sync.browser.search.widget.inNavBar", false); //true lockPref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.includeDownloads", false); //true @@ -76,6 +80,8 @@ lockPref("services.sync.prefs.sync.privacy.userContext.newTabContainerOnLeftClic <<<<<<< HEAD >>>>>>> 55c94dc (reorganized, revisited) ======= +======= +>>>>>>> 48fecfd (removed redundant stuff) lockPref("toolkit.telemetry.shutdownPingSender.enabledFirstSession", false); <<<<<<< HEAD >>>>>>> 653a6ed (knocked out some more prefs) @@ -258,6 +264,8 @@ Lines that were commented and are now removed //lockPref("devtools.telemetry.tools.opened.version", ""); // Default {"DEVTOOLS_SCREEN_RESOLUTION_ENUMERATED_PER_USER":"60.4.0"} +// defaultPref("network.http.sendRefererHeader", 1); default is better + ALL OF Disabled - Deprecated Inactive ALL OF Disabled - Section OFF ``` @@ -555,7 +563,11 @@ defaultPref("webgl.force-enabled", true); // out of scope, not worth defaultPref("layers.acceleration.force-enabled", true); // out of scope, not worth lockPref("privacy.trackingprotection.testing.report_blocked_node", false); // default false and we have tracking protection disabled lockPref("privacy.trackingprotection.origin_telemetry.enabled", false); // default false and we have tracking protection disabled +<<<<<<< HEAD lockPref("privacy.trackingprotection.lower_network_priority", false); // default +======= +lockPref("privacy.trackingprotection.lower_network_priority", false); // default false and we have tracking protection disabled +>>>>>>> 48fecfd (removed redundant stuff) lockPref("telemetry.origin_telemetry_test_mode.enabled", false); // default false and we have tracking protection disabled lockPref("signon.storeSignons", false); // Deprecated lockPref("browser.urlbar.filter.javascript", true); // default @@ -581,6 +593,7 @@ lockPref("dom.imagecapture.enabled", false); // default lockPref("dom.reporting.crash.enabled", false); // default defaultPref("network.proxy.autoconfig_url.include_path", false); // default lockPref("security.tls.version.min", 3); // default +<<<<<<< HEAD defaultPref("extensions.webextensions.background-delayed-startup", true); //default defaultPref("xpinstall.signatures.required", true); // default lockPref("app.normandy.dev_mode", false); // default @@ -995,6 +1008,16 @@ lockPref("browser.taskbar.lists.tasks.enabled", false); // personal pref defaultPref("webgl.force-enabled", true); // out of scope, not worth defaultPref("layers.acceleration.force-enabled", true); // out of scope, not worth >>>>>>> 5b1fc33 (removed some more) +======= +defaultPref("privacy.spoof_english", 2); // redudant with RFP and javascript.use_us_english_locale +defaultPref("extensions.webextensions.background-delayed-startup", true); //default +lockPref("xpinstall.whitelist.required", true); // default +defaultPref("xpinstall.signatures.required", true); // default +lockPref("app.normandy.dev_mode", false); // default +defaultPref("pdfjs.enableWebGL", false); // default +// lockPref("browser.cache.offline.enable", false); // apparently increases fingerprinting and redundant with browser.cache.offline.storage.enable +lockPref("network.predictor.enable-prefetch", false); // default +>>>>>>> 48fecfd (removed redundant stuff) ``` #### Unlocked @@ -1138,6 +1161,7 @@ lockPref("general.buildID.override", "20100101"); lockPref("browser.startup.homepage_override.buildID", "20100101"); >>>>>>> 653a6ed (knocked out some more prefs) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #### Hardened setup @@ -1159,6 +1183,8 @@ defaultPref("network.cookie.cookieBehavior", 1); >>>>>>> a35eb4b (re-organized and reviewed) ======= +======= +>>>>>>> 48fecfd (removed redundant stuff) // should we consider disabling WebAssembly ? //lockPref("javascript.options.wasm", false); @@ -1187,6 +1213,7 @@ security.remote_settings.crlite_filters.enabled -> DISCUSS #### Commented Prefs that need to be addressed and that were disabled for now ``` +<<<<<<< HEAD // redudant with RFP and javascript.use_us_english_locale // defaultPref("privacy.spoof_english", 2); @@ -1216,6 +1243,8 @@ Prefs that need to be addressed and that were disabled for now // lockPref("dom.enable_performance_navigation_timing", false); >>>>>>> 653a6ed (knocked out some more prefs) ======= +======= +>>>>>>> 48fecfd (removed redundant stuff) // all covered by previous prefs // defaultPref("media.navigator.video.enabled", false); // defaultPref("media.peerconnection.use_document_iceservers", false); @@ -1445,5 +1474,31 @@ lockPref("services.sync.prefs.sync.browser.safebrowsing.downloads.remote.block_p lockPref("services.sync.prefs.sync.browser.safebrowsing.phishing.enabled", false); lockPref("services.sync.tabs.lastSync", "0"); */ +<<<<<<< HEAD ``` >>>>>>> 814a479 (reviewed DRM, removed ircs hand, moved exp prefs) +======= + +/* +lockPref("browser.contentblocking.report.cookie.url", ""); +lockPref("browser.contentblocking.report.cryptominer.url", ""); +lockPref("browser.contentblocking.report.endpoint_url", ""); +lockPref("browser.contentblocking.report.fingerprinter.url", ""); +lockPref("browser.contentblocking.report.lockwise.how_it_works.url", ""); +lockPref("browser.contentblocking.report.manage_devices.url", ""); +lockPref("browser.contentblocking.report.monitor.how_it_works.url", ""); +lockPref("browser.contentblocking.report.monitor.sign_in_url", ""); +lockPref("browser.contentblocking.report.monitor.home_page_url", ""); +lockPref("browser.contentblocking.report.monitor.preferences", ""); +lockPref("browser.contentblocking.report.monitor.url", ""); +lockPref("browser.contentblocking.report.proxy.enabled", false); +lockPref("browser.contentblocking.report.proxy_extension.url", ""); +lockPref("browser.contentblocking.report.social.url", ""); +lockPref("browser.contentblocking.report.tracker.url", ""); +lockPref("browser.contentblocking.report.vpn.url", ""); +lockPref("browser.contentblocking.report.vpn-promo.url", ""); +lockPref("browser.contentblocking.report.vpn-ios.url", ""); +lockPref("browser.contentblocking.report.vpn-android.url", ""); +*/ +``` +>>>>>>> 48fecfd (removed redundant stuff) diff --git a/librewolf.cfg b/librewolf.cfg index 19f052a..40f42a8 100755 --- a/librewolf.cfg +++ b/librewolf.cfg @@ -136,6 +136,7 @@ defaultPref("network.cookie.thirdparty.sessionOnly", true); lockPref("network.cookie.thirdparty.nonsecureSessionOnly", true); >>>>>>> 034d451 (reorganized tracking section + 3rd set of changes) +<<<<<<< HEAD // ----------------------------------- // # TRACKING PROTECTION ======= @@ -161,6 +162,8 @@ lockPref("browser.contentblocking.category", "custom"); // changing to other opt ======= defaultPref("general.config.filename", "librewolf.cfg"); +======= +>>>>>>> 48fecfd (removed redundant stuff) // ----------------------------------- // OVERRIDES // ----------------------------------- @@ -177,12 +180,16 @@ if (home_directory) { // TRACKING PROTECTION // ----------------------------------- +<<<<<<< HEAD <<<<<<< HEAD lockPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway >>>>>>> 55c94dc (reorganized, revisited) ======= defaultPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway >>>>>>> 7b8bd35 (unlock content block cat as breaks cookie button) +======= +defaultPref("browser.contentblocking.category", "custom"); // do not lock as it breaks UI +>>>>>>> 48fecfd (removed redundant stuff) lockPref("privacy.trackingprotection.enabled", false); lockPref("privacy.trackingprotection.pbmode.enabled", false); lockPref("privacy.trackingprotection.socialtracking.enabled", false); @@ -190,6 +197,7 @@ lockPref("privacy.trackingprotection.cryptomining.enabled", false); lockPref("privacy.trackingprotection.fingerprinting.enabled", false); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD lockPref("privacy.trackingprotection.annotate_channels", false); lockPref("urlclassifier.trackingTable", ""); lockPref("browser.contentblocking.database.enabled", false); @@ -212,35 +220,15 @@ lockPref("browser.contentblocking.report.vpn.enabled", false); ======= >>>>>>> 55c94dc (reorganized, revisited) lockPref("privacy.trackingprotection.origin_telemetry.enabled", false); +======= +>>>>>>> 48fecfd (removed redundant stuff) lockPref("privacy.trackingprotection.annotate_channels", false); -lockPref("privacy.trackingprotection.lower_network_priority", false); -lockPref("privacy.trackingprotection.testing.report_blocked_node", false); -lockPref("telemetry.origin_telemetry_test_mode.enabled", false); lockPref("urlclassifier.trackingTable", ""); lockPref("browser.contentblocking.database.enabled", false); // remove urls lockPref("browser.contentblocking.reportBreakage.url", ""); lockPref("privacy.trackingprotection.introURL", ""); -lockPref("browser.contentblocking.report.cookie.url", ""); -lockPref("browser.contentblocking.report.cryptominer.url", ""); -lockPref("browser.contentblocking.report.endpoint_url", ""); -lockPref("browser.contentblocking.report.fingerprinter.url", ""); -lockPref("browser.contentblocking.report.lockwise.how_it_works.url", ""); -lockPref("browser.contentblocking.report.manage_devices.url", ""); -lockPref("browser.contentblocking.report.monitor.how_it_works.url", ""); -lockPref("browser.contentblocking.report.monitor.sign_in_url", ""); -lockPref("browser.contentblocking.report.monitor.home_page_url", ""); -lockPref("browser.contentblocking.report.monitor.preferences", ""); -lockPref("browser.contentblocking.report.monitor.url", ""); -lockPref("browser.contentblocking.report.proxy.enabled", false); -lockPref("browser.contentblocking.report.proxy_extension.url", ""); -lockPref("browser.contentblocking.report.social.url", ""); -lockPref("browser.contentblocking.report.tracker.url", ""); -lockPref("browser.contentblocking.report.vpn.url", ""); -lockPref("browser.contentblocking.report.vpn-promo.url", ""); -lockPref("browser.contentblocking.report.vpn-ios.url", ""); -lockPref("browser.contentblocking.report.vpn-android.url", ""); // hide ui elements lockPref("browser.contentblocking.cfr-milestone.enabled", false); @@ -300,9 +288,6 @@ lockPref("browser.search.update", false); ======= >>>>>>> 45bf63e (processed everything up to EOF) -// to check, probably useless -lockPref("signon.storeSignons", false); - // -------------------------------- // # SANITIZING, COOKIES AND HISTORY // -------------------------------- @@ -325,12 +310,10 @@ defaultPref("privacy.cpd.offlineApps", false); // just for consistency to avoid // -------------------------------- defaultPref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0); -lockPref("browser.urlbar.filter.javascript", true); lockPref("browser.urlbar.speculativeConnect.enabled", false); lockPref("browser.urlbar.trimURLs", false); lockPref("browser.search.suggest.enabled", false); lockPref("browser.search.region", "US"); -lockPref("browser.search.geoip.url", ""); lockPref("browser.fixup.alternate.enabled", false); lockPref("browser.urlbar.suggest.searches", false); lockPref("browser.search.update", false); @@ -345,24 +328,16 @@ defaultPref("network.cookie.thirdparty.sessionOnly", true); lockPref("network.cookie.thirdparty.nonsecureSessionOnly", true); // includes new cookie behavior that allows to stay logged with exceptions -defaultPref("privacy.clearOnShutdown.siteSettings", false); -defaultPref("privacy.clearOnShutdown.cache", true); defaultPref("privacy.clearOnShutdown.cookies", false); -defaultPref("privacy.clearOnShutdown.downloads", true); -defaultPref("privacy.clearOnShutdown.formdata", true); -defaultPref("privacy.clearOnShutdown.history", true); defaultPref("privacy.clearOnShutdown.offlineApps", false); -defaultPref("privacy.clearOnShutdown.sessions", true); -defaultPref("privacy.cpd.siteSettings", false); -defaultPref("privacy.cpd.downloads", true); -defaultPref("privacy.cpd.cache", true); defaultPref("privacy.cpd.cookies", false); // just for consistency to avoid accidental logout -defaultPref("privacy.cpd.formdata", true); -defaultPref("privacy.cpd.history", true); defaultPref("privacy.cpd.offlineApps", false); // just for consistency to avoid accidental logout +<<<<<<< HEAD defaultPref("privacy.cpd.passwords", false); defaultPref("privacy.cpd.sessions", true); >>>>>>> a35eb4b (re-organized and reviewed) +======= +>>>>>>> 48fecfd (removed redundant stuff) defaultPref("privacy.sanitize.timeSpan", 0); defaultPref("browser.formfill.enable", false); @@ -409,19 +384,25 @@ defaultPref("extensions.formautofill.section.enabled", false); defaultPref("extensions.formautofill.available", "off"); defaultPref("extensions.formautofill.addresses.enabled", false); <<<<<<< HEAD +<<<<<<< HEAD ======= defaultPref("extensions.formautofill.addresses.capture.enabled", false); >>>>>>> a35eb4b (re-organized and reviewed) +======= +>>>>>>> 48fecfd (removed redundant stuff) defaultPref("extensions.formautofill.creditCards.enabled", false); defaultPref("extensions.formautofill.creditCards.available", false); defaultPref("extensions.formautofill.heuristics.enabled", false); lockPref("signon.autofillForms", false); <<<<<<< HEAD +<<<<<<< HEAD // ----------------------- // # DRM ======= lockPref("signon.autofillForms.http", false); +======= +>>>>>>> 48fecfd (removed redundant stuff) // ----------------------- // DRM @@ -634,8 +615,6 @@ lockPref("dom.push.connection.enabled", false); lockPref("dom.push.serverURL", ""); //default "wss://push.services.mozilla.com/" lockPref("dom.push.userAgentID", ""); lockPref("dom.targetBlankNoOpener.enabled", true); -lockPref("dom.reporting.crash.enabled", false); -lockPref("dom.imagecapture.enabled", false); lockPref("dom.disable_window_move_resize", true); defaultPref("dom.serviceWorkers.enabled", false); defaultPref("dom.battery.enabled", false); @@ -670,14 +649,12 @@ lockPref("network.http.referer.XOriginTrimmingPolicy", 2); lockPref("network.http.referer.XOriginPolicy", 2); lockPref("network.http.referer.spoofSource", false); lockPref("network.http.referer.trimmingPolicy", 0); -// defaultPref("network.http.sendRefererHeader", 1); // -------------------------------- // PROXY // -------------------------------- defaultPref("network.proxy.autoconfig_url", ""); -defaultPref("network.proxy.autoconfig_url.include_path", false); defaultPref("network.proxy.socks_remote_dns", true); defaultPref("network.proxy.socks_version", 5); @@ -703,7 +680,6 @@ lockPref("browser.ssl_override_behavior", 1); lockPref("security.tls.enable_0rtt_data", false); lockPref("security.tls.version.enable-deprecated", false); lockPref("security.tls.version.fallback-limit", 3); -lockPref("security.tls.version.min", 3); lockPref("browser.xul.error_pages.expert_bad_cert", true); // advanced ui infos lockPref("security.insecure_field_warning.contextual.enabled", true); @@ -722,7 +698,6 @@ lockPref("browser.startup.blankWindow", false); // breaks RFP windows resizing // LANGUAGE AND REGION // -------------------------------------- -// defaultPref("privacy.spoof_english", 2); // redudant with RFP and javascript.use_us_english_locale lockPref("javascript.use_us_english_locale", true); lockPref("intl.regional_prefs.use_os_locales", false); defaultPref("intl.locale.requested", "en-US"); @@ -915,6 +890,10 @@ lockPref("extensions.systemAddon.update.url", ""); lockPref("extensions.systemAddon.update.enabled", false); lockPref("xpinstall.signatures.devInfoURL", ""); +<<<<<<< HEAD +======= +lockPref("extensions.webapi.testing", false); // hidden prefs // default false +>>>>>>> 48fecfd (removed redundant stuff) lockPref("extensions.webservice.discoverURL", ""); lockPref("webextensions.storage.sync.serverURL", ""); lockPref("extensions.screenshots.upload-disabled", true); @@ -923,10 +902,13 @@ defaultPref("extensions.postDownloadThirdPartyPrompt", false); <<<<<<< HEAD ======= +<<<<<<< HEAD // to check defaultPref("xpinstall.signatures.required", true); >>>>>>> 0267245 (added some new prefs from arkenfox) +======= +>>>>>>> 48fecfd (removed redundant stuff) // ------------------------------------------------------- // # NORMANDY // ------------------------------------------------------- @@ -1364,7 +1346,7 @@ lockPref("canvas.capturestream.enabled", false); lockPref("network.IDN_show_punycode", true); lockPref("security.fileuri.strict_origin_policy", true); -// pocket +// pocket, to check if we can remove lockPref("extensions.pocket.enabled", false); lockPref("extensions.pocket.site", ""); lockPref("extensions.pocket.oAuthConsumerKey", ""); @@ -1373,7 +1355,6 @@ lockPref("extensions.pocket.api", ""); // pdf reader defaultPref("pdfjs.disabled", false); defaultPref("pdfjs.enableScripting", false); -defaultPref("pdfjs.enableWebGL", false); defaultPref("pdfjs.previousHandler.alwaysAskBeforeHandling", true); defaultPref("pdfjs.enabledCache.state", false); @@ -1468,10 +1449,6 @@ lockPref("browser.cache.offline.storage.enable", false); lockPref("browser.privatebrowsing.forceMediaMemoryCache", true); // [FF75+] lockPref("media.memory_cache_max_size", 16384); -// apparently increases fingerprinting and redundant with browser.cache.offline.storage.enable -// should be checked -// lockPref("browser.cache.offline.enable", false); - // -------------------------------- // WEBGL AND PERFORMANCE // -------------------------------- @@ -1539,7 +1516,6 @@ lockPref("app.update.url.manual", "https://gitlab.com/librewolf-community/browse // -------------------------------- lockPref("network.predictor.enabled", false); -lockPref("network.predictor.enable-prefetch", false); lockPref("network.prefetch-next", false); lockPref("network.http.speculative-parallel-limit", 0); @@ -2055,6 +2031,7 @@ lockPref("app.update.service.enabled", false); lockPref("toolkit.winRegisterApplicationRestart", false); // disable Windows 8.1 Family Safety cert [WINDOWS] +<<<<<<< HEAD lockPref("security.family_safety.mode", 0); // -------------------------------- @@ -2212,3 +2189,6 @@ if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) { ======= // 97:E8:BA:9C:F1:2F:B3:DE:53:CC:42:A4:E6:57:7E:D6:4D:F4:93:C2:47:B4:14:FE:A0:36:81:8D:38:23:56:0E >>>>>>> 45bf63e (processed everything up to EOF) +======= +lockPref("security.family_safety.mode", 0); +>>>>>>> 48fecfd (removed redundant stuff)