From c52c4227e1002c96bb64d69ef65e313ff9ad5262 Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 7 Aug 2022 19:35:30 -0400 Subject: [PATCH] It lives --- build.xml | 14 +- scripts/build.number | 4 +- src/build.xml | 2 +- src/i2p.firefox.base.profile/prefs.js | 4 +- src/i2p.firefox.base.profile/user-override.js | 228 ---------- src/i2p.firefox.base.profile/user.js | 420 +++++++++--------- src/java/net/i2p/i2pfirefox/I2PFirefox.java | 1 + .../i2pfirefox/I2PFirefoxProfileBuilder.java | 104 ++--- 8 files changed, 278 insertions(+), 499 deletions(-) delete mode 100644 src/i2p.firefox.base.profile/user-override.js diff --git a/build.xml b/build.xml index 76b3450..b3a2a3c 100644 --- a/build.xml +++ b/build.xml @@ -2,12 +2,24 @@ - + + + + + + + + + + + + + diff --git a/scripts/build.number b/scripts/build.number index 9878209..00b6877 100644 --- a/scripts/build.number +++ b/scripts/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sun Aug 07 16:33:03 EDT 2022 -build.number=43 +#Sun Aug 07 19:34:07 EDT 2022 +build.number=84 diff --git a/src/build.xml b/src/build.xml index b3dafc9..0b9199e 100644 --- a/src/build.xml +++ b/src/build.xml @@ -42,7 +42,7 @@ - + diff --git a/src/i2p.firefox.base.profile/prefs.js b/src/i2p.firefox.base.profile/prefs.js index 39b9826..5df7bdb 100644 --- a/src/i2p.firefox.base.profile/prefs.js +++ b/src/i2p.firefox.base.profile/prefs.js @@ -60,4 +60,6 @@ user_pref("media.navigator.enabled", false); user_pref("dom.w3c_touch_events.enabled", false); user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.display.use_system_colors", false); -user_pref("dom.image-lazy-loading.enabled", false) \ No newline at end of file +user_pref("dom.image-lazy-loading.enabled", false) +user_pref("extensions.autoDisableScopes", 0); +user_pref("extensions.enabledScopes", 1); \ No newline at end of file diff --git a/src/i2p.firefox.base.profile/user-override.js b/src/i2p.firefox.base.profile/user-override.js deleted file mode 100644 index ae1aea8..0000000 --- a/src/i2p.firefox.base.profile/user-override.js +++ /dev/null @@ -1,228 +0,0 @@ -/* -Overrides# -for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor# -for licensing information. - -HTTPS Everywhere Preferences: -*/ -user_pref("extensions.https_everywhere._observatory.popup_shown", true); -user_pref("extensions.https_everywhere.toolbar_hint_shown", true); - -/* -NoScript Preferences: #In order to disable all scripts by -default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");# -and comment out the following line -*/ -user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -user_pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -user_pref("noscript.ABE.enabled", false); -user_pref("noscript.ABE.notify", false); -user_pref("noscript.ABE.wanIpAsLocal", false); -user_pref("noscript.confirmUnblock", false); -user_pref("noscript.contentBlocker", true); -user_pref("noscript.firstRunRedirection", false); -user_pref("noscript.global", true); -user_pref("noscript.gtemp", ""); -user_pref("noscript.opacizeObject", 3); -user_pref("noscript.forbidWebGL", true); -user_pref("noscript.forbidFonts", true); -user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); -user_pref("noscript.policynames", ""); -user_pref("noscript.secureCookies", true); -user_pref("noscript.showAllowPage", false); -user_pref("noscript.showBaseDomain", false); -user_pref("noscript.showDistrust", false); -user_pref("noscript.showRecentlyBlocked", false); -user_pref("noscript.showTemp", false); -user_pref("noscript.showTempToPerm", false); -user_pref("noscript.showUntrusted", false); -user_pref("noscript.STS.enabled", false); -user_pref("noscript.subscription.lastCheck", -142148139); -user_pref("noscript.temp", ""); -user_pref("noscript.untrusted", ""); -user_pref("noscript.forbidMedia", true); -user_pref("noscript.allowWhitelistUpdates", false); -user_pref("noscript.fixLinks", false); -// Now handled by plugins.click_to_play // Not in this one. -user_pref("noscript.forbidFlash", true); -user_pref("noscript.forbidSilverlight", true); -user_pref("noscript.forbidJava", true); -user_pref("noscript.forbidPlugins", true); -// Usability tweaks -user_pref("noscript.showPermanent", false); -user_pref("noscript.showTempAllowPage", true); -user_pref("noscript.showRevokeTemp", true); -user_pref("noscript.notify", false); -user_pref("noscript.autoReload", true); -user_pref("noscript.autoReload.allTabs", false); -user_pref("noscript.cascadePermissions", true); -user_pref("noscript.restrictSubdocScripting", true); -user_pref("noscript.showVolatilePrivatePermissionsToggle", false); -user_pref("noscript.volatilePrivatePermissions", true); -user_pref("noscript.clearClick", 0); - -user_pref("intl.locale.matchOS", false); - -user_pref("extensions.https_everywhere._observatory.enabled", false); -user_pref("extensions.https_everywhere.options.autoUpdateRulesets", false); -user_pref("extensions.https_everywhere.globalEnabled", false); -user_pref("extensions.https_everywhere._observatory.submit_during_tor", false); -user_pref("extensions.https_everywhere._observatory.submit_during_nontor", false); -user_pref("extensions.https_everywhere._observatory.use_custom_proxy", true); -user_pref("extensions.https_everywhere._observatory.proxy_host", "127.0.0.1"); -user_pref("extensions.https_everywhere._observatory.proxy_port", 4444); - -user_pref("extensions.torbutton.use_nontor_proxy", true); - -//For socket conversion: in the future, I'll need to make TBB communicate with -//i2p over a unix socket. Fortunately, this is how you do that. It will be -//configurable in a similar way to the host:port configuration when that happens. -//user_pref("extensions.torlauncher.socks_port_use_ipc", ); -//user_pref("extensions.torlauncher.socks_ipc_path", ""); - -// TODO: this is a Tor Browser specific setting which is ignored on Firefox. If -// I make it true, the SOCKS outproxy will have something to connect to. But I -// need to test more to find out if that's prudent. -user_pref("extensions.torlauncher.start_tor", false); -//user_pref("extensions.torlauncher.default_bridge_type", ""); -user_pref("extensions.torlauncher.prompt_at_startup", false); - -// Resist-fingerprinting and first-party isolation enable - -user_pref("privacy.resistFingerprinting", true); -user_pref("privacy.firstparty.isolate", true); - -// Use i2p http proxy for all connections and set homepage to safe local form. - -// DON'T allow access to the admin panel from the profile we browse i2p with. -user_pref("network.proxy.no_proxies_on", "127.0.0.1:7657,localhost:7657,127.0.0.1:7662,localhost:7662,127.0.0.1:7669,localhost:7669"); -user_pref("network.proxy.type", 1); -user_pref("network.proxy.http", "127.0.0.1"); -user_pref("network.proxy.http_port", 4444); -user_pref("network.proxy.ssl", "127.0.0.1"); -user_pref("network.proxy.ssl_port", 4444); -user_pref("network.proxy.ftp", "127.0.0.1"); -user_pref("network.proxy.ftp_port", 4444); -user_pref("network.proxy.socks", "127.0.0.1"); -user_pref("network.proxy.socks_port", 4444); -user_pref("network.proxy.share_proxy_settings", true); -user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home"); - -// Privacy-harden and disable irrelevant features. -user_pref("app.normandy.api_url", ""); -user_pref("app.normandy.enabled", false); -user_pref("app.update.auto", false); -user_pref("app.update.enabled", false); -user_pref("beacon.enabled", false); -user_pref("browser.aboutHomeSnippets.updateUrl", ""); -user_pref("browser.cache.disk_cache_ssl", false); -user_pref("browser.cache.disk.enable", false); -user_pref("browser.cache.offline.enable", false); -user_pref("browser.disableResetPrompt", true); -user_pref("browser.display.use_document_fonts", 0); -user_pref("browser.fixup.alternate.enabled", false); -user_pref("browser.formfill.enable", false); -user_pref("browser.library.activity-stream.enabled", false); -user_pref("browser.newtabpage.activity-stream.disableSnippets", true); -user_pref("browser.newtabpage.activity-stream.enabled", false); -user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false); -user_pref("browser.newtabpage.activity-stream.feeds.snippets", false); -user_pref("browser.newtabpage.activity-stream.feeds.telemetry", false); -user_pref("browser.newtabpage.activity-stream.feeds.topsites", false); -user_pref("browser.newtabpage.activity-stream.prerender", false); -user_pref("browser.newtabpage.activity-stream.showSearch", false); -user_pref("browser.newtabpage.enhanced", false); -user_pref("browser.newtabpage.introShown", true); -user_pref("browser.newtab.preload", false); -user_pref("browser.onboarding.enabled", false); -user_pref("browser.pagethumbnails.capturing_disabled", true); -user_pref("browser.safebrowsing.appRepURL", ""); -user_pref("browser.safebrowsing.blockedURIs.enabled", false); -user_pref("browser.safebrowsing.downloads.enabled", false); -user_pref("browser.safebrowsing.downloads.remote.enabled", false); -user_pref("browser.safebrowsing.downloads.remote.url", ""); -user_pref("browser.safebrowsing.enabled", false); -user_pref("browser.safebrowsing.malware.enabled", false); -user_pref("browser.safebrowsing.phishing.enabled", false); -user_pref("browser.search.geoip.timeout", 1); -user_pref("browser.search.suggest.enabled", false); -user_pref("browser.selfsupport.url", ""); -user_pref("browser.send_pings", false); -user_pref("browser.shell.checkDefaultBrowser", false); -user_pref("browser.startup.homepage_override.mstone", "ignore"); -user_pref("browser.startup.page", 0); -user_pref("browser.toolbarbuttons.introduced.pocket-button", true); -user_pref("browser.urlbar.speculativeConnect.enabled", false); -user_pref("browser.urlbar.trimURLs", false); -user_pref("datareporting.healthreport.uploadEnabled", false); -user_pref("datareporting.policy.dataSubmissionEnabled", false); -user_pref("dom.battery.enabled", false); -user_pref("dom.enable_performance", false); -user_pref("dom.enable_performance_navigation_timing", false); -user_pref("dom.enable_resource_timing", false); -user_pref("dom.event.clipboardevents.enabled", false); -user_pref("dom.gamepad.enabled", false); -user_pref("dom.indexedDB.enabled", false); -user_pref("dom.min_timeout_value", 400); -user_pref("dom.push.connection.enabled", false); -user_pref("dom.push.enabled", false); -user_pref("dom.serviceWorkers.enabled", false); -user_pref("dom.serviceWorkers.interception.enabled", false); -user_pref("dom.storage.enabled", false); -user_pref("dom.webaudio.enabled", false); -user_pref("extensions.autoDisableScopes", 0); -user_pref("extensions.getAddons.cache.enabled", false); -user_pref("extensions.getAddons.showPane", false); -user_pref("extensions.pocket.enabled", false); -user_pref("extensions.screenshots.disabled", true); -user_pref("extensions.webservice.discoverURL", ""); -user_pref("geo.enabled", false); -user_pref("geo.wifi.uri", ""); -user_pref("gfx.downloadable_fonts.disable_cache", true); -user_pref("javascript.options.shared_memory", false); -user_pref("layout.css.visited_links_enabled", false); -user_pref("media.autoplay.enabled", false); -user_pref("media.cache_size", 0); -user_pref("media.navigator.enabled", false); -user_pref("media.peerconnection.ice.no_host", true); -user_pref("media.video_stats.enabled", false); -user_pref("captivedetect.canonicalURL", ""); -user_pref("network.captive-portal-service.enabled", false); -user_pref("network.cookie.cookieBehavior", 1); -user_pref("network.cookie.lifetimePolicy", 2); -user_pref("network.dns.disablePrefetch", true); -user_pref("network.http.referer.spoofSource", true); -user_pref("network.http.referer.trimmingPolicy", 2); -user_pref("network.http.referer.XOriginPolicy", 2); -user_pref("network.prefetch-next", false); -user_pref("privacy.donottrackheader.enabled", true); -user_pref("privacy.donottrackheader.value", 1); -user_pref("toolkit.telemetry.archive.enabled", false); -user_pref("toolkit.telemetry.coverage.opt-out", true); -user_pref("toolkit.telemetry.enabled", false); -user_pref("toolkit.telemetry.server", ""); -user_pref("toolkit.telemetry.unified", false); -user_pref("webgl.disabled", true); -user_pref("browser.chrome.errorReporter.infoURL", ""); -user_pref("breakpad.reportURL", ""); -//user_pref("browser.newtabpage.activity-stream.default.sites", ""); -user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false); -user_pref("browser.newtabpage.activity-stream.showSponsored", false); -user_pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored", false); -user_pref("browser.newtabpage.enabled", true); -user_pref("browser.newtabpage.activity-stream.default.sites", "http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/"); -user_pref("dom.security.https_only_mode", false); -user_pref("keyword.enabled", false); -user_pref("extensions.allowPrivateBrowsingByDefault", true); -user_pref("extensions.PrivateBrowsing.notification", false); -user_pref("browser.newtabpage.activity-stream.feeds.topsites", true); -user_pref("ui.use_standins_for_native_colors", true); -user_pref("webgl.disable-extensions", true); -user_pref("webgl.min_capability_mode", true); -user_pref("webgl.disable-fail-if-major-performance-caveat", true); -user_pref("webgl.enable-webgl2", false); -user_pref("dom.w3c_touch_events.enabled", false); -user_pref("browser.privatebrowsing.autostart", false); -user_pref("browser.display.use_system_colors", false); \ No newline at end of file diff --git a/src/i2p.firefox.base.profile/user.js b/src/i2p.firefox.base.profile/user.js index 43a44f5..404882d 100644 --- a/src/i2p.firefox.base.profile/user.js +++ b/src/i2p.firefox.base.profile/user.js @@ -114,7 +114,7 @@ user_pref("_user.js.parrot", "0200 syntax error: the parrot's definitely decease /* 0201: use Mozilla geolocation service instead of Google if permission is granted [FF74+] * Optionally enable logging to the console (defaults to false) ***/ user_pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); - // user_pref("geo.provider.network.logging.enabled", true); // [HIDDEN PREF] +// user_pref("geo.provider.network.logging.enabled", true); // [HIDDEN PREF] /* 0202: disable using the OS's geolocation service ***/ user_pref("geo.provider.ms-windows-location", false); // [WINDOWS] user_pref("geo.provider.use_corelocation", false); // [MAC] @@ -125,7 +125,7 @@ user_pref("browser.region.network.url", ""); // [FF78+] user_pref("browser.region.update.enabled", false); // [FF79+] /* 0204: set search region * [NOTE] May not be hidden if Firefox has changed your settings due to your region (0203) ***/ - // user_pref("browser.search.region", "US"); // [HIDDEN PREF] +// user_pref("browser.search.region", "US"); // [HIDDEN PREF] /* 0210: set preferred language for displaying pages * [SETTING] General>Language and Appearance>Language>Choose your preferred language... * [TEST] https://addons.mozilla.org/about ***/ @@ -196,7 +196,7 @@ user_pref("app.normandy.api_url", ""); /* 0350: disable Crash Reports ***/ user_pref("breakpad.reportURL", ""); user_pref("browser.tabs.crashReporting.sendReport", false); // [FF44+] - // user_pref("browser.crashReports.unsubmittedCheck.enabled", false); // [FF51+] [DEFAULT: false] +// user_pref("browser.crashReports.unsubmittedCheck.enabled", false); // [FF51+] [DEFAULT: false] /* 0351: enforce no submission of backlogged Crash Reports [FF58+] * [SETTING] Privacy & Security>Firefox Data Collection & Use>Allow Firefox to send backlogged crash reports ***/ user_pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false); // [DEFAULT: false] @@ -224,28 +224,28 @@ user_pref("_user.js.parrot", "0400 syntax error: the parrot's passed on!"); /* 0401: disable SB (Safe Browsing) * [WARNING] Do this at your own risk! These are the master switches * [SETTING] Privacy & Security>Security>... Block dangerous and deceptive content ***/ - // user_pref("browser.safebrowsing.malware.enabled", false); - // user_pref("browser.safebrowsing.phishing.enabled", false); +// user_pref("browser.safebrowsing.malware.enabled", false); +// user_pref("browser.safebrowsing.phishing.enabled", false); /* 0402: disable SB checks for downloads (both local lookups + remote) * This is the master switch for the safebrowsing.downloads* prefs (0403, 0404) * [SETTING] Privacy & Security>Security>... "Block dangerous downloads" ***/ - // user_pref("browser.safebrowsing.downloads.enabled", false); +// user_pref("browser.safebrowsing.downloads.enabled", false); /* 0403: disable SB checks for downloads (remote) * To verify the safety of certain executable files, Firefox may submit some information about the * file, including the name, origin, size and a cryptographic hash of the contents, to the Google * Safe Browsing service which helps Firefox determine whether or not the file should be blocked * [SETUP-SECURITY] If you do not understand this, or you want this protection, then override this ***/ user_pref("browser.safebrowsing.downloads.remote.enabled", false); - // user_pref("browser.safebrowsing.downloads.remote.url", ""); // Defense-in-depth +// user_pref("browser.safebrowsing.downloads.remote.url", ""); // Defense-in-depth /* 0404: disable SB checks for unwanted software * [SETTING] Privacy & Security>Security>... "Warn you about unwanted and uncommon software" ***/ - // user_pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); - // user_pref("browser.safebrowsing.downloads.remote.block_uncommon", false); +// user_pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); +// user_pref("browser.safebrowsing.downloads.remote.block_uncommon", false); /* 0405: disable "ignore this warning" on SB warnings [FF45+] * If clicked, it bypasses the block for that session. This is a means for admins to enforce SB * [TEST] see https://github.com/arkenfox/user.js/wiki/Appendix-A-Test-Sites#-mozilla * [1] https://bugzilla.mozilla.org/1226490 ***/ - // user_pref("browser.safebrowsing.allowOverride", false); +// user_pref("browser.safebrowsing.allowOverride", false); /*** [SECTION 0600]: BLOCK IMPLICIT OUTBOUND [not explicitly asked for - e.g. clicked on] ***/ user_pref("_user.js.parrot", "0600 syntax error: the parrot's no more!"); @@ -255,7 +255,7 @@ user_pref("network.prefetch-next", false); /* 0602: disable DNS prefetching * [1] https://developer.mozilla.org/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control ***/ user_pref("network.dns.disablePrefetch", true); - // user_pref("network.dns.disablePrefetchFromHTTPS", true); // [DEFAULT: true] +// user_pref("network.dns.disablePrefetchFromHTTPS", true); // [DEFAULT: true] /* 0603: disable predictor / prefetching ***/ user_pref("network.predictor.enabled", false); user_pref("network.predictor.enable-prefetch", false); // [FF48+] [DEFAULT: false] @@ -266,7 +266,7 @@ user_pref("network.http.speculative-parallel-limit", 0); user_pref("browser.places.speculativeConnect.enabled", false); /* 0610: enforce no "Hyperlink Auditing" (click tracking) * [1] https://www.bleepingcomputer.com/news/software/major-browsers-to-prevent-disabling-of-click-tracking-privacy-risk/ ***/ - // user_pref("browser.send_pings", false); // [DEFAULT: false] +// user_pref("browser.send_pings", false); // [DEFAULT: false] /*** [SECTION 0700]: DNS / DoH / PROXY / SOCKS / IPv6 ***/ user_pref("_user.js.parrot", "0700 syntax error: the parrot's given up the ghost!"); @@ -301,13 +301,13 @@ user_pref("network.gio.supported-protocols", ""); // [HIDDEN PREF] * [WARNING] Default true is a security feature against malicious extensions [1] * [SETUP-CHROME] If you use a proxy and you trust your extensions * [1] https://blog.mozilla.org/security/2021/10/25/securing-the-proxy-api-for-firefox-add-ons/ ***/ - // user_pref("network.proxy.failover_direct", false); +// user_pref("network.proxy.failover_direct", false); /* 0706: disable proxy bypass for system request failures [FF95+] * RemoteSettings, UpdateService, Telemetry [1] * [WARNING] If false, this will break the fallback for some security features * [SETUP-CHROME] If you use a proxy and you understand the security impact * [1] https://bugzilla.mozilla.org/buglist.cgi?bug_id=1732792,1733994,1733481 ***/ - // user_pref("network.proxy.allow_bypass", false); // [HIDDEN PREF FF95-96] +// user_pref("network.proxy.allow_bypass", false); // [HIDDEN PREF FF95-96] /* 0710: disable DNS-over-HTTPS (DoH) rollout [FF60+] * 0=off by default, 2=TRR (Trusted Recursive Resolver) first, 3=TRR only, 5=explicitly off * see "doh-rollout.home-region": USA 2019, Canada 2021, Russia/Ukraine 2022 [3] @@ -315,7 +315,7 @@ user_pref("network.gio.supported-protocols", ""); // [HIDDEN PREF] * [2] https://wiki.mozilla.org/Security/DOH-resolver-policy * [3] https://support.mozilla.org/en-US/kb/firefox-dns-over-https * [4] https://www.eff.org/deeplinks/2020/12/dns-doh-and-odoh-oh-my-year-review-2020 ***/ - // user_pref("network.trr.mode", 5); +// user_pref("network.trr.mode", 5); /*** [SECTION 0800]: LOCATION BAR / SEARCH BAR / SUGGESTIONS / HISTORY / FORMS ***/ user_pref("_user.js.parrot", "0800 syntax error: the parrot's ceased to be!"); @@ -355,7 +355,7 @@ user_pref("browser.urlbar.suggest.quicksuggest.sponsored", false); /* 0808: disable tab-to-search [FF85+] * Alternatively, you can exclude on a per-engine basis by unchecking them in Options>Search * [SETTING] Privacy & Security>Address Bar>When using the address bar, suggest>Search engines ***/ - // user_pref("browser.urlbar.suggest.engines", false); +// user_pref("browser.urlbar.suggest.engines", false); /* 0810: disable search and form history * [SETUP-WEB] Be aware that autocomplete form data can be read by third parties [1][2] * [NOTE] We also clear formdata on exit (2811) @@ -383,7 +383,7 @@ user_pref("extensions.formautofill.heuristics.enabled", false); // [FF55+] * [3] https://bugzilla.mozilla.org/1632765 * [4] https://earthlng.github.io/testpages/visited_links.html (see github wiki APPENDIX A on how to use) * [5] https://lcamtuf.blogspot.com/2016/08/css-mix-blend-mode-is-bad-for-keeping.html ***/ - // user_pref("layout.css.visited_links_enabled", false); +// user_pref("layout.css.visited_links_enabled", false); /*** [SECTION 0900]: PASSWORDS [1] https://support.mozilla.org/kb/use-primary-password-protect-stored-logins-and-pas @@ -518,9 +518,9 @@ user_pref("security.mixed_content.block_display_content", true); * [TEST] http://example.com [upgrade] * [TEST] http://httpforever.com/ [no upgrade] ***/ user_pref("dom.security.https_only_mode", true); // [FF76+] - // user_pref("dom.security.https_only_mode_pbm", true); // [FF80+] +// user_pref("dom.security.https_only_mode_pbm", true); // [FF80+] /* 1245: enable HTTPS-Only mode for local resources [FF77+] ***/ - // user_pref("dom.security.https_only_mode.upgrade_local", true); +// user_pref("dom.security.https_only_mode.upgrade_local", true); /* 1246: disable HTTP background requests [FF82+] * When attempting to upgrade, if the server doesn't respond within 3 seconds, Firefox sends * a top-level HTTP request without path in order to check if the server supports HTTPS or not @@ -554,9 +554,9 @@ user_pref("gfx.font_rendering.opentype_svg.enabled", false); * In Private Browsing windows: uses the most restrictive between normal and private * 1=only base system fonts, 2=also fonts from optional language packs, 3=also user-installed fonts * [1] https://searchfox.org/mozilla-central/search?path=StandardFonts*.inc ***/ - // user_pref("layout.css.font-visibility.private", 1); - // user_pref("layout.css.font-visibility.standard", 1); - // user_pref("layout.css.font-visibility.trackingprotection", 1); +// user_pref("layout.css.font-visibility.private", 1); +// user_pref("layout.css.font-visibility.standard", 1); +// user_pref("layout.css.font-visibility.trackingprotection", 1); /*** [SECTION 1600]: HEADERS / REFERERS full URI: https://example.com:8888/foo/bar.html?id=1234 @@ -584,7 +584,7 @@ user_pref("privacy.userContext.ui.enabled", true); /* 1702: set behavior on "+ Tab" button to display container menu on left click [FF74+] * [NOTE] The menu is always shown on long press and right click * [SETTING] General>Tabs>Enable Container Tabs>Settings>Select a container for each new tab ***/ - // user_pref("privacy.userContext.newTabContainerOnLeftClick.enabled", true); +// user_pref("privacy.userContext.newTabContainerOnLeftClick.enabled", true); /*** [SECTION 2000]: PLUGINS / MEDIA / WEBRTC ***/ user_pref("_user.js.parrot", "2000 syntax error: the parrot's snuffed it!"); @@ -596,7 +596,7 @@ user_pref("_user.js.parrot", "2000 syntax error: the parrot's snuffed it!"); * [TEST] https://browserleaks.com/webrtc * [1] https://groups.google.com/g/discuss-webrtc/c/6stQXi72BEU/m/2FwZd24UAQAJ * [2] https://datatracker.ietf.org/doc/html/draft-ietf-mmusic-mdns-ice-candidates#section-3.1.1 ***/ - // user_pref("media.peerconnection.enabled", false); +// user_pref("media.peerconnection.enabled", false); /* 2002: force WebRTC inside the proxy [FF70+] ***/ user_pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true); /* 2003: force a single network interface for ICE candidates generation [FF42+] @@ -607,13 +607,13 @@ user_pref("media.peerconnection.ice.default_address_only", true); /* 2004: force exclusion of private IPs from ICE candidates [FF51+] * [SETUP-HARDEN] This will protect your private IP even in TRUSTED scenarios after you * grant device access, but often results in breakage on video-conferencing platforms ***/ - // user_pref("media.peerconnection.ice.no_host", true); +// user_pref("media.peerconnection.ice.no_host", true); /* 2020: disable GMP (Gecko Media Plugins) * [1] https://wiki.mozilla.org/GeckoMediaPlugins ***/ - // user_pref("media.gmp-provider.enabled", false); +// user_pref("media.gmp-provider.enabled", false); /* 2021: disable widevine CDM (Content Decryption Module) * [NOTE] This is covered by the EME master switch (2022) ***/ - // user_pref("media.gmp-widevinecdm.enabled", false); +// user_pref("media.gmp-widevinecdm.enabled", false); /* 2022: disable all DRM content (EME: Encryption Media Extension) * Optionally hide the setting which also disables the DRM prompt * [SETUP-WEB] e.g. Netflix, Amazon Prime, Hulu, HBO, Disney+, Showtime, Starz, DirectTV @@ -621,12 +621,12 @@ user_pref("media.peerconnection.ice.default_address_only", true); * [TEST] https://bitmovin.com/demos/drm * [1] https://www.eff.org/deeplinks/2017/10/drms-dead-canary-how-we-just-lost-web-what-we-learned-it-and-what-we-need-do-next ***/ user_pref("media.eme.enabled", false); - // user_pref("browser.eme.ui.enabled", false); +// user_pref("browser.eme.ui.enabled", false); /* 2030: disable autoplay of HTML5 media [FF63+] * 0=Allow all, 1=Block non-muted media (default), 5=Block all * [NOTE] You can set exceptions under site permissions * [SETTING] Privacy & Security>Permissions>Autoplay>Settings>Default for all websites ***/ - // user_pref("media.autoplay.default", 5); +// user_pref("media.autoplay.default", 5); /* 2031: disable autoplay of HTML5 media if you interacted with the site [FF78+] * 0=sticky (default), 1=transient, 2=user * Firefox's Autoplay Policy Documentation (PDF) is linked below via SUMO @@ -677,7 +677,7 @@ user_pref("middlemouse.contentLoadURL", false); /* 2615: disable websites overriding Firefox's keyboard shortcuts [FF58+] * 0 (default) or 1=allow, 2=block * [SETTING] to add site exceptions: Ctrl+I>Permissions>Override Keyboard Shortcuts ***/ - // user_pref("permissions.default.shortcuts", 2); +// user_pref("permissions.default.shortcuts", 2); /* 2616: remove special permissions for certain mozilla domains [FF35+] * [1] resource://app/defaults/permissions ***/ user_pref("permissions.manager.defaultsUrl", ""); @@ -731,14 +731,14 @@ user_pref("browser.download.always_ask_before_handling_new_types", true); * XPI files which are installed outside of profile and application directories * [1] https://mike.kaply.com/2012/02/21/understanding-add-on-scopes/ * [1] https://archive.is/DYjAM (archived) ***/ -user_pref("extensions.enabledScopes", 5); // [HIDDEN PREF] -user_pref("extensions.autoDisableScopes", 15); // [DEFAULT: 15] +user_pref("extensions.autoDisableScopes", 0); +user_pref("extensions.enabledScopes", 1); /* 2661: disable bypassing 3rd party extension install prompts [FF82+] * [1] https://bugzilla.mozilla.org/buglist.cgi?bug_id=1659530,1681331 ***/ user_pref("extensions.postDownloadThirdPartyPrompt", false); /* 2662: disable webextension restrictions on certain mozilla domains (you also need 4503) [FF60+] * [1] https://bugzilla.mozilla.org/buglist.cgi?bug_id=1384330,1406795,1415644,1453988 ***/ - // user_pref("extensions.webextensions.restrictedDomains", ""); +// user_pref("extensions.webextensions.restrictedDomains", ""); /*** [SECTION 2700]: ETP (ENHANCED TRACKING PROTECTION) ***/ user_pref("_user.js.parrot", "2700 syntax error: the parrot's joined the bleedin' choir invisible!"); @@ -756,7 +756,7 @@ user_pref("browser.contentblocking.category", "strict"); * [1] https://blog.mozilla.org/security/2021/07/13/smartblock-v2/ * [2] https://hg.mozilla.org/mozilla-central/rev/e5483fd469ab#l4.12 * [3] https://developer.mozilla.org/en-US/docs/Web/Privacy/State_Partitioning#storage_access_heuristics ***/ - // user_pref("privacy.antitracking.enableWebcompat", false); +// user_pref("privacy.antitracking.enableWebcompat", false); /* 2710: enable state partitioning of service workers [FF96+] ***/ user_pref("privacy.partition.serviceWorkers", true); @@ -774,7 +774,7 @@ user_pref("network.cookie.lifetimePolicy", 2); /* 2802: delete cache on exit [FF96+] * [NOTE] We already disable disk cache (1001) and clear on exit (2811) which is more robust * [1] https://bugzilla.mozilla.org/1671182 ***/ - // user_pref("privacy.clearsitedata.cache.enabled", true); +// user_pref("privacy.clearsitedata.cache.enabled", true); /** SANITIZE ON SHUTDOWN : ALL OR NOTHING ***/ /* 2810: enable Firefox to clear items on shutdown (2811) @@ -787,14 +787,14 @@ user_pref("privacy.sanitize.sanitizeOnShutdown", true); * [NOTE] "offlineApps": Offline Website Data: localStorage, service worker cache, QuotaManager (IndexedDB, asm-cache) * [SETTING] Privacy & Security>History>Custom Settings>Clear history when Firefox closes>Settings * [1] https://en.wikipedia.org/wiki/Basic_access_authentication ***/ -user_pref("privacy.clearOnShutdown.cache", true); // [DEFAULT: true] +user_pref("privacy.clearOnShutdown.cache", true); // [DEFAULT: 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.formdata", true); // [DEFAULT: true] +user_pref("privacy.clearOnShutdown.history", true); // [DEFAULT: true] +user_pref("privacy.clearOnShutdown.sessions", true); // [DEFAULT: true] user_pref("privacy.clearOnShutdown.offlineApps", false); // [DEFAULT: false] user_pref("privacy.clearOnShutdown.cookies", false); - // user_pref("privacy.clearOnShutdown.siteSettings", false); +// user_pref("privacy.clearOnShutdown.siteSettings", false); /** SANITIZE MANUAL: ALL OR NOTHING ***/ /* 2820: reset default items to clear with Ctrl-Shift-Del [SETUP-CHROME] @@ -802,20 +802,20 @@ user_pref("privacy.clearOnShutdown.cookies", false); * Firefox remembers your last choices. This will reset them when you start Firefox * [NOTE] Regardless of what you set "downloads" to, as soon as the dialog * for "Clear Recent History" is opened, it is synced to the same as "history" ***/ -user_pref("privacy.cpd.cache", true); // [DEFAULT: true] +user_pref("privacy.cpd.cache", true); // [DEFAULT: true] user_pref("privacy.cpd.formdata", true); // [DEFAULT: true] -user_pref("privacy.cpd.history", true); // [DEFAULT: true] +user_pref("privacy.cpd.history", true); // [DEFAULT: true] user_pref("privacy.cpd.sessions", true); // [DEFAULT: true] user_pref("privacy.cpd.offlineApps", false); // [DEFAULT: false] user_pref("privacy.cpd.cookies", false); - // user_pref("privacy.cpd.downloads", true); // not used, see note above - // user_pref("privacy.cpd.passwords", false); - // user_pref("privacy.cpd.siteSettings", false); +// user_pref("privacy.cpd.downloads", true); // not used, see note above +// user_pref("privacy.cpd.passwords", false); +// user_pref("privacy.cpd.siteSettings", false); /* 2821: clear Session Restore data when sanitizing on shutdown or manually [FF34+] * [NOTE] Not needed if Session Restore is not used (0102) or it is already cleared with history (2811) * [NOTE] privacy.clearOnShutdown.openWindows prevents resuming from crashes (also see 5008) ***/ - // user_pref("privacy.clearOnShutdown.openWindows", true); - // user_pref("privacy.cpd.openWindows", true); +// user_pref("privacy.clearOnShutdown.openWindows", true); +// user_pref("privacy.cpd.openWindows", true); /* 2822: reset default "Time range to clear" for "Clear Recent History" (2820) * Firefox remembers your last choice. This will reset the value when you start Firefox * 0=everything, 1=last hour, 2=last two hours, 3=last four hours, 4=today @@ -904,14 +904,14 @@ user_pref("privacy.resistFingerprinting.block_mozAddonManager", true); // [HIDDE * [1] https://bugzilla.mozilla.org/1407366 * [2] https://hg.mozilla.org/mozilla-central/rev/6d2d7856e468#l2.32 ***/ user_pref("privacy.resistFingerprinting.letterboxing", true); // [HIDDEN PREF] - // user_pref("privacy.resistFingerprinting.letterboxing.dimensions", ""); // [HIDDEN PREF] +// user_pref("privacy.resistFingerprinting.letterboxing.dimensions", ""); // [HIDDEN PREF] /* 4505: experimental RFP [FF91+] * [WARNING] DO NOT USE unless testing, see [1] comment 12 * [1] https://bugzilla.mozilla.org/1635603 ***/ - // user_pref("privacy.resistFingerprinting.exemptedDomains", "*.example.invalid"); - // user_pref("privacy.resistFingerprinting.testGranularityMask", 0); +// user_pref("privacy.resistFingerprinting.exemptedDomains", "*.example.invalid"); +// user_pref("privacy.resistFingerprinting.testGranularityMask", 0); /* 4506: set RFP's font visibility level (1402) [FF94+] ***/ - // user_pref("layout.css.font-visibility.resistFingerprinting", 1); // [DEFAULT: 1] +// user_pref("layout.css.font-visibility.resistFingerprinting", 1); // [DEFAULT: 1] /* 4507: disable showing about:blank as soon as possible during startup [FF60+] * When default true this no longer masks the RFP chrome resizing activity * [1] https://bugzilla.mozilla.org/1448423 ***/ @@ -954,65 +954,65 @@ user_pref("_user.js.parrot", "5000 syntax error: the parrot's taken 'is last bow * [SETTING] Privacy & Security>History>Custom Settings>Always use private browsing mode * [1] https://wiki.mozilla.org/Private_Browsing * [2] https://support.mozilla.org/kb/common-myths-about-private-browsing ***/ - // user_pref("browser.privatebrowsing.autostart", true); +// user_pref("browser.privatebrowsing.autostart", true); /* 5002: disable memory cache * capacity: -1=determine dynamically (default), 0=none, n=memory capacity in kibibytes ***/ - // user_pref("browser.cache.memory.enable", false); - // user_pref("browser.cache.memory.capacity", 0); +// user_pref("browser.cache.memory.enable", false); +// user_pref("browser.cache.memory.capacity", 0); /* 5003: disable saving passwords * [NOTE] This does not clear any passwords already saved * [SETTING] Privacy & Security>Logins and Passwords>Ask to save logins and passwords for websites ***/ - // user_pref("signon.rememberSignons", false); +// user_pref("signon.rememberSignons", false); /* 5004: disable permissions manager from writing to disk [FF41+] [RESTART] * [NOTE] This means any permission changes are session only * [1] https://bugzilla.mozilla.org/967812 ***/ - // user_pref("permissions.memory_only", true); // [HIDDEN PREF] +// user_pref("permissions.memory_only", true); // [HIDDEN PREF] /* 5005: disable intermediate certificate caching [FF41+] [RESTART] * [NOTE] This affects login/cert/key dbs. The effect is all credentials are session-only. * Saved logins and passwords are not available. Reset the pref and restart to return them ***/ - // user_pref("security.nocertdb", true); // [HIDDEN PREF in FF101 or lower] +// user_pref("security.nocertdb", true); // [HIDDEN PREF in FF101 or lower] /* 5006: disable favicons in history and bookmarks * [NOTE] Stored as data blobs in favicons.sqlite, these don't reveal anything that your * actual history (and bookmarks) already do. Your history is more detailed, so * control that instead; e.g. disable history, clear history on exit, use PB mode * [NOTE] favicons.sqlite is sanitized on Firefox close ***/ - // user_pref("browser.chrome.site_icons", false); +// user_pref("browser.chrome.site_icons", false); /* 5007: exclude "Undo Closed Tabs" in Session Restore ***/ - // user_pref("browser.sessionstore.max_tabs_undo", 0); +// user_pref("browser.sessionstore.max_tabs_undo", 0); /* 5008: disable resuming session from crash * [TEST] about:crashparent ***/ - // user_pref("browser.sessionstore.resume_from_crash", false); +// user_pref("browser.sessionstore.resume_from_crash", false); /* 5009: disable "open with" in download dialog [FF50+] * Application data isolation [1] * [1] https://bugzilla.mozilla.org/1281959 ***/ - // user_pref("browser.download.forbid_open_with", true); +// user_pref("browser.download.forbid_open_with", true); /* 5010: disable location bar suggestion types * [SETTING] Privacy & Security>Address Bar>When using the address bar, suggest ***/ - // user_pref("browser.urlbar.suggest.history", false); - // user_pref("browser.urlbar.suggest.bookmark", false); - // user_pref("browser.urlbar.suggest.openpage", false); - // user_pref("browser.urlbar.suggest.topsites", false); // [FF78+] +// user_pref("browser.urlbar.suggest.history", false); +// user_pref("browser.urlbar.suggest.bookmark", false); +// user_pref("browser.urlbar.suggest.openpage", false); +// user_pref("browser.urlbar.suggest.topsites", false); // [FF78+] /* 5011: disable location bar dropdown * This value controls the total number of entries to appear in the location bar dropdown ***/ - // user_pref("browser.urlbar.maxRichResults", 0); +// user_pref("browser.urlbar.maxRichResults", 0); /* 5012: disable location bar autofill * [1] https://support.mozilla.org/kb/address-bar-autocomplete-firefox#w_url-autocomplete ***/ - // user_pref("browser.urlbar.autoFill", false); +// user_pref("browser.urlbar.autoFill", false); /* 5013: disable browsing and download history * [NOTE] We also clear history and downloads on exit (2811) * [SETTING] Privacy & Security>History>Custom Settings>Remember browsing and download history ***/ - // user_pref("places.history.enabled", false); +// user_pref("places.history.enabled", false); /* 5014: disable Windows jumplist [WINDOWS] ***/ - // user_pref("browser.taskbar.lists.enabled", false); - // user_pref("browser.taskbar.lists.frequent.enabled", false); - // user_pref("browser.taskbar.lists.recent.enabled", false); - // user_pref("browser.taskbar.lists.tasks.enabled", false); +// user_pref("browser.taskbar.lists.enabled", false); +// user_pref("browser.taskbar.lists.frequent.enabled", false); +// user_pref("browser.taskbar.lists.recent.enabled", false); +// user_pref("browser.taskbar.lists.tasks.enabled", false); /* 5015: disable Windows taskbar preview [WINDOWS] ***/ - // user_pref("browser.taskbar.previews.enable", false); // [DEFAULT: false] +// user_pref("browser.taskbar.previews.enable", false); // [DEFAULT: false] /* 5016: discourage downloading to desktop * 0=desktop, 1=downloads (default), 2=last used * [SETTING] To set your default "downloads": General>Downloads>Save files to ***/ - // user_pref("browser.download.folderList", 2); +// user_pref("browser.download.folderList", 2); /*** [SECTION 5500]: OPTIONAL HARDENING Not recommended. Overriding these can cause breakage and performance issues, @@ -1021,27 +1021,27 @@ user_pref("_user.js.parrot", "5000 syntax error: the parrot's taken 'is last bow user_pref("_user.js.parrot", "5500 syntax error: this is an ex-parrot!"); /* 5501: disable MathML (Mathematical Markup Language) [FF51+] * [1] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=mathml ***/ - // user_pref("mathml.disabled", true); // 1173199 +// user_pref("mathml.disabled", true); // 1173199 /* 5502: disable in-content SVG (Scalable Vector Graphics) [FF53+] * [1] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=firefox+svg ***/ - // user_pref("svg.disabled", true); // 1216893 +// user_pref("svg.disabled", true); // 1216893 /* 5503: disable graphite * [1] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=firefox+graphite * [2] https://en.wikipedia.org/wiki/Graphite_(SIL) ***/ - // user_pref("gfx.font_rendering.graphite.enabled", false); +// user_pref("gfx.font_rendering.graphite.enabled", false); /* 5504: disable asm.js [FF22+] * [1] http://asmjs.org/ * [2] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=asm.js * [3] https://rh0dev.github.io/blog/2017/the-return-of-the-jit/ ***/ - // user_pref("javascript.options.asmjs", false); +// user_pref("javascript.options.asmjs", false); /* 5505: disable Ion and baseline JIT to harden against JS exploits * [NOTE] When both Ion and JIT are disabled, and trustedprincipals * is enabled, then Ion can still be used by extensions (1599226) * [1] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=firefox+jit * [2] https://microsoftedge.github.io/edgevr/posts/Super-Duper-Secure-Mode/ ***/ - // user_pref("javascript.options.ion", false); - // user_pref("javascript.options.baselinejit", false); - // user_pref("javascript.options.jit_trustedprincipals", true); // [FF75+] [HIDDEN PREF] +// user_pref("javascript.options.ion", false); +// user_pref("javascript.options.baselinejit", false); +// user_pref("javascript.options.jit_trustedprincipals", true); // [FF75+] [HIDDEN PREF] /* 5506: disable WebAssembly [FF52+] * Vulnerabilities [1] have increasingly been found, including those known and fixed * in native programs years ago [2]. WASM has powerful low-level access, making @@ -1050,7 +1050,7 @@ user_pref("_user.js.parrot", "5500 syntax error: this is an ex-parrot!"); * [1] https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=wasm * [2] https://spectrum.ieee.org/tech-talk/telecom/security/more-worries-over-the-security-of-web-assembly * [3] https://www.zdnet.com/article/half-of-the-websites-using-webassembly-use-it-for-malicious-purposes ***/ - // user_pref("javascript.options.wasm", false); +// user_pref("javascript.options.wasm", false); /*** [SECTION 6000]: DON'T TOUCH ***/ user_pref("_user.js.parrot", "6000 syntax error: the parrot's 'istory!"); @@ -1083,18 +1083,18 @@ user_pref("extensions.webcompat-reporter.enabled", false); // [DEFAULT: false] /* 6012: disable SHA-1 certificates ***/ user_pref("security.pki.sha1_enforcement_level", 1); // [DEFAULT: 1 FF102+] /* 6050: prefsCleaner: reset items removed from arkenfox FF92+ ***/ - // user_pref("browser.urlbar.trimURLs", ""); - // user_pref("dom.caches.enabled", ""); - // user_pref("dom.storageManager.enabled", ""); - // user_pref("dom.storage_access.enabled", ""); - // user_pref("dom.targetBlankNoOpener.enabled", ""); - // user_pref("network.cookie.thirdparty.sessionOnly", ""); - // user_pref("network.cookie.thirdparty.nonsecureSessionOnly", ""); - // user_pref("privacy.firstparty.isolate.block_post_message", ""); - // user_pref("privacy.firstparty.isolate.restrict_opener_access", ""); - // user_pref("privacy.firstparty.isolate.use_site", ""); - // user_pref("privacy.window.name.update.enabled", ""); - // user_pref("security.insecure_connection_text.enabled", ""); +// user_pref("browser.urlbar.trimURLs", ""); +// user_pref("dom.caches.enabled", ""); +// user_pref("dom.storageManager.enabled", ""); +// user_pref("dom.storage_access.enabled", ""); +// user_pref("dom.targetBlankNoOpener.enabled", ""); +// user_pref("network.cookie.thirdparty.sessionOnly", ""); +// user_pref("network.cookie.thirdparty.nonsecureSessionOnly", ""); +// user_pref("privacy.firstparty.isolate.block_post_message", ""); +// user_pref("privacy.firstparty.isolate.restrict_opener_access", ""); +// user_pref("privacy.firstparty.isolate.use_site", ""); +// user_pref("privacy.window.name.update.enabled", ""); +// user_pref("security.insecure_connection_text.enabled", ""); /*** [SECTION 7000]: DON'T BOTHER ***/ user_pref("_user.js.parrot", "7000 syntax error: the parrot's pushing up daisies!"); @@ -1102,10 +1102,10 @@ user_pref("_user.js.parrot", "7000 syntax error: the parrot's pushing up daisies * Location-Aware Browsing, Full Screen, offline cache (appCache), Virtual Reality * [WHY] The API state is easily fingerprintable. Geo and VR are behind prompts (7002). * appCache storage capability was removed in FF90. Full screen requires user interaction ***/ - // user_pref("geo.enabled", false); - // user_pref("full-screen-api.enabled", false); - // user_pref("browser.cache.offline.enable", false); - // user_pref("dom.vr.enabled", false); // [DEFAULT: false FF97+] +// user_pref("geo.enabled", false); +// user_pref("full-screen-api.enabled", false); +// user_pref("browser.cache.offline.enable", false); +// user_pref("dom.vr.enabled", false); // [DEFAULT: false FF97+] /* 7002: set default permissions * Location, Camera, Microphone, Notifications [FF58+] Virtual Reality [FF73+] * 0=always ask (default), 1=allow, 2=block @@ -1113,92 +1113,92 @@ user_pref("_user.js.parrot", "7000 syntax error: the parrot's pushing up daisies * exceptions as allow/block for frequently visited/annoying sites: i.e. not global * [SETTING] to add site exceptions: Ctrl+I>Permissions> * [SETTING] to manage site exceptions: Options>Privacy & Security>Permissions>Settings ***/ - // user_pref("permissions.default.geo", 0); - // user_pref("permissions.default.camera", 0); - // user_pref("permissions.default.microphone", 0); - // user_pref("permissions.default.desktop-notification", 0); - // user_pref("permissions.default.xr", 0); // Virtual Reality +// user_pref("permissions.default.geo", 0); +// user_pref("permissions.default.camera", 0); +// user_pref("permissions.default.microphone", 0); +// user_pref("permissions.default.desktop-notification", 0); +// user_pref("permissions.default.xr", 0); // Virtual Reality /* 7003: disable non-modern cipher suites [1] * [WHY] Passive fingerprinting. Minimal/non-existent threat of downgrade attacks * [1] https://browserleaks.com/ssl ***/ - // user_pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", false); - // user_pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", false); - // user_pref("security.ssl3.ecdhe_rsa_aes_128_sha", false); - // user_pref("security.ssl3.ecdhe_rsa_aes_256_sha", false); - // user_pref("security.ssl3.rsa_aes_128_gcm_sha256", false); // no PFS - // user_pref("security.ssl3.rsa_aes_256_gcm_sha384", false); // no PFS - // user_pref("security.ssl3.rsa_aes_128_sha", false); // no PFS - // user_pref("security.ssl3.rsa_aes_256_sha", false); // no PFS +// user_pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", false); +// user_pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", false); +// user_pref("security.ssl3.ecdhe_rsa_aes_128_sha", false); +// user_pref("security.ssl3.ecdhe_rsa_aes_256_sha", false); +// user_pref("security.ssl3.rsa_aes_128_gcm_sha256", false); // no PFS +// user_pref("security.ssl3.rsa_aes_256_gcm_sha384", false); // no PFS +// user_pref("security.ssl3.rsa_aes_128_sha", false); // no PFS +// user_pref("security.ssl3.rsa_aes_256_sha", false); // no PFS /* 7004: control TLS versions * [WHY] Passive fingerprinting and security ***/ - // user_pref("security.tls.version.min", 3); // [DEFAULT: 3] - // user_pref("security.tls.version.max", 4); +// user_pref("security.tls.version.min", 3); // [DEFAULT: 3] +// user_pref("security.tls.version.max", 4); /* 7005: disable SSL session IDs [FF36+] * [WHY] Passive fingerprinting and perf costs. These are session-only * and isolated with network partitioning (FF85+) and/or containers ***/ - // user_pref("security.ssl.disable_session_identifiers", true); // [HIDDEN PREF in FF101 or lower] +// user_pref("security.ssl.disable_session_identifiers", true); // [HIDDEN PREF in FF101 or lower] /* 7006: onions * [WHY] Firefox doesn't support hidden services. Use Tor Browser ***/ - // user_pref("dom.securecontext.allowlist_onions", true); // [FF97+] 1382359/1744006 - // user_pref("network.http.referer.hideOnionSource", true); // 1305144 +// user_pref("dom.securecontext.allowlist_onions", true); // [FF97+] 1382359/1744006 +// user_pref("network.http.referer.hideOnionSource", true); // 1305144 /* 7007: referers * [WHY] Only cross-origin referers (1600s) need control ***/ - // user_pref("network.http.sendRefererHeader", 2); - // user_pref("network.http.referer.trimmingPolicy", 0); +// user_pref("network.http.sendRefererHeader", 2); +// user_pref("network.http.referer.trimmingPolicy", 0); /* 7008: set the default Referrer Policy [FF59+] * 0=no-referer, 1=same-origin, 2=strict-origin-when-cross-origin, 3=no-referrer-when-downgrade * [WHY] Defaults are fine. They can be overridden by a site-controlled Referrer Policy ***/ - // user_pref("network.http.referer.defaultPolicy", 2); // [DEFAULT: 2] - // user_pref("network.http.referer.defaultPolicy.pbmode", 2); // [DEFAULT: 2] +// user_pref("network.http.referer.defaultPolicy", 2); // [DEFAULT: 2] +// user_pref("network.http.referer.defaultPolicy.pbmode", 2); // [DEFAULT: 2] /* 7010: disable HTTP Alternative Services [FF37+] * [WHY] Already isolated with network partitioning (FF85+) ***/ - // user_pref("network.http.altsvc.enabled", false); - // user_pref("network.http.altsvc.oe", false); // [DEFAULT: false FF94+] +// user_pref("network.http.altsvc.enabled", false); +// user_pref("network.http.altsvc.oe", false); // [DEFAULT: false FF94+] /* 7011: disable website control over browser right-click context menu * [WHY] Just use Shift-Right-Click ***/ - // user_pref("dom.event.contextmenu.enabled", false); +// user_pref("dom.event.contextmenu.enabled", false); /* 7012: disable icon fonts (glyphs) and local fallback rendering * [WHY] Breakage, font fallback is equivalency, also RFP * [1] https://bugzilla.mozilla.org/789788 * [2] https://gitlab.torproject.org/legacy/trac/-/issues/8455 ***/ - // user_pref("gfx.downloadable_fonts.enabled", false); // [FF41+] - // user_pref("gfx.downloadable_fonts.fallback_delay", -1); +// user_pref("gfx.downloadable_fonts.enabled", false); // [FF41+] +// user_pref("gfx.downloadable_fonts.fallback_delay", -1); /* 7013: disable Clipboard API * [WHY] Fingerprintable. Breakage. Cut/copy/paste require user * interaction, and paste is limited to focused editable fields ***/ - // user_pref("dom.event.clipboardevents.enabled", false); +// user_pref("dom.event.clipboardevents.enabled", false); /* 7014: disable System Add-on updates * [WHY] It can compromise security. System addons ship with prefs, use those ***/ - // user_pref("extensions.systemAddon.update.enabled", false); // [FF62+] - // user_pref("extensions.systemAddon.update.url", ""); // [FF44+] +// user_pref("extensions.systemAddon.update.enabled", false); // [FF62+] +// user_pref("extensions.systemAddon.update.url", ""); // [FF44+] /* 7015: enable the DNT (Do Not Track) HTTP header * [WHY] DNT is enforced with Tracking Protection which is used in ETP Strict (2701) ***/ - // user_pref("privacy.donottrackheader.enabled", true); +// user_pref("privacy.donottrackheader.enabled", true); /* 7016: customize ETP settings * [WHY] Arkenfox only supports strict (2701) which sets these at runtime ***/ - // user_pref("network.cookie.cookieBehavior", 5); - // user_pref("network.http.referer.disallowCrossSiteRelaxingDefault", true); - // user_pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true); // [FF100+] - // user_pref("privacy.partition.network_state.ocsp_cache", true); - // user_pref("privacy.query_stripping.enabled", true); // [FF101+] [ETP FF102+] - // user_pref("privacy.trackingprotection.enabled", true); - // user_pref("privacy.trackingprotection.socialtracking.enabled", true); - // user_pref("privacy.trackingprotection.cryptomining.enabled", true); // [DEFAULT: true] - // user_pref("privacy.trackingprotection.fingerprinting.enabled", true); // [DEFAULT: true] +// user_pref("network.cookie.cookieBehavior", 5); +// user_pref("network.http.referer.disallowCrossSiteRelaxingDefault", true); +// user_pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true); // [FF100+] +// user_pref("privacy.partition.network_state.ocsp_cache", true); +// user_pref("privacy.query_stripping.enabled", true); // [FF101+] [ETP FF102+] +// user_pref("privacy.trackingprotection.enabled", true); +// user_pref("privacy.trackingprotection.socialtracking.enabled", true); +// user_pref("privacy.trackingprotection.cryptomining.enabled", true); // [DEFAULT: true] +// user_pref("privacy.trackingprotection.fingerprinting.enabled", true); // [DEFAULT: true] /* 7017: disable service workers * [WHY] Already isolated (FF96+) with TCP (2701) behind a pref (2710) * or blocked with TCP in 3rd parties (FF95 or lower) ***/ - // user_pref("dom.serviceWorkers.enabled", false); +// user_pref("dom.serviceWorkers.enabled", false); /* 7018: disable Web Notifications * [WHY] Web Notifications are behind a prompt (7002) * [1] https://blog.mozilla.org/en/products/firefox/block-notification-requests/ ***/ - // user_pref("dom.webnotifications.enabled", false); // [FF22+] - // user_pref("dom.webnotifications.serviceworker.enabled", false); // [FF44+] +// user_pref("dom.webnotifications.enabled", false); // [FF22+] +// user_pref("dom.webnotifications.serviceworker.enabled", false); // [FF44+] /* 7019: disable Push Notifications [FF44+] * [WHY] Push requires subscription * [NOTE] To remove all subscriptions, reset "dom.push.userAgentID" * [1] https://support.mozilla.org/kb/push-notifications-firefox ***/ - // user_pref("dom.push.enabled", false); +// user_pref("dom.push.enabled", false); /*** [SECTION 8000]: DON'T BOTHER: FINGERPRINTING [WHY] They are insufficient to help anti-fingerprinting and do more harm than good @@ -1206,31 +1206,31 @@ user_pref("_user.js.parrot", "7000 syntax error: the parrot's pushing up daisies ***/ user_pref("_user.js.parrot", "8000 syntax error: the parrot's crossed the Jordan"); /* 8001: disable APIs ***/ - // user_pref("device.sensors.enabled", false); - // user_pref("dom.enable_performance", false); - // user_pref("dom.enable_resource_timing", false); - // user_pref("dom.gamepad.enabled", false); - // user_pref("dom.netinfo.enabled", false); // [DEFAULT: false NON-ANDROID: false ANDROID FF99+] - // user_pref("dom.webaudio.enabled", false); +// user_pref("device.sensors.enabled", false); +// user_pref("dom.enable_performance", false); +// user_pref("dom.enable_resource_timing", false); +// user_pref("dom.gamepad.enabled", false); +// user_pref("dom.netinfo.enabled", false); // [DEFAULT: false NON-ANDROID: false ANDROID FF99+] +// user_pref("dom.webaudio.enabled", false); /* 8002: disable other ***/ - // user_pref("browser.display.use_document_fonts", 0); - // user_pref("browser.zoom.siteSpecific", false); - // user_pref("dom.w3c_touch_events.enabled", 0); - // user_pref("media.navigator.enabled", false); - // user_pref("media.ondevicechange.enabled", false); - // user_pref("media.video_stats.enabled", false); - // user_pref("media.webspeech.synth.enabled", false); - // user_pref("webgl.enable-debug-renderer-info", false); +// user_pref("browser.display.use_document_fonts", 0); +// user_pref("browser.zoom.siteSpecific", false); +// user_pref("dom.w3c_touch_events.enabled", 0); +// user_pref("media.navigator.enabled", false); +// user_pref("media.ondevicechange.enabled", false); +// user_pref("media.video_stats.enabled", false); +// user_pref("media.webspeech.synth.enabled", false); +// user_pref("webgl.enable-debug-renderer-info", false); /* 8003: spoof ***/ - // user_pref("dom.maxHardwareConcurrency", 2); - // user_pref("font.system.whitelist", ""); // [HIDDEN PREF] - // user_pref("general.appname.override", ""); // [HIDDEN PREF] - // user_pref("general.appversion.override", ""); // [HIDDEN PREF] - // user_pref("general.buildID.override", ""); // [HIDDEN PREF] - // user_pref("general.oscpu.override", ""); // [HIDDEN PREF] - // user_pref("general.platform.override", ""); // [HIDDEN PREF] - // user_pref("general.useragent.override", ""); // [HIDDEN PREF] - // user_pref("ui.use_standins_for_native_colors", true); +// user_pref("dom.maxHardwareConcurrency", 2); +// user_pref("font.system.whitelist", ""); // [HIDDEN PREF] +// user_pref("general.appname.override", ""); // [HIDDEN PREF] +// user_pref("general.appversion.override", ""); // [HIDDEN PREF] +// user_pref("general.buildID.override", ""); // [HIDDEN PREF] +// user_pref("general.oscpu.override", ""); // [HIDDEN PREF] +// user_pref("general.platform.override", ""); // [HIDDEN PREF] +// user_pref("general.useragent.override", ""); // [HIDDEN PREF] +// user_pref("ui.use_standins_for_native_colors", true); /*** [SECTION 9000]: PERSONAL Non-project related but useful. If any interest you, add them to your overrides @@ -1238,60 +1238,60 @@ user_pref("_user.js.parrot", "8000 syntax error: the parrot's crossed the Jordan user_pref("_user.js.parrot", "9000 syntax error: the parrot's cashed in 'is chips!"); /* WELCOME & WHAT'S NEW NOTICES ***/ user_pref("browser.startup.homepage_override.mstone", "ignore"); // master switch - // user_pref("startup.homepage_welcome_url", ""); - // user_pref("startup.homepage_welcome_url.additional", ""); - // user_pref("startup.homepage_override_url", ""); // What's New page after updates +// user_pref("startup.homepage_welcome_url", ""); +// user_pref("startup.homepage_welcome_url.additional", ""); +// user_pref("startup.homepage_override_url", ""); // What's New page after updates /* WARNINGS ***/ - // user_pref("browser.tabs.warnOnClose", false); // [DEFAULT false FF94+] - // user_pref("browser.tabs.warnOnCloseOtherTabs", false); - // user_pref("browser.tabs.warnOnOpen", false); - // user_pref("browser.warnOnQuitShortcut", false); // [FF94+] - // user_pref("full-screen-api.warning.delay", 0); - // user_pref("full-screen-api.warning.timeout", 0); +// user_pref("browser.tabs.warnOnClose", false); // [DEFAULT false FF94+] +// user_pref("browser.tabs.warnOnCloseOtherTabs", false); +// user_pref("browser.tabs.warnOnOpen", false); +// user_pref("browser.warnOnQuitShortcut", false); // [FF94+] +// user_pref("full-screen-api.warning.delay", 0); +// user_pref("full-screen-api.warning.timeout", 0); /* UPDATES ***/ - // user_pref("app.update.auto", false); // [NON-WINDOWS] disable auto app updates - // [NOTE] You will still get prompts to update, and should do so in a timely manner - // [SETTING] General>Firefox Updates>Check for updates but let you choose to install them - // user_pref("browser.search.update", false); // disable search engine updates (e.g. OpenSearch) - // [NOTE] This does not affect Mozilla's built-in or Web Extension search engines - // user_pref("extensions.update.enabled", false); // disable extension and theme update checks - // user_pref("extensions.update.autoUpdateDefault", false); // disable installing extension and theme updates - // [SETTING] about:addons>Extensions>[cog-wheel-icon]>Update Add-ons Automatically (toggle) - // user_pref("extensions.getAddons.cache.enabled", false); // disable extension metadata (extension detail tab) +// user_pref("app.update.auto", false); // [NON-WINDOWS] disable auto app updates +// [NOTE] You will still get prompts to update, and should do so in a timely manner +// [SETTING] General>Firefox Updates>Check for updates but let you choose to install them +// user_pref("browser.search.update", false); // disable search engine updates (e.g. OpenSearch) +// [NOTE] This does not affect Mozilla's built-in or Web Extension search engines +// user_pref("extensions.update.enabled", false); // disable extension and theme update checks +// user_pref("extensions.update.autoUpdateDefault", false); // disable installing extension and theme updates +// [SETTING] about:addons>Extensions>[cog-wheel-icon]>Update Add-ons Automatically (toggle) +// user_pref("extensions.getAddons.cache.enabled", false); // disable extension metadata (extension detail tab) /* APPEARANCE ***/ - // user_pref("browser.download.autohideButton", false); // [FF57+] - // user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); // [FF68+] allow userChrome/userContent - // user_pref("ui.prefersReducedMotion", 1); // disable chrome animations [FF77+] [RESTART] [HIDDEN PREF] - // 0=no-preference, 1=reduce: with RFP this only affects chrome - // user_pref("ui.systemUsesDarkTheme", 1); // [FF67+] [HIDDEN PREF] - // 0=light, 1=dark: with RFP this only affects chrome +// user_pref("browser.download.autohideButton", false); // [FF57+] +// user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); // [FF68+] allow userChrome/userContent +// user_pref("ui.prefersReducedMotion", 1); // disable chrome animations [FF77+] [RESTART] [HIDDEN PREF] +// 0=no-preference, 1=reduce: with RFP this only affects chrome +// user_pref("ui.systemUsesDarkTheme", 1); // [FF67+] [HIDDEN PREF] +// 0=light, 1=dark: with RFP this only affects chrome /* CONTENT BEHAVIOR ***/ - // user_pref("accessibility.typeaheadfind", true); // enable "Find As You Type" - // user_pref("clipboard.autocopy", false); // disable autocopy default [LINUX] - // user_pref("layout.spellcheckDefault", 2); // 0=none, 1-multi-line, 2=multi-line & single-line +// user_pref("accessibility.typeaheadfind", true); // enable "Find As You Type" +// user_pref("clipboard.autocopy", false); // disable autocopy default [LINUX] +// user_pref("layout.spellcheckDefault", 2); // 0=none, 1-multi-line, 2=multi-line & single-line /* UX BEHAVIOR ***/ - // user_pref("browser.backspace_action", 2); // 0=previous page, 1=scroll up, 2=do nothing - // user_pref("browser.quitShortcut.disabled", true); // disable Ctrl-Q quit shortcut [LINUX] [MAC] [FF87+] - // user_pref("browser.tabs.closeWindowWithLastTab", false); - // user_pref("browser.tabs.loadBookmarksInTabs", true); // open bookmarks in a new tab [FF57+] - // user_pref("browser.urlbar.decodeURLsOnCopy", true); // see bugzilla 1320061 [FF53+] - // user_pref("general.autoScroll", false); // middle-click enabling auto-scrolling [DEFAULT: false on Linux] - // user_pref("ui.key.menuAccessKey", 0); // disable alt key toggling the menu bar [RESTART] - // user_pref("view_source.tab", false); // view "page/selection source" in a new window [FF68+] +// user_pref("browser.backspace_action", 2); // 0=previous page, 1=scroll up, 2=do nothing +// user_pref("browser.quitShortcut.disabled", true); // disable Ctrl-Q quit shortcut [LINUX] [MAC] [FF87+] +// user_pref("browser.tabs.closeWindowWithLastTab", false); +// user_pref("browser.tabs.loadBookmarksInTabs", true); // open bookmarks in a new tab [FF57+] +// user_pref("browser.urlbar.decodeURLsOnCopy", true); // see bugzilla 1320061 [FF53+] +// user_pref("general.autoScroll", false); // middle-click enabling auto-scrolling [DEFAULT: false on Linux] +// user_pref("ui.key.menuAccessKey", 0); // disable alt key toggling the menu bar [RESTART] +// user_pref("view_source.tab", false); // view "page/selection source" in a new window [FF68+] /* UX FEATURES ***/ user_pref("browser.messaging-system.whatsNewPanel.enabled", false); // What's New toolbar icon [FF69+] - // user_pref("extensions.pocket.enabled", false); // Pocket Account [FF46+] - // user_pref("extensions.screenshots.disabled", true); // [FF55+] - // user_pref("identity.fxaccounts.enabled", false); // Firefox Accounts & Sync [FF60+] [RESTART] - // user_pref("reader.parse-on-load.enabled", false); // Reader View +// user_pref("extensions.pocket.enabled", false); // Pocket Account [FF46+] +// user_pref("extensions.screenshots.disabled", true); // [FF55+] +// user_pref("identity.fxaccounts.enabled", false); // Firefox Accounts & Sync [FF60+] [RESTART] +// user_pref("reader.parse-on-load.enabled", false); // Reader View /* OTHER ***/ - // user_pref("browser.bookmarks.max_backups", 2); +// user_pref("browser.bookmarks.max_backups", 2); user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false); // disable CFR [FF67+] - // [SETTING] General>Browsing>Recommend extensions as you browse +// [SETTING] General>Browsing>Recommend extensions as you browse user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false); // disable CFR [FF67+] - // [SETTING] General>Browsing>Recommend features as you browse - // user_pref("network.manage-offline-status", false); // see bugzilla 620472 - // user_pref("xpinstall.signatures.required", false); // enforced extension signing (Nightly/ESR) +// [SETTING] General>Browsing>Recommend features as you browse +// user_pref("network.manage-offline-status", false); // see bugzilla 620472 +// user_pref("xpinstall.signatures.required", false); // enforced extension signing (Nightly/ESR) /*** [SECTION 9999]: DEPRECATED / REMOVED / LEGACY / RENAMED Documentation denoted as [-]. Items deprecated prior to FF91 have been archived at [1] @@ -1350,4 +1350,4 @@ user_pref("dom.storage.next_gen", true); // [DEFAULT: true FF92+] // ***/ /* END: internal custom pref to test for syntax errors ***/ -user_pref("_user.js.parrot", "SUCCESS: No no he's not dead, he's, he's restin'!"); +user_pref("_user.js.parrot", "SUCCESS: No no he's not dead, he's, he's restin'!"); \ No newline at end of file diff --git a/src/java/net/i2p/i2pfirefox/I2PFirefox.java b/src/java/net/i2p/i2pfirefox/I2PFirefox.java index 185084f..b430f04 100644 --- a/src/java/net/i2p/i2pfirefox/I2PFirefox.java +++ b/src/java/net/i2p/i2pfirefox/I2PFirefox.java @@ -365,6 +365,7 @@ public class I2PFirefox { if (waitForProxy()){ ProcessBuilder pb = this.defaultProcessBuilder(); try{ + System.out.println(pb.command()); pb.start(); }catch(Exception e){ System.out.println("Error: "+e.getMessage()); diff --git a/src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java b/src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java index cfd1fcf..705cbbd 100644 --- a/src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java +++ b/src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java @@ -1,6 +1,11 @@ package net.i2p.i2pfirefox; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.StandardCopyOption; @@ -9,14 +14,7 @@ public class I2PFirefoxProfileBuilder { private static String profileDir(String file) { File profileDir = new File(file, "i2p.firefox.profile"); - // make sure the directory exists - if (profileDir.exists()) { - return profileDir.getAbsolutePath(); - } else { - // create the directory - profileDir.mkdir(); - return profileDir.getAbsolutePath(); - } + return profileDir.getAbsolutePath(); } /* @@ -43,7 +41,6 @@ public class I2PFirefoxProfileBuilder { return profileDir.getAbsolutePath(); } else { // create the directory - //profileDir.mkdir(); I2PFirefoxProfileUnpacker unpacker = new I2PFirefoxProfileUnpacker(); if (!unpacker.unpackProfile(profileDir.getAbsolutePath())) { return null; @@ -63,6 +60,11 @@ public class I2PFirefoxProfileBuilder { File pdf = new File(pd); if (pdf.exists() && pdf.isDirectory()) { return pd; + }else{ + I2PFirefoxProfileUnpacker unpacker = new I2PFirefoxProfileUnpacker(); + if (!unpacker.unpackProfile(pdf.getAbsolutePath())) { + return null; + } } } String rtd = runtimeDirectory(); @@ -142,70 +144,60 @@ public class I2PFirefoxProfileBuilder { public static boolean copyBaseProfiletoProfile() { String baseProfile = baseProfileDirectory(); String profile = profileDirectory(); + System.out.println("Copying base profile to profile directory: " + baseProfile + " -> " + profile); if (baseProfile.isEmpty() || profile.isEmpty()) { return false; } File baseProfileDir = new File(baseProfile); File profileDir = new File(profile); - if (!baseProfileDir.exists() || profileDir.listFiles() == null ) { - File userJs = new File(baseProfileDir, "user.js"); - File profileUserJs = new File(profileDir, "user.js"); - if (userJs.exists() && !profileUserJs.exists()) { - try { - Files.copy(userJs.toPath(), profileUserJs.toPath(), StandardCopyOption.REPLACE_EXISTING); - return true; - } catch (Exception e) { - if (strict) { - throw new RuntimeException(e); - } else { - System.err.println("Could not copy user.js to profile directory: " + e.getMessage()); - return false; - } - } - } - return false; - } + try { - Files.copy(baseProfileDir.toPath(), profileDir.toPath(), StandardCopyOption.REPLACE_EXISTING); + System.out.println("Copying base profile to profile directory"); + copyDirectory(baseProfileDir, profileDir); } catch (Exception e) { System.out.println("Error copying base profile to profile"+e); return false; } + System.out.println("Copied base profile to profile directory"); // if user.js does not exist yet, make an empty one. - if (!touch(profileDir.toString(), "user.js")) { - return false; - } + //if (!touch(profileDir.toString(), "user.js")) { + //return false; + //} // if extensions does not exist yet, make an empty one. - if (!mkExtensionsDir(profileDir.toString())){ - return false; - } + //if (!mkExtensionsDir(profileDir.toString())){ + //return false; + //} return copyStrictOptions(); } - private static boolean touch(String dir, String file){ - File f = new File(dir, file); - if (!f.exists()) { - try { - f.createNewFile(); - } catch (Exception e) { - System.out.println("Error creating "+file+" in "+dir+" "+e); - return false; - } + private static void copyDirectory(File sourceDirectory, File destinationDirectory) throws IOException { + destinationDirectory = new File(destinationDirectory.toString().replace("i2p.firefox.base.profile", "")); + if (!destinationDirectory.exists()) { + destinationDirectory.mkdir(); + } + for (String f : sourceDirectory.list()) { + copyDirectoryCompatibityMode(new File(sourceDirectory, f), new File(destinationDirectory, f)); } - return true; } - private static boolean mkExtensionsDir(String dir) { - File f = new File(dir, "extensions"); - if (!f.exists()) { - try { - f.mkdir(); - } catch (Exception e) { - System.out.println("Error creating extensions directory in "+dir+" "+e); - return false; + + public static void copyDirectoryCompatibityMode(File source, File destination) throws IOException { + if (source.isDirectory()) { + copyDirectory(source, destination); + } else { + copyFile(source, destination); + } + } + + private static void copyFile(File sourceFile, File destinationFile) throws IOException { + try (InputStream in = new FileInputStream(sourceFile); + OutputStream out = new FileOutputStream(destinationFile)) { + byte[] buf = new byte[1024]; + int length; + while ((length = in.read(buf)) > 0) { + out.write(buf, 0, length); } } - return true; } /* @@ -240,9 +232,9 @@ public class I2PFirefoxProfileBuilder { return false; } // if user-overrides.js does not exist yet, make an empty one. - if (!touch(profileDir.toString(), "user-overrides.js")) { - return false; - } + //if (!touch(profileDir.toString(), "user-overrides.js")) { + //return false; + //} return true; }