- tbb-commits - lists.torproject.org

[tor-launcher/master] Bug 19568: Set CurProcD for Thunderbird/Instantbird
by gk＠torproject.org 13 Jul '16

13 Jul '16

commit 44c1cc246e8736e88906c74058f2c582aa6178ed Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 4 11:59:34 2016 -0400 Bug 19568: Set CurProcD for Thunderbird/Instantbird For Thunderbird/Instantbird, the CurProcD (topDir) is not browser/, so we need to iterate one level less than Firefox. --- src/components/tl-process.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 4f9928a..8e42feb 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -31,6 +31,8 @@ TorProcessService.prototype = { kContractID : "@torproject.org/torlauncher-process-service;1", kServiceName : "Tor Launcher Process Service", + kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", + kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary. @@ -873,6 +875,14 @@ TorProcessService.prototype = // Because topDir points to Contents/Resources/browser on Mac OS, // we need to go up 3 levels. let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; + if ((appInfo.ID == this.kThunderbirdID) || + (appInfo.ID == this.kInstantbirdID)) + { + // On Thunderbird/Instantbird, the topDir is the root dir and not + // browser/, so we need to iterate one level less than Firefox. + --tbbBrowserDepth; + } + while (tbbBrowserDepth > 0) { let didRemove = (topDir.leafName != ".");

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Revert "Bug 18923: Add a script to run all Tor Browser specific tests"
by gk＠torproject.org 12 Jul '16

12 Jul '16

commit 091d27e7bea0f055410b9793f7c722178f2730df Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 12 15:06:46 2016 +0000 Revert "Bug 18923: Add a script to run all Tor Browser specific tests" This reverts commit 94d46ebdeaa375db4feff102264a768873d9fff8. The patch has not been ready yet. --- run-tbb-tests | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/run-tbb-tests b/run-tbb-tests deleted file mode 100755 index 116ef34..0000000 --- a/run-tbb-tests +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -function mochitest() { - ./mach mochitest --log-tbpl tbb-tests.log.tmp "$@" - cat tbb-tests.log.tmp >> tbb-tests.log - rm -f tbb-tests.log.tmp -} - -rm -f tbb-tests.log - -mochitest --setpref security.nocertdb=false docshell/test/test_tor_bug16620.html \ - tbb-tests -mochitest dom/base/test/test_tor_bug17207.html \ - dom/base/test/test_tor_bug15502.html \ - dom/base/test/test_tor_bug15564.html \ - dom/base/test/test_tor_bug15703.html \ - dom/events/test/test_tor_bug15646.html -mochitest dom/tests/browser/browser_tor_bug17009.js \ - netwerk/test/browser/browser_cacheFirstParty.js - -# Disabled tests: -# - #19575: Test for privacy.thirdparty.isolate fails with a timeout -# dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html - -echo ************************* -echo ************************* -echo "Summary of failed tests:" -grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Regression tests for Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by gk＠torproject.org 12 Jul '16

12 Jul '16

commit aec1680a450746fd045c54d85c77be06db008fc1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 6 09:48:25 2016 +0000 fixup! Regression tests for Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/events/test/test_tor_bug15646.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/test/test_tor_bug15646.html b/dom/events/test/test_tor_bug15646.html index 463781f..17c7d26 100644 --- a/dom/events/test/test_tor_bug15646.html +++ b/dom/events/test/test_tor_bug15646.html @@ -124,7 +124,7 @@ https://trac.torproject.org/15646 }; // Run tests asynchronously. - spawnTask(function* () { + spawn_task(function* () { for (let keyData of [allKeyData, allShiftKeyData]) { for (let resistFingerprinting of [false, true]) { let expectedShiftKey = keyData === allShiftKeyData && resistFingerprinting;

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 18923: Add a script to run all Tor Browser specific tests
by gk＠torproject.org 12 Jul '16

12 Jul '16

commit 94d46ebdeaa375db4feff102264a768873d9fff8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 27 19:39:47 2016 +0200 Bug 18923: Add a script to run all Tor Browser specific tests --- run-tbb-tests | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/run-tbb-tests b/run-tbb-tests new file mode 100755 index 0000000..116ef34 --- /dev/null +++ b/run-tbb-tests @@ -0,0 +1,28 @@ +#!/bin/bash + +function mochitest() { + ./mach mochitest --log-tbpl tbb-tests.log.tmp "$@" + cat tbb-tests.log.tmp >> tbb-tests.log + rm -f tbb-tests.log.tmp +} + +rm -f tbb-tests.log + +mochitest --setpref security.nocertdb=false docshell/test/test_tor_bug16620.html \ + tbb-tests +mochitest dom/base/test/test_tor_bug17207.html \ + dom/base/test/test_tor_bug15502.html \ + dom/base/test/test_tor_bug15564.html \ + dom/base/test/test_tor_bug15703.html \ + dom/events/test/test_tor_bug15646.html +mochitest dom/tests/browser/browser_tor_bug17009.js \ + netwerk/test/browser/browser_cacheFirstParty.js + +# Disabled tests: +# - #19575: Test for privacy.thirdparty.isolate fails with a timeout +# dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html + +echo ************************* +echo ************************* +echo "Summary of failed tests:" +grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! Regression tests for Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by gk＠torproject.org 12 Jul '16

12 Jul '16

commit a5cecbcd9f41d0c267705748e63c18d246e541ff Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 6 09:48:25 2016 +0000 fixup! Regression tests for Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/events/test/test_tor_bug15646.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/test/test_tor_bug15646.html b/dom/events/test/test_tor_bug15646.html index 463781f..17c7d26 100644 --- a/dom/events/test/test_tor_bug15646.html +++ b/dom/events/test/test_tor_bug15646.html @@ -124,7 +124,7 @@ https://trac.torproject.org/15646 }; // Run tests asynchronously. - spawnTask(function* () { + spawn_task(function* () { for (let keyData of [allKeyData, allShiftKeyData]) { for (let resistFingerprinting of [false, true]) { let expectedShiftKey = keyData === allShiftKeyData && resistFingerprinting;

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] squash! Bug 1517: Reduce precision of time for Javascript.
by gk＠torproject.org 01 Jul '16

01 Jul '16

commit f2291c41ff45ff3108ef05539fadf7fafac2e7cd Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jun 21 14:31:45 2016 -0700 squash! Bug 1517: Reduce precision of time for Javascript. Bug 19478: Prevent File API from leaking ms-resolution current time --- dom/base/File.cpp | 3 ++- dom/base/MultipartBlobImpl.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dom/base/File.cpp b/dom/base/File.cpp index 5cc20a7..694f8fb 100644 --- a/dom/base/File.cpp +++ b/dom/base/File.cpp @@ -750,7 +750,8 @@ BlobImplBase::GetLastModified(ErrorResult& aRv) { NS_ASSERTION(mIsFile, "Should only be called on files"); if (IsDateUnknown()) { - mLastModificationDate = PR_Now(); + // Round to nearest 100 ms. + mLastModificationDate = floor(PR_Now() / 100000) * 100000; } return mLastModificationDate / PR_USEC_PER_MSEC; diff --git a/dom/base/MultipartBlobImpl.cpp b/dom/base/MultipartBlobImpl.cpp index 9867142..b1e088a 100644 --- a/dom/base/MultipartBlobImpl.cpp +++ b/dom/base/MultipartBlobImpl.cpp @@ -273,7 +273,9 @@ MultipartBlobImpl::SetLengthAndModifiedDate(ErrorResult& aRv) // x.getTime() < f.dateModified.getTime() // could fail. mLastModificationDate = - lastModifiedSet ? lastModified * PR_USEC_PER_MSEC : JS_Now(); + lastModifiedSet ? lastModified * PR_USEC_PER_MSEC + // Round to nearest 100 ms + : floor(JS_Now() / 100000) * 100000; } }

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] squash! Regression tests for Bug 1517: Reduce precision of time for Javascript.
by gk＠torproject.org 01 Jul '16

01 Jul '16

commit 0f601022eee81c9a0d2fd94a59e4719163d155e4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jun 21 14:34:52 2016 -0700 squash! Regression tests for Bug 1517: Reduce precision of time for Javascript. Plus tests for File API, e.g. `new File([], "").lastModifiedDate.getTime()` --- tbb-tests/test_tor_bug1517.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tbb-tests/test_tor_bug1517.html b/tbb-tests/test_tor_bug1517.html index 67d6693..2eed53e 100644 --- a/tbb-tests/test_tor_bug1517.html +++ b/tbb-tests/test_tor_bug1517.html @@ -60,6 +60,8 @@ https://trac.torproject.org/projects/tor/ticket/1517 'canvasStream.currentTime * 1000', 'video.currentTime * 1000', 'audio.currentTime * 1000', + 'new File([], "").lastModified', + 'new File([], "").lastModifiedDate.getTime()', ]; // Loop through each timeStampCode, evaluate it, // and check if it is rounded to the nearest 100 ms.

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 01 Jul '16

01 Jul '16

commit 8cfeded9b52a1bbc93622c6dbe6ca59f987b43c0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 6 15:26:48 2016 -0700 fixup! Bug #13749.2: Regression tests for first-party isolation of cache --- netwerk/test/browser/browser_cacheFirstParty.js | 70 ++++++++++++++++--------- netwerk/test/browser/firstPartyParent.html | 1 + 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 967c597..7e66726 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -27,6 +27,8 @@ Cu.import("resource://gre/modules/LoadContextInfo.jsm", tempScope); let LoadContextInfo = tempScope.LoadContextInfo; let thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] .getService(Ci.mozIThirdPartyUtil); +let protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1"] + .getService(Ci.nsIProtocolProxyService); // __listen(target, eventType, timeoutMs, useCapture)__. // Calls addEventListener on target, with the given eventType. @@ -116,12 +118,12 @@ let privacyPref = "privacy.thirdparty.isolate", "request.html", "worker.request.html", "import.js"]; -// __checkCachePopulation(pref, numberOfDomains)__. +// __checkCachePopulation(isolate, numberOfDomains)__. // Check if the number of entries found in the cache for each // embedded file type matches the number we expect, given the // number of domains and the isolation state. -let checkCachePopulation = function* (pref, numberOfDomains) { - let expectedEntryCount = (pref === 2) ? numberOfDomains : 1; +let checkCachePopulation = function* (isolate, numberOfDomains) { + let expectedEntryCount = isolate ? numberOfDomains : 1; // Collect cache data. let data = yield cacheDataForContext(LoadContextInfo.default, 2000); data = data.concat(yield cacheDataForContext(LoadContextInfo.private, 2000)); @@ -148,17 +150,21 @@ let checkCachePopulation = function* (pref, numberOfDomains) { }; // __observeChannels(onChannel)__. -// onChannel is called for every http channel request. Returns a zero-arg stop() function. +// onChannel is called for every channel request. Returns a zero-arg stop() function. let observeChannels = function (onChannel) { - let channelObserver = { - observe: function(subject, topic, data) { - if (topic === "http-on-modify-request") { - onChannel(subject.QueryInterface(Components.interfaces.nsIHttpChannel)); - } + // We use a dummy proxy filter to catch all channels, even those that do not + // generate an "http-on-modify-request" notification, such as link preconnects. + let proxyFilter = { + applyFilter : function (aProxyService, aChannel, aProxy) { + // We have the channel; provide it to the callback. + onChannel(aChannel); + // Pass on aProxy unmodified. + return aProxy; } }; - Services.obs.addObserver(channelObserver, "http-on-modify-request", /* ownsWeak */ false); - return function () { Services.obs.removeObserver(channelObserver, "http-on-modify-request"); }; + protocolProxyService.registerChannelFilter(proxyFilter, 0); + // Return the stop() function: + return () => protocolProxyService.unregisterChannelFilter(proxyFilter); }; // __channelFirstPartyHost(aChannel)__. @@ -170,28 +176,38 @@ let channelFirstPartyHost = function (aChannel) { return thirdPartyUtil.getFirstPartyHostForIsolation(firstPartyURI); } -// The main testing function. -// Launch a Task.jsm coroutine so we can open tabs and wait for each of them to open, -// one by one. -add_task(function* () { - // Here we check to see if each channel has the correct first party assigned. - // All "thirdPartyChild" resources are loaded from a third-party - // "example.net" host, but they should all report either an "example.com" - // or an "example.org" first-party domain. +// __startObservingChannels()__. +// Checks to see if each channel has the correct first party assigned. +// All "thirdPartyChild" resources are loaded from a third-party +// "example.net" host, but they should all report either an "example.com" +// or an "example.org" first-party domain. Returns a stop() function. +let startObservingChannels = function() { let stopObservingChannels = observeChannels(function (channel) { - if (channel.originalURI.spec.contains("thirdPartyChild")) { + let originalURISpec = channel.originalURI.spec; + if (originalURISpec.contains("example.net")) { let firstPartyHost = channelFirstPartyHost(channel); - ok(firstPartyHost === "example.com" || firstPartyHost === "example.org", "first party is " + firstPartyHost); + ok(firstPartyHost === "example.com" || firstPartyHost === "example.org", "first party for " + originalURISpec + " is " + firstPartyHost); } }); + return stopObservingChannels; +}; + +// The main testing function. +// Launch a Task.jsm coroutine so we can open tabs and wait for each of them to open, +// one by one. +add_task(function* () { // Keep original pref value for restoring after the tests. let originalPrefValue = Services.prefs.getIntPref(privacyPref); // Test the pref with both values: 2 (isolating by first party) or 0 (not isolating) - for (let pref of [2, 0]) { + for (let isolate of [true, false]) { + let stopObservingChannels; + if (isolate) { + stopObservingChannels = startObservingChannels(); + } // Clear the cache. Services.cache2.clear(); // Set the pref to desired value - Services.prefs.setIntPref(privacyPref, pref); + Services.prefs.setIntPref(privacyPref, isolate ? 2 : 0); // Open test tabs let tabs = []; for (let domain of duplicatedDomains) { @@ -199,13 +215,15 @@ add_task(function* () { tabs.push(yield loadURLinNewTab("http://" + domain + ".example.org" + grandParentPage)); } // Run checks to make sure cache has expected number of entries for - // the chosen pref state. + // the chosen isolation state. let firstPartyDomainCount = 2; // example.com and example.org - yield checkCachePopulation(pref, firstPartyDomainCount); + yield checkCachePopulation(isolate, firstPartyDomainCount); // Clean up by removing tabs. tabs.forEach(tab => gBrowser.removeTab(tab)); + if (isolate) { + stopObservingChannels(); + } } - stopObservingChannels(); // Restore the pref to its original value. Services.prefs.setIntPref(privacyPref, originalPrefValue); }); diff --git a/netwerk/test/browser/firstPartyParent.html b/netwerk/test/browser/firstPartyParent.html index fa29a74..ba1248f 100644 --- a/netwerk/test/browser/firstPartyParent.html +++ b/netwerk/test/browser/firstPartyParent.html @@ -7,6 +7,7 @@ href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.link.css"> <link rel="icon" type="image/ico" href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.favicon.ico"> + <link rel="preconnect" href="http://example.net"> </head> <body> <div>firstPartyParent.html</div>

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 16998: Isolate link rel=preconnect to first party
by gk＠torproject.org 01 Jul '16

01 Jul '16

commit be96c4f788ab616d94457bcc4dd1d098b156d62c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 6 00:56:09 2016 -0700 Bug 16998: Isolate link rel=preconnect to first party --- dom/base/nsDocument.cpp | 8 +++++-- netwerk/base/nsIOService.cpp | 41 +++++++++++++++++++++++++++++---- netwerk/base/nsIOService.h | 1 + netwerk/base/nsISpeculativeConnect.idl | 11 ++++++++- netwerk/ipc/NeckoParent.cpp | 7 +++--- netwerk/ipc/NeckoParent.h | 3 ++- netwerk/ipc/PNecko.ipdl | 2 +- netwerk/protocol/http/nsHttpHandler.cpp | 27 ++++++++++++++++++---- netwerk/protocol/http/nsHttpHandler.h | 1 + 9 files changed, 84 insertions(+), 17 deletions(-) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 586e199..e7077a9 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -246,6 +246,8 @@ #include "nsISpeculativeConnect.h" +#include "ThirdPartyUtil.h" + #ifdef MOZ_MEDIA_NAVIGATOR #include "mozilla/MediaManager.h" #endif // MOZ_MEDIA_NAVIGATOR @@ -9733,10 +9735,12 @@ nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) return; } + nsCString firstPartyHost; + ThirdPartyUtil::GetFirstPartyHost(this, firstPartyHost); if (aCORSMode == CORS_ANONYMOUS) { - speculator->SpeculativeAnonymousConnect(uri, nullptr); + speculator->SpeculativeAnonymousConnectIsolated(uri, firstPartyHost, nullptr); } else { - speculator->SpeculativeConnect(uri, nullptr); + speculator->SpeculativeConnectIsolated(uri, firstPartyHost, nullptr); } } diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index ad86c95..a864d0e 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -51,6 +51,7 @@ #include "ClosingService.h" #include "ReferrerPolicy.h" #include "nsContentSecurityManager.h" +#include "ThirdPartyUtil.h" #ifdef MOZ_WIDGET_GONK #include "nsINetworkManager.h" @@ -1822,10 +1823,14 @@ IOServiceProxyCallback::OnProxyAvailable(nsICancelable *request, nsIChannel *cha nsLoadFlags loadFlags = 0; channel->GetLoadFlags(&loadFlags); + + nsCString firstPartyHost; + ThirdPartyUtil::GetFirstPartyHost(channel, firstPartyHost); + if (loadFlags & nsIRequest::LOAD_ANONYMOUS) { - speculativeHandler->SpeculativeAnonymousConnect(uri, mCallbacks); + speculativeHandler->SpeculativeAnonymousConnectIsolated(uri, firstPartyHost, mCallbacks); } else { - speculativeHandler->SpeculativeConnect(uri, mCallbacks); + speculativeHandler->SpeculativeConnectIsolated(uri, firstPartyHost, mCallbacks); } return NS_OK; @@ -1833,6 +1838,7 @@ IOServiceProxyCallback::OnProxyAvailable(nsICancelable *request, nsIChannel *cha nsresult nsIOService::SpeculativeConnectInternal(nsIURI *aURI, + const nsACString& aIsolationKey, nsIInterfaceRequestor *aCallbacks, bool aAnonymous) { @@ -1867,6 +1873,17 @@ nsIOService::SpeculativeConnectInternal(nsIURI *aURI, getter_AddRefs(channel)); NS_ENSURE_SUCCESS(rv, rv); + // If we have an isolation key, use it as the document URI for this channel. + if (!aIsolationKey.IsEmpty()) { + nsCOMPtr<nsIHttpChannelInternal> channelInternal(do_QueryInterface(channel)); + if (channelInternal) { + nsCString documentURISpec("https://"); + documentURISpec.Append(aIsolationKey); + nsCOMPtr<nsIURI> documentURI; + /* nsresult rv = */ NS_NewURI(getter_AddRefs(documentURI), documentURISpec); + channelInternal->SetDocumentURI(documentURI); + } + } if (aAnonymous) { nsLoadFlags loadFlags = 0; channel->GetLoadFlags(&loadFlags); @@ -1885,17 +1902,33 @@ nsIOService::SpeculativeConnectInternal(nsIURI *aURI, } NS_IMETHODIMP +nsIOService::SpeculativeConnectIsolated(nsIURI *aURI, + const nsACString& aIsolationKey, + nsIInterfaceRequestor *aCallbacks) +{ + return SpeculativeConnectInternal(aURI, aIsolationKey, aCallbacks, false); +} + +NS_IMETHODIMP nsIOService::SpeculativeConnect(nsIURI *aURI, nsIInterfaceRequestor *aCallbacks) { - return SpeculativeConnectInternal(aURI, aCallbacks, false); + return SpeculativeConnectInternal(aURI, EmptyCString(), aCallbacks, false); +} + +NS_IMETHODIMP +nsIOService::SpeculativeAnonymousConnectIsolated(nsIURI *aURI, + const nsACString& aIsolationKey, + nsIInterfaceRequestor *aCallbacks) +{ + return SpeculativeConnectInternal(aURI, aIsolationKey, aCallbacks, true); } NS_IMETHODIMP nsIOService::SpeculativeAnonymousConnect(nsIURI *aURI, nsIInterfaceRequestor *aCallbacks) { - return SpeculativeConnectInternal(aURI, aCallbacks, true); + return SpeculativeConnectInternal(aURI, EmptyCString(), aCallbacks, true); } void diff --git a/netwerk/base/nsIOService.h b/netwerk/base/nsIOService.h index e948ffd..308cee7 100644 --- a/netwerk/base/nsIOService.h +++ b/netwerk/base/nsIOService.h @@ -133,6 +133,7 @@ private: nsIChannel** result); nsresult SpeculativeConnectInternal(nsIURI *aURI, + const nsACString& aIsolationKey, nsIInterfaceRequestor *aCallbacks, bool aAnonymous); diff --git a/netwerk/base/nsISpeculativeConnect.idl b/netwerk/base/nsISpeculativeConnect.idl index 15d63e1..eed9570 100644 --- a/netwerk/base/nsISpeculativeConnect.idl +++ b/netwerk/base/nsISpeculativeConnect.idl @@ -8,7 +8,7 @@ interface nsIURI; interface nsIInterfaceRequestor; -[scriptable, uuid(d74a17ac-5b8a-4824-a309-b1f04a3c4aed)] +[scriptable, uuid(60cf321d-9f09-403a-b8b6-db221e6ca3a1)] interface nsISpeculativeConnect : nsISupports { /** @@ -21,6 +21,7 @@ interface nsISpeculativeConnect : nsISupports * to actually open the new channel. * * @param aURI the URI of the hinted transaction + * @param aIsolationKey the isolation key for the connection * @param aCallbacks any security callbacks for use with SSL for interfaces * such as nsIBadCertListener. May be null. * @@ -30,6 +31,14 @@ interface nsISpeculativeConnect : nsISupports void speculativeAnonymousConnect(in nsIURI aURI, in nsIInterfaceRequestor aCallbacks); + + void speculativeConnectIsolated(in nsIURI aURI, + in AUTF8String aIsolationKey, + in nsIInterfaceRequestor aCallbacks); + + void speculativeAnonymousConnectIsolated(in nsIURI aURI, + in AUTF8String aIsolationKey, + in nsIInterfaceRequestor aCallbacks); }; /** diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp index 796e78f..fa4911b 100644 --- a/netwerk/ipc/NeckoParent.cpp +++ b/netwerk/ipc/NeckoParent.cpp @@ -728,15 +728,16 @@ NeckoParent::DeallocPRemoteOpenFileParent(PRemoteOpenFileParent* actor) } bool -NeckoParent::RecvSpeculativeConnect(const URIParams& aURI, const bool& aAnonymous) +NeckoParent::RecvSpeculativeConnect(const URIParams& aURI, const bool& aAnonymous, + const nsCString& aIsolationKey) { nsCOMPtr<nsISpeculativeConnect> speculator(gIOService); nsCOMPtr<nsIURI> uri = DeserializeURI(aURI); if (uri && speculator) { if (aAnonymous) { - speculator->SpeculativeAnonymousConnect(uri, nullptr); + speculator->SpeculativeAnonymousConnectIsolated(uri, aIsolationKey, nullptr); } else { - speculator->SpeculativeConnect(uri, nullptr); + speculator->SpeculativeConnectIsolated(uri, aIsolationKey, nullptr); } } diff --git a/netwerk/ipc/NeckoParent.h b/netwerk/ipc/NeckoParent.h index 508ab6f..900328c 100644 --- a/netwerk/ipc/NeckoParent.h +++ b/netwerk/ipc/NeckoParent.h @@ -167,7 +167,8 @@ protected: const uint32_t& flags, const nsCString& aNetworkInterface) override; virtual bool DeallocPDNSRequestParent(PDNSRequestParent*) override; - virtual bool RecvSpeculativeConnect(const URIParams& aURI, const bool& aAnonymous) override; + virtual bool RecvSpeculativeConnect(const URIParams& aURI, const bool& aAnonymous, + const nsCString& aFirstPartyHost) override; virtual bool RecvHTMLDNSPrefetch(const nsString& hostname, const uint16_t& flags) override; virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname, diff --git a/netwerk/ipc/PNecko.ipdl b/netwerk/ipc/PNecko.ipdl index 2e1f2f5..0d0c7f8 100644 --- a/netwerk/ipc/PNecko.ipdl +++ b/netwerk/ipc/PNecko.ipdl @@ -89,7 +89,7 @@ parent: URIParams fileuri, OptionalURIParams appuri); - SpeculativeConnect(URIParams uri, bool anonymous); + SpeculativeConnect(URIParams uri, bool anonymous, nsCString isolationKey); HTMLDNSPrefetch(nsString hostname, uint16_t flags); CancelHTMLDNSPrefetch(nsString hostname, uint16_t flags, nsresult reason); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index e425c22..97461fe 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -2126,13 +2126,15 @@ nsHttpHandler::Observe(nsISupports *subject, nsresult nsHttpHandler::SpeculativeConnectInternal(nsIURI *aURI, + const nsACString& aIsolationKey, nsIInterfaceRequestor *aCallbacks, bool anonymous) { + nsCString isolationKey(aIsolationKey); if (IsNeckoChild()) { ipc::URIParams params; SerializeURI(aURI, params); - gNeckoChild->SendSpeculativeConnect(params, anonymous); + gNeckoChild->SendSpeculativeConnect(params, anonymous, isolationKey); return NS_OK; } @@ -2205,26 +2207,41 @@ nsHttpHandler::SpeculativeConnectInternal(nsIURI *aURI, nsAutoCString username; aURI->GetUsername(username); - // TODO: Fix isolation for speculative connect. nsHttpConnectionInfo *ci = - new nsHttpConnectionInfo(host, port, EmptyCString(), username, nullptr, EmptyCString(), usingSSL); + new nsHttpConnectionInfo(host, port, EmptyCString(), username, nullptr, aIsolationKey, usingSSL); ci->SetAnonymous(anonymous); return SpeculativeConnect(ci, aCallbacks); } NS_IMETHODIMP +nsHttpHandler::SpeculativeConnectIsolated(nsIURI *aURI, + const nsACString& aIsolationKey, + nsIInterfaceRequestor *aCallbacks) +{ + return SpeculativeConnectInternal(aURI, aIsolationKey, aCallbacks, false); +} + +NS_IMETHODIMP nsHttpHandler::SpeculativeConnect(nsIURI *aURI, nsIInterfaceRequestor *aCallbacks) { - return SpeculativeConnectInternal(aURI, aCallbacks, false); + return SpeculativeConnectInternal(aURI, EmptyCString(), aCallbacks, false); +} + +NS_IMETHODIMP +nsHttpHandler::SpeculativeAnonymousConnectIsolated(nsIURI *aURI, + const nsACString& aIsolationKey, + nsIInterfaceRequestor *aCallbacks) +{ + return SpeculativeConnectInternal(aURI, aIsolationKey, aCallbacks, true); } NS_IMETHODIMP nsHttpHandler::SpeculativeAnonymousConnect(nsIURI *aURI, nsIInterfaceRequestor *aCallbacks) { - return SpeculativeConnectInternal(aURI, aCallbacks, true); + return SpeculativeConnectInternal(aURI, EmptyCString(), aCallbacks, true); } void diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h index 1205dad..cf15775 100644 --- a/netwerk/protocol/http/nsHttpHandler.h +++ b/netwerk/protocol/http/nsHttpHandler.h @@ -596,6 +596,7 @@ private: private: nsresult SpeculativeConnectInternal(nsIURI *aURI, + const nsACString& aIsolationKey, nsIInterfaceRequestor *aCallbacks, bool anonymous); };

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Revert "Bug 16998: Disable link rel=preconnect"
by gk＠torproject.org 01 Jul '16

01 Jul '16

commit b44b2b25bab1ebde9351c842f0ca66d2fdc87579 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 6 01:05:25 2016 -0700 Revert "Bug 16998: Disable link rel=preconnect" This reverts commit bba50a31b7c41ec4c74475ba083d23828fea8918. --- dom/base/nsDocument.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index ef6dc64..586e199 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -9704,10 +9704,6 @@ nsDocument::MaybePreLoadImage(nsIURI* uri, const nsAString &aCrossOriginAttr, void nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) { - // Tor Browser: Here we disable <link rel="preconnect"> - // See #16998. - // TODO: Isolate preconnect by first party. -/* nsCOMPtr<nsIURI> uri; if (NS_FAILED(aOrigURI->Clone(getter_AddRefs(uri)))) { return; @@ -9742,7 +9738,6 @@ nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) } else { speculator->SpeculativeConnect(uri, nullptr); } -*/ } void

1 0

[tor-browser-bundle/hardened-builds] Change STIX mirror
by gk＠torproject.org 27 Jun '16

27 Jun '16

commit 50f95dd2b3287bdbe24d29d5ee12fe36ebf9b2e8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 27 13:21:42 2016 +0000 Change STIX mirror --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1d671ff..81f8a47 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -152,7 +152,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 60d5f34..c6dad5b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -158,7 +158,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/maint-6.0] Change STIX mirror
by gk＠torproject.org 27 Jun '16

27 Jun '16

commit a048793282620c487f1d037dbe2054ecb86f345b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 27 13:20:43 2016 +0000 Change STIX mirror --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 6dbc151..6e54edd 100755 --- a/gitian/versions +++ b/gitian/versions @@ -143,7 +143,7 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Bump FIREFOX_LANG_BUILD and change STIX mirror
by gk＠torproject.org 27 Jun '16

27 Jun '16

commit d79acaf07209445b641061b09257a0ed0dd58340 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 27 13:17:42 2016 +0000 Bump FIREFOX_LANG_BUILD and change STIX mirror This should fix our broken nightly builds --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 331da1c..88394c6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Change STIX mirror
by gk＠torproject.org 27 Jun '16

27 Jun '16

commit 4dfd9fe9a0fff540bda0d0af2dc1ad9112623895 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 27 13:19:56 2016 +0000 Change STIX mirror --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 07da5cb..96e684a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ca94cef..39b3c98 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 24569ec..3a1d893 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -124,7 +124,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-launcher/master] Bug 19432: Remove special handling for Instantbird/Thunderbird
by brade＠torproject.org 24 Jun '16

24 Jun '16

commit 985b87cb1c6e6e0d70adb9279232423bd105eb4f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jun 24 12:04:39 2016 -0400 Bug 19432: Remove special handling for Instantbird/Thunderbird These applications now use the same directory structure as Tor Browser. --- src/components/tl-process.js | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ba50310..4f9928a 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -32,8 +32,6 @@ TorProcessService.prototype = kContractID : "@torproject.org/torlauncher-process-service;1", kServiceName : "Tor Launcher Process Service", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), - kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", - kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary. kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", @@ -868,30 +866,19 @@ TorProcessService.prototype = .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); let appInfo = Cc["@mozilla.org/xre/app-info;1"] .getService(Ci.nsIXULAppInfo); - if ((appInfo.ID == this.kThunderbirdID) || - (appInfo.ID == this.kInstantbirdID)) - { - // For TorBirdy and Tor Messenger the Tor Launcher extension - // directory is returned. - topDir.append("extensions"); - topDir.append(this.kTorLauncherExtPath); - } - else // Tor Browser - { - // On Linux and Windows, we want to return the Browser/ directory. - // Because topDir ("CurProcD") points to Browser/browser on those - // platforms, we need to go up one level. - // On Mac OS, we want to return the TorBrowser.app/ directory. - // Because topDir points to Contents/Resources/browser on Mac OS, - // we need to go up 3 levels. - let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; - while (tbbBrowserDepth > 0) - { - let didRemove = (topDir.leafName != "."); - topDir = topDir.parent; - if (didRemove) - tbbBrowserDepth--; - } + // On Linux and Windows, we want to return the Browser/ directory. + // Because topDir ("CurProcD") points to Browser/browser on those + // platforms, we need to go up one level. + // On Mac OS, we want to return the TorBrowser.app/ directory. + // Because topDir points to Contents/Resources/browser on Mac OS, + // we need to go up 3 levels. + let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; + while (tbbBrowserDepth > 0) + { + let didRemove = (topDir.leafName != "."); + topDir = topDir.parent; + if (didRemove) + tbbBrowserDepth--; } this.mAppDir = topDir;

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.2
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 4675811efa2cdc1d9d61a4420735d18ce1bdb417 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 15:10:50 2016 +0000 Release preparations for 6.0.2 Version bumps, Changelog update and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ gitian/versions | 4 ++-- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3fb411e..6325c23 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 6.0.2 -- June 21 + * All Platforms + * Update Torbutton to 1.9.5.5 + * Bug 19417: Clear asmjscache + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Windows + * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Linux + * Bug 19276: Disable Xrender due to possible performance regressions + Tor Browser 6.0.1 -- June 7 * All Platforms * Update Firefox to 45.2.0esr diff --git a/gitian/versions b/gitian/versions index 8bbfeb3..6dbc151 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.5.4 +TORBUTTON_TAG=1.9.5.5 HTTPSE_TAG=5.1.9 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index e7ea1a7..4e89b8a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -13,15 +13,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.0a5 - release: 6.0.1 + release: 6.0.2 versions: - 6.0.1: + 6.0.2: platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-602-released + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.2 incremental_from: - - 5.5.5 - 6.0 + - 6.0.1 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/maint-1.9.5] Release preparations for 1.9.5.5
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 752bf7244bf20141003bfd6da06aaab92be2fae7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 14:48:30 2016 +0000 Release preparations for 1.9.5.5 Changelog update, version bump --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index ecf6cba..77ba290 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.5.5 + * Bug 19417: Clear asmjscache + 1.9.5.4 * Bug 18466: Make Torbutton compatible with Firefox ESR 45 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu diff --git a/src/install.rdf b/src/install.rdf index 44affa3..ac45b1d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.4</em:version> + <em:version>1.9.5.5</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-1.9.5] Bug 19417: Clear asmjscache
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit ecc71020f6e3e6db5a2e8dc87af354cf2c86733b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 09:49:16 2016 +0000 Bug 19417: Clear asmjscache This patch clears the asmjscache (and the IndexedDB storage) on New Identity and during start-up. The latter is a suboptimal workaround we deploy until the asmjscache is Private Browsing Mode aware. InedxedDB storage is not so urgent as IndexedDB is not working in Private Browsing Mode anyway. --- src/chrome/content/torbutton.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a293c44..539bd88 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -578,6 +578,23 @@ function torbutton_init() { torbutton_update_security_slider(); } + // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we + // don't allow things saved to disk. This is an ad-hoc fix to work around + // #19417. Once this is properly solved we should remove this code again. + if (m_tb_prefs.getBoolPref("extensions.torbutton.block_disk")) { + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + } + // set panel style from preferences torbutton_set_panel_style(); @@ -1677,6 +1694,7 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions + * k. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1824,6 +1842,21 @@ function torbutton_do_new_identity() { window.alert("Torbutton: Unexpected error during cache clearing: "+e); } + torbutton_log(3, "New Identity: Clearing storage"); + + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + torbutton_log(5, "Exception on storage clearing: "+e); + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage"); if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) {

1 0

[torbutton/master] Bug 19417: Clear asmjscache
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit e264e6027a78488f9813e3796d29f52df1a189ba Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 09:49:16 2016 +0000 Bug 19417: Clear asmjscache This patch clears the asmjscache (and the IndexedDB storage) on New Identity and during start-up. The latter is a suboptimal workaround we deploy until the asmjscache is Private Browsing Mode aware. InedxedDB storage is not so urgent as IndexedDB is not working in Private Browsing Mode anyway. --- src/chrome/content/torbutton.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e0e541b..f69fd8a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -578,6 +578,23 @@ function torbutton_init() { torbutton_update_security_slider(); } + // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we + // don't allow things saved to disk. This is an ad-hoc fix to work around + // #19417. Once this is properly solved we should remove this code again. + if (m_tb_prefs.getBoolPref("extensions.torbutton.block_disk")) { + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + } + // set panel style from preferences torbutton_set_panel_style(); @@ -1677,6 +1694,7 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions + * k. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1824,6 +1842,21 @@ function torbutton_do_new_identity() { window.alert("Torbutton: Unexpected error during cache clearing: "+e); } + torbutton_log(3, "New Identity: Clearing storage"); + + let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); + try { + // This works only by setting the pref to `true` otherwise we get an + // exception and nothing is happening. + m_tb_prefs.setBoolPref("dom.quotaManager.testing", true); + Cc["@mozilla.org/dom/quota-manager-service;1"] + .getService(Ci.nsIQuotaManagerService).clear(); + } catch(e) { + torbutton_log(5, "Exception on storage clearing: "+e); + } finally { + m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test); + } + torbutton_log(3, "New Identity: Clearing Cookies and DOM Storage"); if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) {

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard"
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 6803b2f08165a02cac4621db10fc2e1d99b7b435 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 13:37:19 2016 +0000 Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard" This reverts commit fcb31773712f1e2adce790771f7978ba30056645. This fixes bug 19400. We are not affected by a buggy GCC 4.8.2. --- js/src/asmjs/Wasm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/src/asmjs/Wasm.h b/js/src/asmjs/Wasm.h index b0976d0..2777467 100644 --- a/js/src/asmjs/Wasm.h +++ b/js/src/asmjs/Wasm.h @@ -34,9 +34,7 @@ using mozilla::Move; // The ValType enum represents the WebAssembly "value type", which are used to // specify the type of locals and parameters. -// FIXME: uint8_t would make more sense for the underlying storage class, but -// causes miscompilations in GCC (fixed in 4.8.5 and 4.9.3). -enum class ValType +enum class ValType : uint8_t { I32, I64,

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard"
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 2fbfb9d9af2553b35ec9231f3923b3be49ab2549 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 13:38:23 2016 +0000 Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard" This reverts commit fcb31773712f1e2adce790771f7978ba30056645. This fixes bug 19400. We are not affected by a buggy GCC 4.8.2. --- js/src/asmjs/Wasm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/src/asmjs/Wasm.h b/js/src/asmjs/Wasm.h index b0976d0..2777467 100644 --- a/js/src/asmjs/Wasm.h +++ b/js/src/asmjs/Wasm.h @@ -34,9 +34,7 @@ using mozilla::Move; // The ValType enum represents the WebAssembly "value type", which are used to // specify the type of locals and parameters. -// FIXME: uint8_t would make more sense for the underlying storage class, but -// causes miscompilations in GCC (fixed in 4.8.5 and 4.9.3). -enum class ValType +enum class ValType : uint8_t { I32, I64,

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 979f170107821ca481870c01820d628e55d47913 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 7d0974ce3580b26f24f9363404e5d36cc584e254 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser-bundle/master] Bump Tor Browser branch used in nightlies
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit ee898eb0345f572bae8f0dca6a68ad75edeb8ce3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 11:36:37 2016 +0000 Bump Tor Browser branch used in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 815a169..331da1c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.1.0esr +FIREFOX_VERSION=45.2.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] Bug 19411: Update icon shows up even if partial updates are failing.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 15792fd075f46d2150a566bd546ec41b427f3588 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 15 14:12:45 2016 -0400 Bug 19411: Update icon shows up even if partial updates are failing. Do not show the "update badge" on the hamburger menu when the update state is "downloading" (which means fallback to a complete update is in progress). --- browser/base/content/browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0adbe61..41d72ae 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2668,6 +2668,12 @@ var gMenuButtonUpdateBadge = { }, observe: function (subject, topic, status) { + if (status == "downloading") { + // A partial update failed and a complete update is being attempted. + // Ignore (it does not make sense to show the update badge yet). + return; + } + if (status == "failed") { // Background update has failed, let's show the UI responsible for // prompting the user to update manually.

1 0