- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit 8ac83f77ae144a3063c57099c250a340fd4bf0ac Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Sep 25 07:50:28 2018 +0000 Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug This patch makes the docshell not to report an error if it is a unknown protocol error. However, we will still display the error page in this case. Differential Revision: https://phabricator.services.mozilla.com/D3492 --HG-- extra : moz-landing-system : lando --- docshell/base/nsDocShell.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 120b8c8b880b..e95855dd3e9f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -10486,6 +10486,13 @@ nsDocShell::InternalLoad(nsIURI* aURI, (aFlags & LOAD_FLAGS_ERROR_LOAD_CHANGES_RV) != 0) { return NS_ERROR_LOAD_SHOWED_ERRORPAGE; } + + // We won't report any error if this is an unknown protocol error. The reason + // behind this is that it will allow enumeration of external protocols if + // we report an error for each unknown protocol. + if (NS_ERROR_UNKNOWN_PROTOCOL == rv) { + return NS_OK; + } } return rv;

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit d098b183150a7feb83f159ad731fc42537252863 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Sep 24 18:22:26 2018 +0000 Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth The suppressing of the error NS_ERROR_UNKNOWN_PROTOCOL will break the web-platform-test 'windowclient-navigate.https.html' since navigating to an invalid view-source url through the client API won't receive any error due to the suppressing. So the test will time-out since it waits for an error. While navigating to an invalid view-source url with its inner url as relative, this will pass the validity check we have right now and do the navigation because of it takes account the baseURL while doing the check. The invalid view-source url will be resolved into a valid view-source url in the case. Fortunately, we won't encounter any issue in the test in the past since the docShell will block this loading because it's loading a view-source url inside an iframe and reports a NS_ERROR_UNKNOWN_PROTOCOL error. But, we should faild with a NS_ERROR_MALFORMED_URI error when doing the URL validity check. For addressing this, this patch makes the client.navigate to not take the baseURL into account if it is a view-source URL. Differential Revision: https://phabricator.services.mozilla.com/D6587 --HG-- extra : moz-landing-system : lando --- dom/clients/manager/ClientNavigateOpChild.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dom/clients/manager/ClientNavigateOpChild.cpp b/dom/clients/manager/ClientNavigateOpChild.cpp index b6a8e70b7356..1e6cc50da41d 100644 --- a/dom/clients/manager/ClientNavigateOpChild.cpp +++ b/dom/clients/manager/ClientNavigateOpChild.cpp @@ -15,6 +15,7 @@ #include "nsIWebProgressListener.h" #include "nsNetUtil.h" #include "nsPIDOMWindow.h" +#include "nsURLHelper.h" namespace mozilla { namespace dom { @@ -185,8 +186,24 @@ ClientNavigateOpChild::DoNavigate(const ClientNavigateOpConstructorArgs& aArgs) return ref.forget(); } + // There is an edge case for view-source url here. According to the wpt test + // windowclient-navigate.https.html, a view-source URL with a relative inner + // URL should be treated as an invalid URL. However, we will still resolve it + // into a valid view-source URL since the baseURL is involved while creating + // the URI. So, an invalid view-source URL will be treated as a valid URL + // in this case. To address this, we should not take the baseURL into account + // for the view-source URL. + bool shouldUseBaseURL = true; + nsAutoCString scheme; + if (NS_SUCCEEDED(net_ExtractURLScheme(aArgs.url(), scheme)) && + scheme.LowerCaseEqualsLiteral("view-source")) { + shouldUseBaseURL = false; + } + nsCOMPtr<nsIURI> url; - rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), nullptr, baseURL); + rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), + nullptr, shouldUseBaseURL ? baseURL.get() + : nullptr); if (NS_FAILED(rv)) { ref = ClientOpPromise::CreateAndReject(rv, __func__); return ref.forget();

1 0

[tor-browser-build/master] Fold in stable changelogs
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit 5362bd07f5f712fdf3a799b8e1d3905bdfa3d842 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 9 09:40:28 2018 +0000 Fold in stable changelogs --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 94ab254..54ebd96 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -7,6 +7,13 @@ Tor Browser 8.5a3 -- October 4 2018 * OS X * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility +Tor Browser 8.0.2 -- October 2 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.5a2 -- September 24 2018 * All platforms * Update Tor to 0.3.5.2-alpha @@ -41,6 +48,35 @@ Tor Browser 8.5a2 -- September 24 2018 * Bug 27552: Use bundled dir on CentOS/RHEL 6 * Bug 26556: Fix broken Tor Browser icon path on Linux +Tor Browser 8.0.1 -- September 24 2018 + * All platforms + * Update Tor to 0.3.4.8 + * Update Torbutton to 2.0.7 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages + * Bug 27558: Update the link to "Your Guard note may not change" text + * Translations update + * Update Tor Launcher to 0.2.16.6 + * Bug 27469: Adapt Moat URLs + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * Backport of Mozilla bug 1490585, 1475775, and 1489744 + * OS X + * Bug 27482: Fix crash during start-up on macOS 10.9.x systems + * Linux + * Bug 26556: Fix broken Tor Browser icon path on Linux + Tor Browser 8.5a1 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr

1 0

[torbutton/master] Bug 27959: 2018 Donation banner text ready for translation
by gk＠torproject.org 08 Oct '18

08 Oct '18

commit 9ad95c9170ad55cb4bddb2d4b226080966f8542f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 5 10:21:45 2018 -0700 Bug 27959: 2018 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.dtd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 1400d7b5..6efb202e 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[tor-browser-build/master] Release preparations for 8.5a3
by gk＠torproject.org 02 Oct '18

02 Oct '18

commit 0e0cb78f2d1625047a5800b16c23289fa7b28403 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 2 20:25:35 2018 +0000 Release preparations for 8.5a3 --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ rbm.conf | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 89e5ce6..d79eec3 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.0 + firefox_platform_version: 60.2.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9cd6c3f..94ab254 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 8.5a3 -- October 4 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * Windows + * Bug 27865: Tor Browser 8.5a2 is crashing on Windows + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.5a2 -- September 24 2018 * All platforms * Update Tor to 0.3.5.2-alpha diff --git a/rbm.conf b/rbm.conf index 0723a42..d7f1420 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a2' - torbrowser_build: 'build3' + torbrowser_version: '8.5a3' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a1 + - 8.5a2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 27865: Tor Browser 8.5a2 is crashing on Windows
by gk＠torproject.org 02 Oct '18

02 Oct '18

commit 49eb43da16695c8fce31129f3499a8258761025a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 2 03:04:05 2018 +0000 Bug 27865: Tor Browser 8.5a2 is crashing on Windows We disable the usage of MOZILLA_OFFICIAL again for Windows platforms as Tor Browser is crashing otherwise. The underlying reason is likely the same as in https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 07e8851..a5e15f1 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 1665005..e7f857d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 27865: Fix start-up crashes on Windows
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 06750f24d6c10d12158d2402361e3ce71d8493e1 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 30 17:53:00 2018 +0000 Bug 27865: Fix start-up crashes on Windows Don't bind --enable-release to MOZILLA_OFFICIAL for Windows targets as we are currently crashing on start-up for unknown reasons if --enable-release is set, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- build/moz.configure/toolchain.configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 67007c8dcf7c..008193c6c945 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,8 +1382,10 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) - -imply_option('--enable-release', mozilla_official) +if target.os != 'WINNT': + imply_option('--enable-release', mozilla_official) +else: + imply_option('--enable-release', False) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 34bcbdca41c7949318930b44b504e88696d0aeee Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 0c004047822a94a6e16851a9f46d237be10eebce Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 50e3be5d0c750483f8e2367cb8b8e0c3c26bba11 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0