- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-2] Pick up latest Torbutton changes
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 3c4e7292004b11e7f1dcd12dba6d3fd40edf0594 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 15:56:18 2019 +0000 Pick up latest Torbutton changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 903d676ccf33..2abe720e3f1d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 903d676ccf33e36938438a595b71e781ef13bbe1 +Subproject commit 2abe720e3f1dbe1b49b41fe78719f318407babd0

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] libssp test
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 23 09:38:13 2019 +0000 libssp test --- build/moz.configure/toolchain.configure | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 68364075f006..3bcf403bceec 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1676,12 +1676,10 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target # Enable only if hardening is not disabled and ASAN is # not on as ASAN will catch the crashes for us if compiler_is_gccish and not asan: - # mingw-clang cross-compile toolchain has bugs with stack protector - if target.os != 'WINNT' or c_compiler == 'gcc': - flags.append("-fstack-protector-strong") - ldflags.append("-fstack-protector-strong") - js_flags.append("-fstack-protector-strong") - js_ldflags.append("-fstack-protector-strong") + flags.append("-fstack-protector-strong") + ldflags.append("-fstack-protector-strong") + js_flags.append("-fstack-protector-strong") + js_ldflags.append("-fstack-protector-strong") # ASLR ------------------------------------------------ # ASLR (dynamicbase) is enabled by default in clang-cl; but the

1 0

[torbutton/master] Bug 30943: Show version number on mobile
by gk＠torproject.org 23 Sep '19

23 Sep '19

commit 2abe720e3f1dbe1b49b41fe78719f318407babd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 18 20:45:14 2019 +0000 Bug 30943: Show version number on mobile --- chrome/skin/aboutTor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index baa92b42..555d1742 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -312,7 +312,7 @@ body:not([showmanual]) .showForManual { display: none; } -body[mobile] #torbrowser-info, +body[mobile] #torbrowser-changelog-link, body[mobile] .searchbox, body[mobile] .top .heading2, body[mobile] #manual,

1 0

[tor-launcher/master] Bug 31491: clean up the old meek http helper browser profiles
by gk＠torproject.org 22 Sep '19

22 Sep '19

commit d78a233bc597c8df63e794f880a1a7f54fb9cebd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 16:01:42 2019 -0400 Bug 31491: clean up the old meek http helper browser profiles On macOS, remove the old meek and moat http helper browser profiles that may be present under TorBrowser-Data/Tor/PluggableTransports/. Removal is only attempted once; this is controlled by the Boolean pref extensions.torlauncher.should_remove_meek_helper_profiles. --- src/components/tl-process.js | 2 ++ src/defaults/preferences/torlauncher-prefs.js | 7 ++++++ src/modules/tl-util.jsm | 36 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3aa45e4..49abc0a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -112,6 +112,8 @@ TorProcessService.prototype = Cr.NS_ERROR_NOT_INITIALIZED); } + TorLauncherUtil.removeMeekAndMoatHelperProfiles(); + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); diff --git a/src/defaults/preferences/torlauncher-prefs.js b/src/defaults/preferences/torlauncher-prefs.js index cc6b1a7..55fe38c 100644 --- a/src/defaults/preferences/torlauncher-prefs.js +++ b/src/defaults/preferences/torlauncher-prefs.js @@ -5,6 +5,13 @@ pref("extensions.torlauncher.prompt_for_locale", true); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); +// This pref controls whether Tor Launcher will try to remove the old +// meek and moat http helper browser profiles. This only has an effect +// on macOS; for Windows and Linux profile removal is handled by the +// updater (since on those platforms the profiles are embedded within +// the browser install directory). +pref("extensions.torlauncher.should_remove_meek_helper_profiles", true); + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 14ac76f..c54acb9 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -758,6 +758,42 @@ let TorLauncherUtil = // Public } } catch(e) {} }, + + removeMeekAndMoatHelperProfiles: function() + { + function removeDirectory(aParentDir, aName) + { + try + { + let dir = aParentDir.clone(); + dir.appendRelativePath(aName); + if (dir.exists()) + dir.remove(true); + } + catch (e) + { + TorLauncherLogger.log(5, "Failed to remove " + aName + ": " + e); + } + } + + const kPrefRemoveHelperProfiles = + "extensions.torlauncher.should_remove_meek_helper_profiles"; + if (this.getBoolPref(kPrefRemoveHelperProfiles, false)) + { + // Only attempt removal once. + this.setBoolPref(kPrefRemoveHelperProfiles, false); + + if (this.isMac) + { + let ptProfilesDir = this.getTorFile("pt-profiles-dir", true); + if (ptProfilesDir) + { + removeDirectory(ptProfilesDir, "profile.meek-http-helper"); + removeDirectory(ptProfilesDir, "profile.moat-http-helper"); + } + } + } + }, };

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31491: clean up the old meek http helper browser profiles
by gk＠torproject.org 22 Sep '19

22 Sep '19

commit e0b00a89e00e8f808c8d36e1f792e96d3d3a0f7c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 14:59:45 2019 -0400 Bug 31491: clean up the old meek http helper browser profiles On Linux and Windows, arrange for the updater to remove the old meek and moat http helper profiles by adding appropriate directives to browser/installer/removed-files.in (on macOS, the cleanup will be done by Tor Launcher). --- browser/installer/removed-files.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 5d642d296ad8..732caf50db73 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -8,6 +8,20 @@ # file and directory removals automatically so this file should not be used in # the vast majority of cases. +#ifndef XP_MACOSX +# Tor Browser no longer uses http helper profiles for meek and moat. +# For macOS, the profiles are created under TorBrowser-Data and +# Tor Launcher takes care of removing them during browser startup. +# For Linux and Windows, the profiles were embedded in the install +# directory and, if meek or moat was ever used, extra files that +# were not part of the browser package will have been created within +# the profile directories. The following two lines cause "rmrfdir" +# directives to be added to our MAR files to cause the updater to +# recursively remove these profile directories and everything in them. +TorBrowser/Data/Browser/profile.meek-http-helper/* +TorBrowser/Data/Browser/profile.moat-http-helper/* +#endif + # When to use removed-files.in file to remove files and directories: # * Empty directories that were accidentally added to the installation # directory.

1 0

[tor-browser-build/master] Bug 31646: Update abicheck to require GLIBCXX_3.4.25
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit b16662aad8d9932819fea73746860ce9d8c711a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 19 19:13:25 2019 +0200 Bug 31646: Update abicheck to require GLIBCXX_3.4.25 This is also fixing bug 31380. --- projects/firefox/abicheck.cc | 40 ++++++++++++++-------------------------- projects/gcc/config | 3 +++ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index cbecafa..ba5f858 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -1,35 +1,23 @@ /* * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found - * This program is borrowed from - * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in - * determining the latest C++ ABI. Specifically this program requires - * `GLIBCXX_3.4.22` which we use to compare the version of the installed - * libstdc++.so.6 and the bundled version. If the program executes - * successfully, that means we should use the system version of libstdc++.so.6 - * and if not, that means we should use the bundled version. + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * This program is useful in determining if the libstdc++.so.6 installed + * on the system is recent enough. Specifically this program requires + * `GLIBCXX_3.4.25` which should be provided by libstdc++.so.6 from + * gcc >= 8.0.0. If the program executes successfully, that means we + * should use the system version of libstdc++.so.6 and if not, that means + * we should use the bundled version. + * + * We use std::random_device::entropy() in order to require GLIBCXX_3.4.25: + * https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/libstdc%2B%2B-v3/c… */ #include <iostream> -#include <exception> -#include <stdexcept> - -struct Foo { - int count = std::uncaught_exceptions(); - ~Foo() { - std::cout << (count == std::uncaught_exceptions() - ? "~Foo() called normally\n" - : "~Foo() called during stack unwinding\n"); - } -}; +#include <random> int main() { - Foo f; - try { - Foo f; - std::cout << "Exception thrown\n"; - throw std::runtime_error("test exception"); - } catch (const std::exception& e) { - std::cout << "Exception caught: " << e.what() << '\n'; - } + std::random_device rd; + std::cout << "entropy: " << rd.entropy() << std::endl; + return 0; } diff --git a/projects/gcc/config b/projects/gcc/config index d776a2c..a56089a 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,5 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +# Note: When updating the gcc version, if this includes a libstdc++ +# ABI change we should also update projects/firefox/abicheck.cc to +# require the new version. version: 8.3.0 var: container:

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit f970a6e8a14d8f80f15be22fa1ed6b091b4d596b Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Fri Jun 14 15:49:25 2019 +0000 Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen Differential Revision: https://phabricator.services.mozilla.com/D35033 --HG-- extra : moz-landing-system : lando --- browser/modules/PermissionUI.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm index a45c551e1b8f..58a2f293c714 100644 --- a/browser/modules/PermissionUI.jsm +++ b/browser/modules/PermissionUI.jsm @@ -569,8 +569,8 @@ var PermissionPromptPrototype = { if (PrivateBrowsingUtils.isBrowserPrivate(browser)) { scope = SitePermissions.SCOPE_SESSION; } - SitePermissions.set( - principal.URI, + SitePermissions.setForPrincipal( + principal, this.permissionKey, promptAction.action, scope

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1568521 Tracking protection doorhanger's Enable/Disable states don't work r=VladBaicu
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit c6eb1efb7d3ca6a9b5e19f6ec352ee1b129efbd3 Author: Andrei Lazar <andrei.a.lazar(a)softvision.ro> Date: Wed Jul 24 16:00:32 2019 +0000 Bug 1568521 Tracking protection doorhanger's Enable/Disable states don't work r=VladBaicu Now using lastURI instead of principal and now we are using the right functions in order to test permissions. Differential Revision: https://phabricator.services.mozilla.com/D39190 --HG-- extra : moz-landing-system : lando --- mobile/android/chrome/content/PermissionsHelper.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/android/chrome/content/PermissionsHelper.js b/mobile/android/chrome/content/PermissionsHelper.js index b25920872635..39556e756c84 100644 --- a/mobile/android/chrome/content/PermissionsHelper.js +++ b/mobile/android/chrome/content/PermissionsHelper.js @@ -145,6 +145,7 @@ var PermissionsHelper = { * @return A permission value defined in nsIPermissionManager. */ getPermission: function getPermission(aPrincipal, aType) { + let aURI = BrowserApp.selectedBrowser.lastURI; // Password saving isn't a nsIPermissionManager permission type, so handle // it seperately. if (aType == "password") { @@ -164,10 +165,10 @@ var PermissionsHelper = { // Geolocation consumers use testExactPermissionForPrincipal if (aType == "geolocation") { - return Services.perms.testExactPermissionForPrincipal(aPrincipal, aType); + return Services.perms.testExactPermissionFromPrincipal(aPrincipal, aType); } - return Services.perms.testPermissionForPrincipal(aPrincipal, aType); + return Services.perms.testPermissionFromPrincipal(aPrincipal, aType); }, /**

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit 87b3cdb0862a4912b0c3318ad63954dbf42bc774 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 10:46:05 2019 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- browser/app/profile/000-tor-browser.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b2cecfdb1a82..10c31084adcc 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -23,12 +23,13 @@ pref("app.update.badge", true); pref("app.update.notifyDuringDownload", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues -// Disable staged updates on all platforms. +#ifndef XP_MACOSX +// Disable staged updates on platforms other than macOS. // Staged updates do not work on Windows due to #18292. // Also, on Windows and Linux any changes that are made to the browser profile // or Tor data after an update is staged will be lost. -// What about macOS? For consistency, we disable staged updates there too. pref("app.update.staging.enabled", false); +#endif // No need to contact the Kinto-based blocklist system in addition to the old // one which is still used, see bug 22071.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! Bug 13379: Sign our MAR files.
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit 74c3ea2d5152e3687cb9026c93cdd043e90beb76 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 10:34:56 2019 -0400 squash! Bug 13379: Sign our MAR files. Also includes the fix for bug 18900. --- toolkit/xre/nsUpdateDriver.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index c5e4f4260119..2e909d16abcc 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -435,7 +435,8 @@ static bool CopyUpdaterIntoUpdateDir(nsIFile* greDir, nsIFile* appDir, */ /** * Appends the specified path to the library path. - * This is used so that updater can find libmozsqlite3.so and other shared libs. + * This is used so that the updater can find libnss3.dylib and other + * shared libs. * * @param pathToAppend A new library path to prepend to the dynamic linker's * search path. @@ -731,7 +732,7 @@ static void ApplyUpdate(nsIFile* greDir, nsIFile* updateDir, nsIFile* appDir, #if defined(TOR_BROWSER_UPDATE) && defined(MOZ_VERIFY_MAR_SIGNATURE) && \ defined(MAR_NSS) && defined(XP_MACOSX) // On macOS, append the app directory to the shared library search path - // so the system can located the shared libraries that are needed by the + // so the system can locate the shared libraries that are needed by the // updater, e.g., libnss3.dylib). nsAutoCString appPath; nsresult rv2 = appDir->GetNativePath(appPath);

1 0