April 2016 - tbb-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds] Bug 18699: Stripping fails due to missing Browser/components
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit f4d923d05643643e20f0d8fb755278260d7c90e4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 1 07:16:19 2016 +0000 Bug 18699: Stripping fails due to missing Browser/components --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d21b342..b70d5c9 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -150,7 +150,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-bundle/master] Add further missing years in changelog
by gk＠torproject.org 24 Apr '16

24 Apr '16

commit 625231728bd29f5520c4e864d551a88094fa9da0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 24 20:42:58 2016 +0000 Add further missing years in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1681dc4..4d27e9e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -75,7 +75,7 @@ Tor Browser 5.5.4 -- March 16 2016 * Bug 18557: Exempt Graphite from the Security Slider * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 -Tor Browser 6.0a3-hardened -- March 8 +Tor Browser 6.0a3-hardened -- March 8 2016 * All Platforms * Update Firefox to 38.7.0esr * Update Tor to 0.2.8.1-alpha @@ -95,7 +95,7 @@ Tor Browser 6.0a3-hardened -- March 8 * Windows * Bug 18292: Disable staged updates on Windows -Tor Browser 6.0a3 -- March 8 +Tor Browser 6.0a3 -- March 8 2016 * All Platforms * Update Firefox to 38.7.0esr * Update Tor to 0.2.8.1-alpha

1 0

[tor-browser-bundle/master] Adding the year for the 6.0a5 changelog entry
by gk＠torproject.org 24 Apr '16

24 Apr '16

commit 028973178a31a295c73d829974bfcb3859d6201f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 24 20:34:39 2016 +0000 Adding the year for the 6.0a5 changelog entry --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4719c8b..1681dc4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0a5 -- April 27 +Tor Browser 6.0a5 -- April 27 2016 * All Platforms * Update Firefox to 45.1.0esr * Update Tor to 0.2.8.2-alpha

1 0

[tor-browser-bundle/master] Using -build2 to fix busted mingw-w64 build
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 7c8f82b43ceaa86adfc24fd825daa4ab69fd0dbb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 23 18:20:54 2016 +0000 Using -build2 to fix busted mingw-w64 build --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c6ab27d..8752e76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -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.8.2-alpha TORLAUNCHER_TAG=0.2.9.1 TORBUTTON_TAG=1.9.5.3

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 9485c82c37e30700fe7d2512296234412afe701b Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 12:37:18 2016 +0200 Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki --- widget/windows/TSFTextStore.cpp | 2 +- widget/windows/TSFTextStore.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/widget/windows/TSFTextStore.cpp b/widget/windows/TSFTextStore.cpp index 40ddf88..da88b00 100644 --- a/widget/windows/TSFTextStore.cpp +++ b/widget/windows/TSFTextStore.cpp @@ -5225,7 +5225,7 @@ TSFTextStore::SetInputContext(nsWindowBase* aWidget, if (aAction.mFocusChange != InputContextAction::FOCUS_NOT_CHANGED) { if (sEnabledTextStore) { - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); textStore->SetInputScope(aContext.mHTMLInputType, aContext.mHTMLInputInputmode); } diff --git a/widget/windows/TSFTextStore.h b/widget/windows/TSFTextStore.h index a3b7009..117a8f1 100644 --- a/widget/windows/TSFTextStore.h +++ b/widget/windows/TSFTextStore.h @@ -118,7 +118,7 @@ public: if (!sEnabledTextStore) { return; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); textStore->CommitCompositionInternal(aDiscard); } @@ -135,7 +135,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnTextChangeInternal(aIMENotification); } @@ -145,7 +145,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnSelectionChangeInternal(aIMENotification); } @@ -155,7 +155,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnLayoutChangeInternal(); } @@ -165,7 +165,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnUpdateCompositionInternal(); } @@ -175,7 +175,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnMouseButtonEventInternal(aIMENotification); }

1 0

[tor-browser-bundle/master] Bump GOPTLIB tag
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 1d68debb4d34b22ae76d1078b8f157cf4ab54e07 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 23 12:36:47 2016 +0000 Bump GOPTLIB tag --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0ba31d2..c6ab27d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -32,7 +32,7 @@ LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GOPTLIB_TAG=0.2 +GOPTLIB_TAG=0.5 MEEK_TAG=0.22-18371-2 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 16998: Disable link rel=preconnect
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit e4606f2da9c79fec5f1f8cda10869063e640af9e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 22 14:39:14 2016 -0700 Bug 16998: Disable link rel=preconnect --- dom/base/nsDocument.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index a4181ef..719c274 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -9704,6 +9704,10 @@ 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; @@ -9738,6 +9742,7 @@ nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) } else { speculator->SpeculativeConnect(uri, nullptr); } +*/ } void

1 0

[tor-browser-bundle/master] Add changelog for 6.0a5
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 74beabeb2ead3694e0c258e20e80d9da58df9270 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 21:32:57 2016 +0000 Add changelog for 6.0a5 --- Bundle-Data/Docs/ChangeLog.txt | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8c5d733..4719c8b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,59 @@ +Tor Browser 6.0a5 -- April 27 + * All Platforms + * Update Firefox to 45.1.0esr + * Update Tor to 0.2.8.2-alpha + * Update Torbutton to 1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + * Update Tor Launcher to 0.2.9.1 + * Bug 13252: Do not store data in the application bundle + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Update meek to 0.22 (tag 0.22-18371-2) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + * Windows + * Bug 13419: Support ICU in Windows builds + * Bug 16874: Fix broken https://sports.yahoo.com/dailyfantasy page + * Bug 18767: Context menu is broken on Windows in ESR 45 based Tor Browser + * OS X + * Bug 6540: Support OS X Gatekeeper + * Bug 13252: Tor Browser should not store data in the application bundle + * Build System + * All Platforms + * Bug 18127: Add LXC support for building with Debian guest VMs + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Windows + * Bug 17895: Use NSIS 2.51 for installer to avoid DLL hijacking + * Bug 18290: Bump mingw-w64 commit we use + * OS X + * Bug 18331: Update toolchain for Firefox 45 ESR + * Bug 18690: Switch to Debian Wheezy guest VMs + * Linux + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + Tor Browser 6.0a4-hardened -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! Bug #6253: Add canvas image extraction prompt.
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 916c78a0a56a38763077634cd492cfdcb2e37b81 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 28 17:04:07 2016 -0400 fixup! Bug #6253: Add canvas image extraction prompt. Place Canvas MediaStream behind site permission prompt (#15640). --- dom/html/HTMLCanvasElement.cpp | 46 ++++++++++++++++++++++++++++++++---------- dom/html/HTMLCanvasElement.h | 5 ++++- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp index 314bf48..dd74d9f 100644 --- a/dom/html/HTMLCanvasElement.cpp +++ b/dom/html/HTMLCanvasElement.cpp @@ -59,8 +59,10 @@ class RequestedFrameRefreshObserver : public nsARefreshObserver public: RequestedFrameRefreshObserver(HTMLCanvasElement* const aOwningElement, - nsRefreshDriver* aRefreshDriver) + nsRefreshDriver* aRefreshDriver, + bool aReturnPlaceholderData) : mRegistered(false), + mReturnPlaceholderData(aReturnPlaceholderData), mOwningElement(aOwningElement), mRefreshDriver(aRefreshDriver) { @@ -68,7 +70,8 @@ public: } static already_AddRefed<DataSourceSurface> - CopySurface(const RefPtr<SourceSurface>& aSurface) + CopySurface(const RefPtr<SourceSurface>& aSurface, + bool aReturnPlaceholderData) { RefPtr<DataSourceSurface> data = aSurface->GetDataSurface(); if (!data) { @@ -97,12 +100,23 @@ public: MOZ_ASSERT(data->GetSize() == copy->GetSize()); MOZ_ASSERT(data->GetFormat() == copy->GetFormat()); - memcpy(write.GetData(), read.GetData(), - write.GetStride() * copy->GetSize().height); + if (aReturnPlaceholderData) { + // If returning placeholder data, fill the frame copy with white pixels. + memset(write.GetData(), 0xFF, + write.GetStride() * copy->GetSize().height); + } else { + memcpy(write.GetData(), read.GetData(), + write.GetStride() * copy->GetSize().height); + } return copy.forget(); } + void SetReturnPlaceholderData(bool aReturnPlaceholderData) + { + mReturnPlaceholderData = aReturnPlaceholderData; + } + void WillRefresh(TimeStamp aTime) override { MOZ_ASSERT(NS_IsMainThread()); @@ -128,8 +142,8 @@ public: return; } - RefPtr<DataSourceSurface> copy = CopySurface(snapshot); - + RefPtr<DataSourceSurface> copy = CopySurface(snapshot, + mReturnPlaceholderData); mOwningElement->SetFrameCapture(copy.forget()); mOwningElement->MarkContextCleanForFrameCapture(); } @@ -177,6 +191,7 @@ private: } bool mRegistered; + bool mReturnPlaceholderData; HTMLCanvasElement* const mOwningElement; RefPtr<nsRefreshDriver> mRefreshDriver; }; @@ -682,8 +697,13 @@ HTMLCanvasElement::CaptureStream(const Optional<double>& aFrameRate, return nullptr; } + // Check site-specific permission and display prompt if appropriate. + // If no permission, arrange for the frame capture listener to return + // all-white, opaque image data. + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); stream->CreateOwnDOMTrack(videoTrackId, MediaSegment::VIDEO); - RegisterFrameCaptureListener(stream->FrameCaptureListener()); + RegisterFrameCaptureListener(stream->FrameCaptureListener(), usePlaceholder); return stream.forget(); } @@ -693,7 +713,7 @@ HTMLCanvasElement::ExtractData(JSContext* aCx, const nsAString& aOptions, nsIInputStream** aStream) { - // Check site-speciifc permission and display prompt if appropriate. + // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ImageEncoder::ExtractData(aType, @@ -766,7 +786,7 @@ HTMLCanvasElement::ToBlob(JSContext* aCx, nsCOMPtr<nsIGlobalObject> global = OwnerDoc()->GetScopeObject(); MOZ_ASSERT(global); - // Check site-speciifc permission and display prompt if appropriate. + // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); CanvasRenderingContextHelper::ToBlob(aCx, global, aCallback, aType, @@ -1131,7 +1151,8 @@ HTMLCanvasElement::IsContextCleanForFrameCapture() } void -HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener) +HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener, + bool aReturnPlaceholderData) { WeakPtr<FrameCaptureListener> listener = aListener; @@ -1158,7 +1179,10 @@ HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener) MOZ_RELEASE_ASSERT(driver); mRequestedFrameRefreshObserver = - new RequestedFrameRefreshObserver(this, driver); + new RequestedFrameRefreshObserver(this, driver, aReturnPlaceholderData); + } else { + mRequestedFrameRefreshObserver->SetReturnPlaceholderData( + aReturnPlaceholderData); } mRequestedFrameRefreshObserver->Register(); diff --git a/dom/html/HTMLCanvasElement.h b/dom/html/HTMLCanvasElement.h index 542f11b..6ed7bbd 100644 --- a/dom/html/HTMLCanvasElement.h +++ b/dom/html/HTMLCanvasElement.h @@ -263,8 +263,11 @@ public: * The registered FrameCaptureListeners are stored as WeakPtrs, thus it's the * caller's responsibility to keep them alive. Once a registered * FrameCaptureListener is destroyed it will be automatically deregistered. + * If aReturnPlaceholderData is true, white data is captured instead of the + * actual canvas contents. */ - void RegisterFrameCaptureListener(FrameCaptureListener* aListener); + void RegisterFrameCaptureListener(FrameCaptureListener* aListener, + bool aReturnPlaceholderData); /* * Returns true when there is at least one registered FrameCaptureListener

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 3560a0c1a998f1e875e06bea15fb3d1203da385e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 19 15:39:00 2016 -0700 squash! Bug #13749.2: Regression tests for first-party isolation of cache Bug #16326: Add regression test for isolating fetch and request in page scripts and workers --- netwerk/test/browser/browser.ini | 16 ++++++++++------ netwerk/test/browser/browser_cacheFirstParty.js | 8 ++++++-- netwerk/test/browser/thirdPartyChild.fetch.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.iframe.html | 3 +++ netwerk/test/browser/thirdPartyChild.request.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.worker.fetch.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.worker.js | 4 ++++ netwerk/test/browser/thirdPartyChild.worker.request.html | 8 ++++++++ 8 files changed, 55 insertions(+), 8 deletions(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index 5ab1546..9bc3361 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -2,19 +2,23 @@ support-files = firstPartyGrandParent.html firstPartyParent.html - thirdPartyChild.link.css - thirdPartyChild.iframe.html - thirdPartyChild.script.js thirdPartyChild.audio.ogg - thirdPartyChild.video.ogv thirdPartyChild.embed.png + thirdPartyChild.favicon.ico + thirdPartyChild.fetch.html + thirdPartyChild.iframe.html thirdPartyChild.img.png + thirdPartyChild.link.css thirdPartyChild.object.png + thirdPartyChild.request.html + thirdPartyChild.script.js + thirdPartyChild.track.vtt + thirdPartyChild.video.ogv + thirdPartyChild.worker.fetch.html thirdPartyChild.worker.js + thirdPartyChild.worker.request.html thirdPartyChild.worker.xhr.html thirdPartyChild.xhr.html - thirdPartyChild.track.vtt - thirdPartyChild.favicon.ico [browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 79abffb..970043d 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -106,10 +106,12 @@ let privacyPref = "privacy.thirdparty.isolate", duplicatedDomains = [].concat(domains, domains), // We will check cache for example.net content from // iframe, link (css), script, img, object, embed, xhr, audio, video, - // track, favicon + // track, favicon, fetch, request suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", - "video.ogv", "track.vtt", "favicon.ico" ]; + "video.ogv", "track.vtt", "favicon.ico", + "fetch.html", "worker.fetch.html", + "request.html", "worker.request.html"]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each @@ -120,6 +122,8 @@ let checkCachePopulation = function* (pref, numberOfDomains) { // Collect cache data. let data = yield cacheDataForContext(LoadContextInfo.default, 2000); data = data.concat(yield cacheDataForContext(LoadContextInfo.private, 2000)); + // `fetch` is cached in storage where both private and anonymous flags are set to true. + data = data.concat(yield cacheDataForContext(LoadContextInfo.custom(true, true, {appid : null}), 2000)); /* // Uncomment to log all of the cache entries (useful for debugging). for (let cacheEntry of data) { diff --git a/netwerk/test/browser/thirdPartyChild.fetch.html b/netwerk/test/browser/thirdPartyChild.fetch.html new file mode 100644 index 0000000..65a9bbd --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.fetch.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.fetch.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html index bbd6043..56f6df2 100644 --- a/netwerk/test/browser/thirdPartyChild.iframe.html +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -9,6 +9,9 @@ xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); xhr.send(); var worker = new Worker("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.js"); + + fetch("thirdPartyChild.fetch.html", {cache: "force-cache"} ); + fetch(new Request("thirdPartyChild.request.html"), {cache: "force-cache"} ); </script> </body> </html> diff --git a/netwerk/test/browser/thirdPartyChild.request.html b/netwerk/test/browser/thirdPartyChild.request.html new file mode 100644 index 0000000..46fffde0 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.request.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.request.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.worker.fetch.html b/netwerk/test/browser/thirdPartyChild.worker.fetch.html new file mode 100644 index 0000000..b44bc7d --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.fetch.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.worker.fetch.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.worker.js b/netwerk/test/browser/thirdPartyChild.worker.js index 49154b7..34627b2 100644 --- a/netwerk/test/browser/thirdPartyChild.worker.js +++ b/netwerk/test/browser/thirdPartyChild.worker.js @@ -1,3 +1,7 @@ var xhr = new XMLHttpRequest(); xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.xhr.…", true); xhr.send(); + +fetch("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.fetc…", {cache: "force-cache"} ); +var myRequest = new Request("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.requ…"); +fetch(myRequest, {cache: "force-cache"} ); diff --git a/netwerk/test/browser/thirdPartyChild.worker.request.html b/netwerk/test/browser/thirdPartyChild.worker.request.html new file mode 100644 index 0000000..c0306b7 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.request.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.worker.request.html</div> +</body> +</html>

1 0