This reverts commit d70b3e8a17aa734177d072c26d2ad68dd07a3189.

Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine.

Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services:

• HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure
• HTTP Onion Service pages would be marked as unencrypted in the Page Info screen
• Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content

This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.

Strings for Onion Service Page Info page are pulled from Torbutton's localization strings.

This patch adds a new 'securitylevel' component to Tor Browser intended to replace the torbutton 'Security Slider'.

This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings.

Strings used by this patch are pulled from the torbutton extension, but en-US defaults are provided if there is an error loading from the extension. With this patch applied, the usual work-flow of "./mach build && ./mach run" work as expected, even if the torbutton extension is disabled.

• Updated all of the branding in /browser/branding/official with new 'stable' icon series.
• Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory
• Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654)
• Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory
• Updated content/identity-icons-brand.svg with Tor Browser icon (fixes #28111)
• Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico)
• Added default256.png and default512.png icons
• Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon

Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string.

Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions.

We need to have new MAR singning keys for our watershed update: both keys we shipped so far need to get replaced by news ones, now using SHA-384 as their hash algorithm.

Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS.

The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome.

Only ship the pdfjs extension.

In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's RESOLVED FIXED(Fx52), Blocks: 1299627, 1299694, 1528884
Remove MOZ_EME build option and make EME disabled by preferences.bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past.

In Mozilla RESOLVED FIXED(Fx53), Blocks: 1313097
Build of Firefox Aurora 52.0b2 fails on CentOS 6 with '--enable-default-toolkit=cairo-gtk2'bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths.

This is due to an improper implementation of the WebSocket spec by Mozilla.

"There MUST be no more than one connection in a CONNECTING state. If multiple connections to the same IP address are attempted simultaneously, the client MUST serialize them so that there is no more than one connection at a time running through the following steps.

If the client cannot determine the IP address of the remote host (for example, because all communication is being done through a proxy server that performs DNS queries itself), then the client MUST assume for the purposes of this step that each host name refers to a distinct remote host,"

https://tools.ietf.org/html/rfc6455#page-15

They implmented the first paragraph, but not the second...

While we're at it, we also prevent the DNS service from being used to look up anything other than IP addresses if socks_remote_dns is set to true, so this bug can't turn up in other components or due to 3rd party addons.

eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed.

Also: FeatureUX
Use duckduckgo hidden service instead of clearnet oneBug 16322: Update DuckDuckGo search engine

We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to VERIFIED FIXED(Fx36), Blocks: 1073292
Add DuckDuckGo to default search engine listbug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well.

Also: This fixes FeatureUX
Use non-/html search engine URL for DuckDuckGo search pluginsbug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly.

Also fixes Bug
build1 for Tor Browser 8.5a9 is broken in mobile packaging stepbug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for.

Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release).

Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts.

Also fix TaskUXUpdater
Update about:tor when Tor Browser is updatedbug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor.

When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser.

Add an --enable-tor-browser-data-outside-app-dir configure option. When this is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory.

Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error.

On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock.

Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior.

This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile.

By setting the URL to "" we make sure that already installed system addons get deleted as well.

When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box).

For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request.

Other bugs fixed: Bug
Tor Browser based on ESR52 with e10s enabled crashed while trying to download a fileBug 21766: Crash with e10s enabled while trying to download a file BugUX
Downloading of binary files stalls at 0/0 bytes in Tor Browser based on ESR52 with e10s offBug 21886: Download is stalled in non-e10s mode Bug
Downloading pdf files with the download button in the pdf viewer is stallingBug 22471: Downloading files via the PDF viewer download button is broken Bug
Handle downloads via FTP better when external helper app dialog is shownBug 22472: Fix FTP downloads when external helper app dialog is shown Bug
Tor Browser 7 crashes when cancelling downloads on the external helper app warningBug 22610: Avoid crashes when canceling external helper app downloads Bug
Downloading pdf file via file:/// is stalling if the external helper dialog is enabledBug 22618: Downloading pdf file via file:/// is stalling

Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1.

See also Bugs #5194, #7187, #8115, #8219.

This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons.

Also fix BugUX
many occurrences of "Firefox" in about:preferencesbug 27905.

To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts.

Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system".

It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident.

This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details.

Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it.

The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421

We do not want to encourage our users to enable plugins at this point.

The barrier also causes bad UX for HTML5 video fallback on YouTube.

We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space and/or executing code (for example, AV plugins that collect statistics/analyse urls, magical toolbars that phone home or "help" the user, skype buttons that ruin our day, and censorship filters). Hence we rolled our own.

See https://trac.torproject.org/projects/tor/ticket/3547#comment:6 for musings on a better way. Until then, it is delta-darwinism for us.

Feature
Circuit display - Let's remove link from the Tor ButtonBug 26321: New Circuit and New Identity menu items

Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time.

Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time.

Additionally, this patch also fixes AndroidBug
Restart Gecko after first-runBug 27611.

Build and package Tor Launcher as part of the browser (similar to how pdfjs is handled).

The --disable-tor-launcher build option may be used to omit Tor Launcher.

If a Tor Launcher extension is present in the user's profile, it is removed.

Mozilla introduced extension signing as a way to make it harder for an attacker to get a malicious add-on running in a user's browser. See: https://blog.mozilla.org/addons/2015/02/10/extension-signing-safer-experience and https://blog.mozilla.org/addons/2016/01/22/add-on-signing-update/ for some background information.

In ESR45 this feature is enabled by default and we exempt both our own extensions and EFF's HTTPS-Everywhere from this requirement.

Note: many more functional tests could be made here

This hack directly includes our preference changes in omni.ja.

Apps::Impact::NoneApps::Type::BugBugDesktopRoadmap::FutureUpdaterWindows
staged updates fail on WindowsBug 18292: Staged updates fail on Windows

Temporarily disable staged updates on Windows.

BugLinkability
asm.js files should be no linkability riskBug 19417: Disable asmjs for now

BugSecurity Settings
consider blocking remote jar files at Low SecurityBug 20123: Always block remote jar files

BugFingerprinting
Tor browser uses Chinese-style glyphs to display JapaneseBug 18297: Use separate Noto JP,KR,SC,TC fonts

BugFingerprinting
Noto Sans Buginese missing from macOS font whitelistBug 23404: Add Noto Sans Buginese to the macOS whitelist

Bug
Tab crashes when using Tor Browser to access Google DriveBug 23745: Set dom.indexedDB.enabled = true

BugFingerprintingFirst Contribution
Disable randomised Firefox HTTP cache decay user test groupsBug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera@riseup.net>)

Bug
remove obsolete HTTP pipelining prefsBug 26603: Remove obsolete http pipelining prefs

FeatureLinkabilityPerformance
Confirm TLS session resumption/ID are isolated to the URL bar domain, and re-enable themBug 17252: Enable session identifiers with FPI

Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers".

The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049)

LinkabilityPerformanceTaskUX
Audit HTTP/2 and SPDY if neededBug 14952: Enable http/2 and AltSvc

In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2".

Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well.

(All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.)

However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false.

"network.http.spdy.enabled.http2draft" was removed in RESOLVED FIXED(Fx41), [spdy]
remove h2-draft support starting in gecko-40Bug 1132357. "network.http.sped.enabled.v2" was removed in VERIFIED FIXED(Fx27)
remove spdy/2 supportBug 912550. "network.http.sped.enabled.v3" was removed in RESOLVED FIXED(Fx36), spdy
kill spdy/3Bug 1097944. "network.http.sped.enabled.v3-1" was removed in RESOLVED FIXED(Fx51), Blocks: 912549, [necko-active]
remove spdy/3.1 supportBug 1248197.

FingerprintingTask
Adapt to upstreamed AddonManager changesBug 26114: addons.mozilla.org is not special

• Don't expose navigator.mozAddonManager on any site
• Don't block NoScript from modifying addons.mozilla.org or other sites

Bug
Remove more HTTP pipelining preferencesBug 27262: Remove leftover HTTP pipelining preferences The prefs were removed from Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1340655

AndroidBugBugSmashFundFingerprinting
In Tor Browser prefs, "dom.network.enabled" should have been "dom.netinfo.enabled"Bug 27257: Remove obsolete pref "dom.network.enabled" (The API is disabled under privacy.resistFingerprinting.)

Bug
preferences cleanupBug 27268: Remove references to obsolete prefs. Removed prefs are: browser.usedOnWindows10 browser.selfsupport.enabled browser.selfsupport.url browser.newtabpage.directory.ping browser.newtabpage.directory.source browser.newtabpage.enhanced browser.newtabpage.introShown browser.newtabpage.remote plugin.expose_full_path plugins.hide_infobar_for_missing_plugin plugins.hideMissingPluginsNotification dom.mozTCPSocket.enabled

Enable ReaderView mode again (#27281).

BugProxy Bypass
Group Policies for Firefox can bypass Tor Browser's proxy settingsBug 29916: Make sure enterprise policies are disabled

MikePerry201408RMikePerryIterationFires20110529actualpoints::1backport-to-mozillacomponent::firefox patch issuesowner::mikeperrypoints::4priority::mediumresolution::fixedseverity::blockerstatus::closedtbb-no-uplift-60type::enhancement
Block access to Components.interfaces from content scriptBug 2874: Block Components.interfaces from content

BugBugSmashFundFingerprinting
Setting general.useragent.override does not spoof the platform part anymore in ESR 60 which is confusingBug 26146: Spoof HTTP User-Agent header for desktop platforms

In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs.

BugUX
Windows Jump Lists fail for Tor BrowserBug 12885: Windows Jump Lists fail for Tor Browser

Jumplist entries are stored in a binary file in: %APPDATA%\Microsoft\Windows\Recent\CustomDestinations
and has a name in the form [a-f0-9]+.customDestinations-ms

The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller.

However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past.

The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted.

Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See Apps::Impact::MinimalApps::Type::BugBugDisk LeakRoadmap::FutureWindows
Tor Browser on Windows creates a file in %APPDATA%\Microsoft\Windows\Recent\CustomDestinations containing the Tor Browser install locationbug 28996.

Also: MikePerry201312Rcomponent::applications/tor bundles/installationff24-esrowner::erinnparent::10103priority::mediumresolution::fixedstatus::closedtbb-3.0type::defect
Firefox ESR 24 does need a newer compiler than gcc 4.2Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit component::applications/tor bundles/installationowner::erinnparent::12460priority::mediumresolution::fixedstatus::closedtbb-3.5tbb-usabilitytype::defect
Cross-Compiling WebGL with mingw-w64 is brokenBug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug
Enable ICU for OS X Tor Browser buildsBug 15773: Enable ICU on OS X Task
Get Windows cross-compilation working with Fx38 in GitianBug 15990: Don't build the sandbox with mingw-w64 Task
Switch to OS X 10.7 SDK in our Tor Browser Mac buildsBug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan FeatureSecurity
Compile Tor Browser with -fwrapv/-fno-strict-overflowBug 12516: Compile hardenend Tor Browser with -fwrapv Task
Update OS X toolchain to work with ESR 45Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X BugSecurity
Creating incremental MAR files for the hardened builds is brokenBug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Task
Fix cross-compiling ICU with mingw-w64 for Windows buildsBug 13419: Add back ICU for Windows Bug
Adapt Linux Firefox descriptor for ESR 52Bug 21239: Use GTK2 for ESR52 Linux builds Bug
Flags to increase hardening on macOSBug 23025: Add hardening flags for macOS Bug
Enable tests and debug assertions in our ASan buildsBug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug
ASan build option in tor-browser-build is brokenBug 27597: ASan build option in tor-browser-build is broken

Bug
wrong default pref values in Tor Browser 8.0Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds

This fixes a problem where some preferences had the wrong default value. Also see AndroidFeature
TBA: Add export MOZILLA_OFFICIALbug 27472 where we made a similar fix for Android.