Commit a1541e65 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 40562: Added Tor Browser preferences to 000-tor-browser.js 

Before reordering patches, we used to keep the Tor-related patches
(torbutton and tor-launcher) at the beginning.
After that issue, we decided to move them towards the end.

In addition to that, we have decided to move Tor Browser-only
preferences there, too, to make Base Browser-only fixups easier to
apply.
parent 2fb33151

.eslintignore

+2 −0
Original line number Diff line number Diff line
@@ -270,4 +270,6 @@ toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/ 
toolkit/components/uniffi-bindgen-gecko-js/components/generated/*



browser/app/profile/001-base-profile.js

browser/app/profile/000-tor-browser.js

mobile/android/app/000-tor-browser-android.js

tools/torbrowser/bridges.js

browser/app/profile/000-tor-browser.js

0 → 100644
+123 −0
Original line number Diff line number Diff line 
#include 001-base-profile.js



pref("app.update.notifyDuringDownload", true);

pref("app.update.url.manual", "https://www.torproject.org/download/languages/");

pref("app.update.url.details", "https://www.torproject.org/download/");

pref("app.update.badgeWaitTime", 0);

pref("app.releaseNotesURL", "about:blank");

// disables the 'What's New?' link in the about dialog, otherwise we need to

// duplicate logic for generating the url to the blog post that is already more

// easily found in about:tor

pref("app.releaseNotesURL.aboutDialog", "about:blank");

// point to our feedback url rather than Mozilla's

pref("app.feedback.baseURL", "https://support.torproject.org/%LOCALE%/get-in-touch/");



pref("browser.shell.checkDefaultBrowser", false);



// Proxy and proxy security

pref("network.proxy.socks", "127.0.0.1");

pref("network.proxy.socks_port", 9150);

pref("network.proxy.socks_remote_dns", true);

pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419)

pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065)

pref("network.proxy.type", 1);

// Bug 40548: Disable proxy-bypass

pref("network.proxy.failover_direct", false);

// localhost is already blocked by setting `network.proxy.allow_hijacking_localhost` to

// true, allowing users to explicitly block ports makes them fingerprintable; for details, see

// Bug 41317: Tor Browser leaks banned ports in network.security.ports.banned

pref("network.security.ports.banned", "", locked);

pref("network.dns.disabled", true); // This should cover the #5741 patch for DNS leaks

pref("network.http.max-persistent-connections-per-proxy", 256);

// Disable DNS over HTTPS. Set to explicitly off MODE_TRROFF = 5.

// See tor-browser#41906.

pref("network.trr.mode", 5, locked);



// Treat .onions as secure

pref("dom.securecontext.allowlist_onions", true);



// Disable HTTPS-Only mode for .onion domains (tor-browser#19850)

pref("dom.security.https_only_mode.upgrade_onion", false);



// Bug 40423/41137: Disable http/3

// We should re-enable it as soon as Tor gets UDP support

pref("network.http.http3.enable", false);



// 0 = do not use a second connection, see all.js and #7656

pref("network.http.connection-retry-timeout", 0);



#expand pref("torbrowser.version", __BASE_BROWSER_VERSION_QUOTED__);



// Tor Browser used to be compatible with non-Tor proxies. This feature is not

// available anymore, but this legacy preference can be still used to disable

// first-party domain circuit isolation.

// In general, it should not be used. This use-case is still supported only for

// sites that break with this isolation (and even in that case, its use should

// be reduced to the strictly required time).

pref("extensions.torbutton.use_nontor_proxy", false);



// Browser home page:

pref("browser.startup.homepage", "about:tor");



// tor-browser#40701: Add new download warning

pref("browser.download.showTorWarning", true);



// This pref specifies an ad-hoc "version" for various pref update hacks we need to do

pref("extensions.torbutton.pref_fixup_version", 0);



// Formerly tor-launcher defaults



pref("extensions.torlauncher.start_tor", true);

pref("extensions.torlauncher.prompt_at_startup", true);

pref("extensions.torlauncher.quickstart", false);



pref("extensions.torlauncher.max_tor_log_entries", 1000);



// By default, Tor Launcher configures a TCP listener for the Tor

// control port, as defined by control_host and control_port.

// Set control_port_use_ipc to true to use an IPC object (e.g., a Unix

// domain socket) instead. You may also modify control_ipc_path to

// override the default IPC object location. If a relative path is used,

// it is handled like torrc_path (see below).

pref("extensions.torlauncher.control_host", "127.0.0.1");

pref("extensions.torlauncher.control_port", 9151);

pref("extensions.torlauncher.control_port_use_ipc", false);

pref("extensions.torlauncher.control_ipc_path", "");



// By default, Tor Launcher configures a TCP listener for the Tor

// SOCKS port. The host is taken from the network.proxy.socks pref and

// the port is taken from the network.proxy.socks_port pref.

// Set socks_port_use_ipc to true to use an IPC object (e.g., a Unix

// domain socket) instead. You may also modify socks_ipc_path to

// override the default IPC object location. If a relative path is used,

// it is handled like torrc_path (see below).

// Modify socks_port_flags to use a different set of SocksPort flags (but be

// careful).

pref("extensions.torlauncher.socks_port_use_ipc", false);

pref("extensions.torlauncher.socks_ipc_path", "");

pref("extensions.torlauncher.socks_port_flags", "ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth");



// The tor_path is relative to the application directory. On Linux and

// Windows this is the Browser/ directory that contains the firefox

// executables, and on Mac OS it is the TorBrowser.app directory.

pref("extensions.torlauncher.tor_path", "");



// The torrc_path and tordatadir_path are relative to the data directory,

// which is TorBrowser-Data/ if it exists as a sibling of the application

// directory. If TorBrowser-Data/ does not exist, these paths are relative

// to the TorBrowser/ directory within the application directory.

pref("extensions.torlauncher.torrc_path", "");

pref("extensions.torlauncher.tordatadir_path", "");



// BridgeDB-related preferences (used for Moat).

pref("extensions.torlauncher.bridgedb_front", "foursquare.com");

pref("extensions.torlauncher.bridgedb_reflector", "https://moat.torproject.org.global.prod.fastly.net/");

pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat");

pref("extensions.torlauncher.bridgedb_bridge_type", "obfs4");



// Recommended default bridge type.

// pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3");



// Default bridges.

// pref("extensions.torlauncher.default_bridge.TYPE.1", "TYPE x.x.x.x:yy");

// pref("extensions.torlauncher.default_bridge.TYPE.2", "TYPE x.x.x.x:yy");

browser/installer/package-manifest.in

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ 
@RESPATH@/browser/defaults/settings/blocklists

@RESPATH@/browser/defaults/settings/main

@RESPATH@/browser/defaults/settings/security-state

@RESPATH@/browser/@PREF_DIR@/001-base-profile.js

@RESPATH@/browser/@PREF_DIR@/000-tor-browser.js



; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

; Technically this is an app pref file, but we are keeping it in the original

browser/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ if CONFIG["MOZ_ARTIFACT_BUILDS"]: 
# These files are specified in this moz.build to pick up DIST_SUBDIR as set in

# this directory, which is un-set in browser/app.

JS_PREFERENCE_PP_FILES += [

    "app/profile/001-base-profile.js",

    "app/profile/000-tor-browser.js",

    "app/profile/firefox.js",

]

FINAL_TARGET_FILES.defaults += ["app/permissions"]

mobile/android/app/000-tor-browser-android.js

0 → 100644
+37 −0
Original line number Diff line number Diff line 
// Import all prefs from the canonical file

// We override mobile-specific prefs below

// Tor Browser for Android

// Do not edit this file.



#include ../../../browser/app/profile/000-tor-browser.js



// Disable browser auto updaters

pref("app.update.auto", false);

pref("browser.startup.homepage_override.mstone", "ignore");



// Clear data on quit

pref("privacy.clearOnShutdown.cache", true);

pref("privacy.clearOnShutdown.cookies", true);

pref("privacy.clearOnShutdown.downloads", true);

pref("privacy.clearOnShutdown.formdata", true);

pref("privacy.clearOnShutdown.history", true);

pref("privacy.clearOnShutdown.offlineApps", true);

pref("privacy.clearOnShutdown.passwords", true);

pref("privacy.clearOnShutdown.sessions", true);

pref("privacy.clearOnShutdown.siteSettings", true);



// controls if we want camera support

pref("media.realtime_decoder.enabled", false);



// Enable touch events on Android (highlighting text, etc)

pref("dom.w3c_touch_events.enabled", 2);



// No HLS support for now due to browser freezing, see: #29859.

pref("media.hls.enabled", false);



// Disable WebAuthn. It requires Google Play Services, so it isn't

// available, but avoid any potential problems.

pref("security.webauth.webauthn_enable_android_fido2", false);



// Disable the External App Blocker on Android

pref("extensions.torbutton.launch_warning", false);