- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.4.0esr-4.5-1] Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit a78a094886091a90e5f4e13c0579f9ad730ea8b5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:45:26 2015 -0500 Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk. Update the DataStruct::SetData() prototype (my clang-based Mac build failed). --- widget/xpwidgets/nsTransferable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/xpwidgets/nsTransferable.h b/widget/xpwidgets/nsTransferable.h index 4c80bfe..73dcf49 100644 --- a/widget/xpwidgets/nsTransferable.h +++ b/widget/xpwidgets/nsTransferable.h @@ -27,7 +27,7 @@ struct DataStruct ~DataStruct(); const nsCString& GetFlavor() const { return mFlavor; } - void SetData( nsISupports* inData, uint32_t inDataLen ); + void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivBrowsing ); void GetData( nsISupports** outData, uint32_t *outDataLen ); already_AddRefed<nsIFile> GetFileSpec(const char* aFileName); bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Revert "Bug #9701: Prevent ClipBoardCache from writing to disk."
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit ba4eca38fdad352c564719ff49aaa8c87e8a8ded Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:01:11 2015 -0500 Revert "Bug #9701: Prevent ClipBoardCache from writing to disk." This reverts commit ba34a65a5e33473cb6f53b06542a3ce087c26115. An improved fix is forthcoming. --- widget/xpwidgets/nsTransferable.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index e6af15e..094836b 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -58,7 +58,6 @@ DataStruct::~DataStruct() void DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) { -#if 0 // Remove unnecessary disk caching to accommodate https://www.torproject.org/projects/torbrowser/design/#disk-avoidance // Now, check to see if we consider the data to be "too large" if (aDataLen > kLargeDatasetSize) { // if so, cache it to disk instead of memory @@ -67,7 +66,6 @@ DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) else NS_WARNING("Oh no, couldn't write data to the cache file"); } -#endif // #if 0 mData = aData; mDataLen = aDataLen;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit 453b4ee4b2cd1c3dd22ee2040b38f09d26e8a60f Author: Michael Schloh von Bennewitz <michael(a)schloh.com> Date: Mon Jan 19 16:04:36 2015 -0500 Bug #9701: Prevent ClipBoardCache from writing to disk. Do not write clipboard data to disk when private browsing mode is on. --- widget/xpwidgets/nsTransferable.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index 094836b..1a0e96e 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -56,19 +56,20 @@ DataStruct::~DataStruct() //------------------------------------------------------------------------- void -DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) +DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing ) { // Now, check to see if we consider the data to be "too large" - if (aDataLen > kLargeDatasetSize) { + // as well as ensuring that private browsing mode is disabled + if (aDataLen > kLargeDatasetSize && !aIsPrivBrowsing) { // if so, cache it to disk instead of memory if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) ) return; else - NS_WARNING("Oh no, couldn't write data to the cache file"); - } + NS_WARNING("Oh no, couldn't write data to the cache file"); + } mData = aData; - mDataLen = aDataLen; + mDataLen = aDataLen; } @@ -401,7 +402,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ for (i = 0; i < mDataArray.Length(); ++i) { DataStruct& data = mDataArray.ElementAt(i); if ( data.GetFlavor().Equals(aFlavor) ) { - data.SetData ( aData, aDataLen ); + data.SetData ( aData, aDataLen, mPrivateData ); return NS_OK; } } @@ -417,7 +418,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ nsCOMPtr<nsISupports> ConvertedData; uint32_t ConvertedLen; mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen); - data.SetData(ConvertedData, ConvertedLen); + data.SetData(ConvertedData, ConvertedLen, mPrivateData); return NS_OK; } }

1 0

[tor-browser-bundle/master] Use version 4.5a3 for incrementals
by mikeperry＠torproject.org 15 Jan '15

15 Jan '15

commit 5cc63b2a6c8469be17c976b0008f53693c9419ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 15 06:44:37 2015 -0800 Use version 4.5a3 for incrementals --- tools/update-responses/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 37c0ead..7f1d7c9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,12 +6,12 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5-alpha-3 + alpha: 4.5a3 versions: - 4.5-alpha-3: + 4.5a3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-3 + download_url: https://www.torproject.org/dist/torbrowser/4.5a3 incremental_from: - 4.5-alpha-2 migrate_archs:

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit b491f6d4bacdbc07d8003f8d6a79e4ffeb775988 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 19 17:26:48 2014 -0800 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. This fixes the meek breakage reported in #13788. --- netwerk/base/src/nsSocketTransport2.cpp | 87 +++++++++---------------------- netwerk/base/src/nsSocketTransport2.h | 14 +++-- 2 files changed, 31 insertions(+), 70 deletions(-) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index ea0dd68..baa14da 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -751,8 +751,7 @@ nsSocketTransport::nsSocketTransport() : mTypes(nullptr) , mTypeCount(0) , mPort(0) - , mHttpsProxy(false) - , mProxyUse(false) + , mProxyPort(0) , mProxyTransparent(false) , mProxyTransparentResolvesHost(false) , mConnectionFlags(0) @@ -813,26 +812,20 @@ nsSocketTransport::Init(const char **types, uint32_t typeCount, mHost = host; const char *proxyType = nullptr; + mProxyInfo = proxyInfo; if (proxyInfo) { - mProxyInfo = proxyInfo; + mProxyPort = proxyInfo->Port(); + mProxyHost = proxyInfo->Host(); // grab proxy type (looking for "socks" for example) proxyType = proxyInfo->Type(); if (proxyType && (strcmp(proxyType, "http") == 0 || strcmp(proxyType, "direct") == 0 || strcmp(proxyType, "unknown") == 0)) proxyType = nullptr; - - mProxyUse = true; - // check that we don't have a proxyInfo without proxy - nsCString proxyHost; - proxyInfo->GetHost(proxyHost); - if (!proxyType || proxyHost.IsEmpty()) { - mProxyUse = false; - } } - SOCKET_LOG(("nsSocketTransport::Init [this=%x host=%s:%hu proxy=%s]\n", - this, mHost.get(), mPort, mProxyUse ? "yes" : "no")); + SOCKET_LOG(("nsSocketTransport::Init [this=%p host=%s:%hu proxy=%s:%hu]\n", + this, mHost.get(), mPort, mProxyHost.get(), mProxyPort)); // include proxy type as a socket type if proxy type is not "http" mTypeCount = typeCount + (proxyType != nullptr); @@ -1005,7 +998,7 @@ nsSocketTransport::ResolveHost() nsresult rv; - if (mProxyUse) { + if (!mProxyHost.IsEmpty()) { if (!mProxyTransparent || mProxyTransparentResolvesHost) { #if defined(XP_UNIX) NS_ABORT_IF_FALSE(!mNetAddrIsSet || mNetAddr.raw.family != AF_LOCAL, @@ -1087,8 +1080,10 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us const char *host = mHost.get(); int32_t port = (int32_t) mPort; + const char *proxyHost = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get(); + int32_t proxyPort = (int32_t) mProxyPort; uint32_t proxyFlags = 0; - nsCOMPtr<nsIProxyInfo> proxy = mProxyInfo; + nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo; uint32_t i; for (i=0; i<mTypeCount; ++i) { @@ -1109,19 +1104,12 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us if (mConnectionFlags & nsISocketTransport::NO_PERMANENT_STORAGE) proxyFlags |= nsISocketProvider::NO_PERMANENT_STORAGE; - nsCOMPtr<nsISupports> secinfo; if (i == 0) { // if this is the first type, we'll want the // service to allocate a new socket - nsCString proxyHost; - GetHost(proxyHost); - int32_t proxyPort; - GetPort(&proxyPort); rv = provider->NewSocket(mNetAddr.raw.family, - mHttpsProxy ? proxyHost.get() : host, - mHttpsProxy ? proxyPort : port, - proxy, + host, port, proxyInfo, proxyFlags, &fd, getter_AddRefs(secinfo)); @@ -1135,7 +1123,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // so we just want the service to add itself // to the stack (such as pushing an io layer) rv = provider->AddToSocket(mNetAddr.raw.family, - host, port, proxy, + host, port, proxyInfo, proxyFlags, fd, getter_AddRefs(secinfo)); } @@ -1165,7 +1153,9 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us (strcmp(mTypes[i], "socks4") == 0)) { // since socks is transparent, any layers above // it do not have to worry about proxy stuff - proxy = nullptr; + proxyInfo = nullptr; + proxyHost = nullptr; + proxyPort = -1; proxyTransparent = true; } } @@ -1224,14 +1214,10 @@ nsSocketTransport::InitiateSocket() netAddrCString.BeginWriting(), kIPv6CStrBufSize)) netAddrCString = NS_LITERAL_CSTRING("<IP-to-string failed>"); - nsCString proxyHost; - GetHost(proxyHost); - int32_t proxyPort; - GetPort(&proxyPort); SOCKET_LOG(("nsSocketTransport::InitiateSocket skipping " "speculative connection for host [%s:%d] proxy " "[%s:%d] with Local IP address [%s]", - mHost.get(), mPort, proxyHost.get(), proxyPort, + mHost.get(), mPort, mProxyHost.get(), mProxyPort, netAddrCString.get())); } #endif @@ -1380,7 +1366,7 @@ nsSocketTransport::InitiateSocket() // OnSocketConnected(); - if (mSecInfo && mProxyUse && proxyTransparent && usingSSL) { + if (mSecInfo && !mProxyHost.IsEmpty() && proxyTransparent && usingSSL) { // if the connection phase is finished, and the ssl layer has // been pushed, and we were proxying (transparently; ie. nothing // has to happen in the protocol layer above us), it's time for @@ -1404,7 +1390,8 @@ nsSocketTransport::InitiateSocket() // the OS error // else if (PR_UNKNOWN_ERROR == code && - mProxyUse && mProxyTransparent) { + mProxyTransparent && + !mProxyHost.IsEmpty()) { code = PR_GetOSError(); rv = ErrorAccordingToNSPR(code); } @@ -1413,7 +1400,7 @@ nsSocketTransport::InitiateSocket() // else { rv = ErrorAccordingToNSPR(code); - if (rv == NS_ERROR_CONNECTION_REFUSED && mProxyUse) + if ((rv == NS_ERROR_CONNECTION_REFUSED) && !mProxyHost.IsEmpty()) rv = NS_ERROR_PROXY_CONNECTION_REFUSED; } } @@ -1725,8 +1712,8 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa // For SOCKS proxies (mProxyTransparent == true), the socket // transport resolves the real host here, so there's no fixup // (see bug 226943). - if (status == NS_ERROR_UNKNOWN_HOST && !mProxyTransparent && - mProxyUse) + if ((status == NS_ERROR_UNKNOWN_HOST) && !mProxyTransparent && + !mProxyHost.IsEmpty()) mCondition = NS_ERROR_UNKNOWN_PROXY_HOST; else mCondition = status; @@ -1851,7 +1838,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // The SOCKS proxy rejected our request. Find out why. // else if (PR_UNKNOWN_ERROR == code && - mProxyUse && mProxyTransparent) { + mProxyTransparent && + !mProxyHost.IsEmpty()) { code = PR_GetOSError(); mCondition = ErrorAccordingToNSPR(code); } @@ -1860,7 +1848,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // else, the connection failed... // mCondition = ErrorAccordingToNSPR(code); - if (mCondition == NS_ERROR_CONNECTION_REFUSED && mProxyUse) + if ((mCondition == NS_ERROR_CONNECTION_REFUSED) && !mProxyHost.IsEmpty()) mCondition = NS_ERROR_PROXY_CONNECTION_REFUSED; SOCKET_LOG((" connection failed! [reason=%x]\n", mCondition)); } @@ -2183,31 +2171,6 @@ nsSocketTransport::GetPort(int32_t *port) return NS_OK; } -const nsCString & -nsSocketTransport::SocketHost() -{ - if (mProxyInfo && !mProxyTransparent) { - if (mProxyHostCache.IsEmpty()) { - mProxyInfo->GetHost(mProxyHostCache); - } - return mProxyHostCache; - } - else - return mHost; -} - -uint16_t -nsSocketTransport::SocketPort() -{ - if (mProxyInfo && !mProxyTransparent) { - int32_t result; - mProxyInfo->GetPort(&result); - return (uint16_t) result; - } - else - return mPort; -} - NS_IMETHODIMP nsSocketTransport::GetPeerAddr(NetAddr *addr) { diff --git a/netwerk/base/src/nsSocketTransport2.h b/netwerk/base/src/nsSocketTransport2.h index 73f750e..25f2592 100644 --- a/netwerk/base/src/nsSocketTransport2.h +++ b/netwerk/base/src/nsSocketTransport2.h @@ -266,18 +266,16 @@ private: char **mTypes; uint32_t mTypeCount; nsCString mHost; + nsCString mProxyHost; uint16_t mPort; - bool mHttpsProxy; - nsCOMPtr<nsIProxyInfo> mProxyInfo; - bool mProxyUse; - bool mProxyTransparent; - bool mProxyTransparentResolvesHost; + uint16_t mProxyPort; + bool mProxyTransparent; + bool mProxyTransparentResolvesHost; uint32_t mConnectionFlags; - uint16_t SocketPort(); - const nsCString &SocketHost(); - nsCString mProxyHostCache; // for SocketHost() only + uint16_t SocketPort() { return (!mProxyHost.IsEmpty() && !mProxyTransparent) ? mProxyPort : mPort; } + const nsCString &SocketHost() { return (!mProxyHost.IsEmpty() && !mProxyTransparent) ? mProxyHost : mHost; } //------------------------------------------------------------------------- // members accessible only on the socket transport thread:

1 0

[tor-browser-bundle/master] Bug #10125: Add Debian deps to recommended apt-get command
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit 003143681ca452c719bac0ecc23f14db4292efe3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 14 09:42:36 2015 -0800 Bug #10125: Add Debian deps to recommended apt-get command --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index c59ede0..6111125 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -35,7 +35,7 @@ then echo echo "Please run" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip" + echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi

1 0

[tor-browser-bundle/master] Bug 10125: Add instructions and checks for Debian
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit 2cf050b593ac68a25acc8fb4dbc79d75b6486c96 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 16:40:45 2015 +0000 Bug 10125: Add instructions and checks for Debian --- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 55 +++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index b51fd96..4caf690 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 12.04+ machine or VM, run: + On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 62167e9..c59ede0 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -6,18 +6,57 @@ if [ ! -f /etc/debian_version ]; then echo "Gitian is dependent upon the Ubuntu Virtualization Tools." echo - echo "You need to run Ubuntu 12.04 LTS or newer." + echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." exit 1 fi -dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null +DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` -if [ $? -ne 0 ]; then - echo "You are missing one or more Gitian build tool dependencies." - echo - echo "Please run:" - echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" +if [ $DISTRO = "Ubuntu" ]; +then + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run:" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + exit 1 + fi +elif [ $DISTRO = "Debian" ]; +then + dpkg -s ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip torsocks tor python-cheetah debootstrap parted kpartx rsync 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip" + exit 1 + fi + + # python-vm-builder is special as we don't have a Debian package for it. + vmbuilder --help 2>/dev/null >/dev/null + if [ $? -ne 0 ]; + then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' + echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr489" + echo "sudo python setup.py install" + echo "cd .." + exit 1 + fi +else + echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #13749.1: regression tests for first party isolation of localStorage
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit a447c129b1f779ffdb76c401176e38a2d0c58192 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Dec 10 17:35:12 2014 -0800 Bug #13749.1: regression tests for first party isolation of localStorage --- dom/tests/mochitest/localstorage/firstParty.html | 16 +++++ .../mochitest/localstorage/firstPartyInner.html | 25 +++++++ dom/tests/mochitest/localstorage/mochitest.ini | 3 + .../test_localStorageByFirstParty.html | 73 ++++++++++++++++++++ 4 files changed, 117 insertions(+) diff --git a/dom/tests/mochitest/localstorage/firstParty.html b/dom/tests/mochitest/localstorage/firstParty.html new file mode 100644 index 0000000..7bf2539 --- /dev/null +++ b/dom/tests/mochitest/localstorage/firstParty.html @@ -0,0 +1,16 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <script> + window.onload = function () { + var inner = document.getElementById("inner"); + window.addEventListener("message", function (event) { + opener.postMessage(event.data, "http://mochi.test:8888"); + }); + inner.src = "http://example.net/tests/dom/tests/mochitest/localstorage/firstPartyInner.h…" + + location.search + "&host=" + encodeURIComponent(location.protocol + "//" + location.host); + }; + </script> + <body> + <div>firstParty.html</div> + <iframe id="inner" width=400 height=200></iframe> + </body> +</html> diff --git a/dom/tests/mochitest/localstorage/firstPartyInner.html b/dom/tests/mochitest/localstorage/firstPartyInner.html new file mode 100644 index 0000000..1b24d2b --- /dev/null +++ b/dom/tests/mochitest/localstorage/firstPartyInner.html @@ -0,0 +1,25 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <div>firstPartyInner.html</div> + <pre id="result"></pre> + <script> + var request = new URLSearchParams(location.search.substring(1)), + expected = request.get("expected"), + prescribed = request.get("prescribed"), + host = decodeURIComponent(request.get("host")), + found = localStorage.getItem("firstPartyTest"), + resultDiv = document.getElementById("result"), + show = function (x) { resultDiv.innerHTML += x + "\n"; }; + show("host: " + host); + if (expected) { + show("expected: " + expected); + show("found: " + found); + } + if (prescribed) { + localStorage.setItem("firstPartyTest", prescribed); + show("wrote: " + prescribed); + } + parent.postMessage(expected ? (found === expected) : true, host); + </script> + </body> +</html> diff --git a/dom/tests/mochitest/localstorage/mochitest.ini b/dom/tests/mochitest/localstorage/mochitest.ini index 3b3c50c..6d258f3 100644 --- a/dom/tests/mochitest/localstorage/mochitest.ini +++ b/dom/tests/mochitest/localstorage/mochitest.ini @@ -1,5 +1,7 @@ [DEFAULT] support-files = + firstParty.html + firstPartyInner.html frameAppIsolation.html frameChromeSlave.html frameKeySync.html @@ -32,6 +34,7 @@ skip-if = toolkit=='gonk' # b2g(4 failures) b2g-debug(debug-only failure) [test_localStorageBase.html] skip-if = buildapp == 'b2g' || e10s # b2g(no storage chrome event received) [test_localStorageBaseSessionOnly.html] +[test_localStorageByFirstParty.html] skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_localStorageCookieSettings.html] skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) diff --git a/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html b/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html new file mode 100644 index 0000000..6858303 --- /dev/null +++ b/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html @@ -0,0 +1,73 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>localStorage by first party test</title> + +<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> +<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> + +<script type="application/javascript;version=1.7"> + +// This series of unit tests ensures that, when the "privacy.thirdparty.isolate" pref +// is set to 2 (active), we should have a separate localStorage for each first-party +// (URL bar domain). If the pref is set to 0 (inactive), then two iframes with the +// same origin but different first-party domains will share localStorage. + +let originalPrefValue = SpecialPowers.getIntPref("privacy.thirdparty.isolate"); + +let mapToUriParameters = aMap => + Object.keys(aMap).map(k => encodeURIComponent(k) + "=" + + encodeURIComponent(aMap[k])).join("&"); + +let steps = [ + // When first party isolation is turned off, we expect that DOM storage will be + // the same for two iframes at http://example.net. + { domain : "example.com", prescribed : "test1", pref : 0 }, + { domain : "example.org", prescribed : "test2" }, + { domain : "example.com", expected : "test2", prescribed : "test3" }, + { domain : "example.org", expected : "test3", prescribed : "test4" }, + // When first party isolation is turned on, we expect two separate DOM storage + // silos for two iframes both at http://example.net but contained in pages + // with different first party domains. + { domain : "example.com", prescribed : "test1", pref : 2 }, + { domain : "example.org", prescribed : "test2" }, + { domain : "example.com", expected : "test1", prescribed : "test3" }, + { domain : "example.org", expected : "test2", prescribed : "test4" } +]; + +let runStep = function (i) { + if (i < steps.length) { + let step = steps[i], + { domain, pref } = step; + if (pref !== undefined) { + SpecialPowers.setIntPref("privacy.thirdparty.isolate", pref); + } + window.open("http://" + domain + + "/tests/dom/tests/mochitest/localstorage/firstParty.html?" + + mapToUriParameters(step), "_blank"); + } else if (i == steps.length) { + SpecialPowers.setIntPref("privacy.thirdparty.isolate", originalPrefValue); + SimpleTest.finish(); + } +}; + +let startTest = function () { + let i = 0; + window.addEventListener("message", function (event) { + // Get the result of the last step. + is(event.data, true, "correct DOM storage isolation"); + // Run the next step. + runStep(++i); + }); + runStep(0); +}; + +SimpleTest.waitForExplicitFinish(); + +</script> + +</head> + +<body onload="startTest();"> + +</body> +</html>

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #13749.2: Regression tests for first-party isolation of cache
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit c102a828cc194fa7a7eb4ffd5d01d7c5810033f3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Dec 15 02:35:03 2014 -0800 Bug #13749.2: Regression tests for first-party isolation of cache This test ensures that if first-party isolation is enabled ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, it is indexed by the URL-bar domain. In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar domains. When isolation is active, we test to confirm that a separate copy of each file is cached for each different parent domain. We also test to make sure that when isolation is inactive, a single copy of the child page is cached and reused for all parent domains. --- netwerk/test/browser/browser.ini | 14 ++ netwerk/test/browser/browser_cacheFirstParty.js | 157 ++++++++++++++++++++++ netwerk/test/browser/firstPartyGrandParent.html | 10 ++ netwerk/test/browser/firstPartyParent.html | 38 ++++++ netwerk/test/browser/thirdPartyChild.audio.ogg | Bin 0 -> 2603 bytes netwerk/test/browser/thirdPartyChild.embed.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.iframe.html | 13 ++ netwerk/test/browser/thirdPartyChild.img.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.link.css | 1 + netwerk/test/browser/thirdPartyChild.object.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.script.js | 1 + netwerk/test/browser/thirdPartyChild.track.vtt | 13 ++ netwerk/test/browser/thirdPartyChild.video.ogv | Bin 0 -> 16049 bytes netwerk/test/browser/thirdPartyChild.xhr.html | 8 ++ 14 files changed, 255 insertions(+) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index a5f31f9..cae28f7 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -1,3 +1,17 @@ [DEFAULT] +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.img.png + thirdPartyChild.object.png + thirdPartyChild.xhr.html + thirdPartyChild.track.vtt +[browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js new file mode 100644 index 0000000..673b8c9 --- /dev/null +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -0,0 +1,157 @@ +// # URL-bar domain (first party) isolation test + +// This test ensures that if first-party isolation is enabled +// ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, +// it is indexed by the URL-bar domain. + +// In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, +// EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar +// domains. When isolation is active, we test to confirm that a separate copy of each file +// is cached for each different parent domain. We also test to make sure that when +// isolation is inactive, a single copy of the child page is cached and reused for all +// parent domains. + +// In this file, functions are defined in call stack order (later functions call earlier +// functions). Comments are formatted for docco. + +/* jshint esnext:true */ + +// __Mozilla utilities__. +const Cu = Components.utils; +const Ci = Components.interfaces; +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/Task.jsm"); + +// __listen(target, eventType, timeoutMs, useCapture)__. +// Calls addEventListener on target, with the given eventType. +// Returns a Promise that resolves to an Event object, if the event fires. +// If a timeout occurs, then Promise is rejected with a "Timed out" error. +// For use with Task.jsm. +let listen = function (target, eventType, timeoutMs, useCapture) { + return new Promise(function (resolve, reject) { + let listenFunction = function (event) { + target.removeEventListener(eventType, listenFunction, useCapture); + resolve(event); + }; + target.addEventListener(eventType, listenFunction, useCapture); + window.setTimeout(() => reject(new Error("Timed out")), timeoutMs); + }); +}; + +// __copyObject(obj)__. +// Returns a shallow copy of an object. Works with JS native objects. +let copyObject = function (obj) { + let result = {}; + for (let k of Object.keys(obj)) { + result[k] = obj[k]; + } + return result; +}; + +// __cacheData()__. +// Returns the current state of the cache. +let cacheData = function () { + let devices = [], + cacheEntries = [], + cacheVisitor = { visitDevice : function (deviceID, deviceInfo) { + devices.push(copyObject(deviceInfo)); + return true; + }, + visitEntry : function (deviceID, entryInfo) { + cacheEntries.push(copyObject(entryInfo)); + return true; + }, + QueryInterface : function(iid) { + if (iid.equals(Ci.nsICacheVisitor)) return this; + } }; + Services.cache.visitEntries(cacheVisitor); + return { devices : devices, cacheEntries : cacheEntries }; +}; + +// __loadURLinNewTab(URL)__. +// Opens a new tab at a given URL, and waits for it to load. Times out after 5 sec. +// Returns a promise that resolves to the tab. (Task.jsm coroutine.) +let loadURLinNewTab = function* (URL) { + let tab = gBrowser.addTab(URL), + browser = gBrowser.getBrowserForTab(tab), + result = yield listen(browser, "load", 5000, true); + return tab; +}; + +// __countMatchingCacheEntries(cacheEntries, domain, fileSuffix)__. +// Reports how many cache entries contain a given domain name and file suffix. +let countMatchingCacheEntries = function (cacheEntries, domain, fileSuffix) { + return cacheEntries.map(entry => entry.key) + .filter(key => key.contains(domain)) + .filter(key => key.contains("thirdPartyChild." + fileSuffix)) + .length; +}; + +// __Constants__. +let privacyPref = "privacy.thirdparty.isolate", + parentPage = "/browser/netwerk/test/browser/firstPartyParent.html", + grandParentPage = "/browser/netwerk/test/browser/firstPartyGrandParent.html", + // Parent domains (the iframe "child" domain is example.net) + domains = ["test1", "test2"], + // We duplicate domains, to check that two pages with the same first party domain + // share cached embedded objects. + duplicatedDomains = [].concat(domains, domains), + // We will check cache for example.net content from + // iframe, link, script, img, object, embed, xhr, audio, video, track + suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", + "embed.png", "xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; + +// __checkCachePopulation(pref, 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) ? (2 * numberOfDomains) : 1; + // Collect cache data. + let data = cacheData(); + for (let suffix of suffixes) { + let foundEntryCount = countMatchingCacheEntries(data.cacheEntries, "example.net", suffix), + result = (suffix.startsWith("video") || suffix.startsWith("audio")) ? + // Video and audio elements aren't always cached, so + // tolerate fewer cached copies. + (expectedEntryCount === 1 ? (foundEntryCount <= 1) : (foundEntryCount > 1)) : + (expectedEntryCount === foundEntryCount); + // Report results to mochitest + ok(result, "Cache entries expected for " + suffix + + ": " + expectedEntryCount); + } +}; + +// __test()__. +// The main testing function. +let test = function () { + waitForExplicitFinish(); + // Launch a Task.jsm coroutine so we can open tabs and wait for each of them to open, + // one by one. + Task.spawn(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]) { + // Clear the cache. + Services.cache2.clear(); + // Set the pref to desired value + Services.prefs.setIntPref(privacyPref, pref); + // Open test tabs + let tabs = []; + for (let domain of duplicatedDomains) { + tabs.push(yield loadURLinNewTab("http://" + domain + ".example.com" + parentPage)); + 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. + checkCachePopulation(pref, domains.length); + // Clean up by removing tabs. + tabs.forEach(tab => gBrowser.removeTab(tab)); + } + // Restore the pref to its original value. + Services.prefs.setIntPref(privacyPref, originalPrefValue); + // All tests have now been run. + finish(); + }); +}; diff --git a/netwerk/test/browser/firstPartyGrandParent.html b/netwerk/test/browser/firstPartyGrandParent.html new file mode 100644 index 0000000..c990831 --- /dev/null +++ b/netwerk/test/browser/firstPartyGrandParent.html @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html> +<head> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> +</head> +<frameset cols="50%,50%"> + <frame src="http://example.net/browser/netwerk/test/browser/firstPartyParent.html"> + <frame src=""> +</frameset> +</html> diff --git a/netwerk/test/browser/firstPartyParent.html b/netwerk/test/browser/firstPartyParent.html new file mode 100644 index 0000000..7f2f5c8 --- /dev/null +++ b/netwerk/test/browser/firstPartyParent.html @@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html> + +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> +<head> + <link rel="stylesheet" type="text/css" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.link.css"> +</head> +<body> +<div>firstPartyParent.html</div> + +<iframe src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.iframe.html"> +</iframe> + +<script src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.script.js"> +</script> + +<img src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.img.png"> + +<embed src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.embed.png"> + +<object data="http://example.net/browser/netwerk/test/browser/thirdPartyChild.object.png" + type="image/png"></object> + +<audio id="audio" autoplay> + <source src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.audio.ogg" + type="audio/ogg"> + <track src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.track.vtt" + kind="subtitles"> +</audio> + +<video id="video" + src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.video.ogv" + type="video/ogg"> +</video> + +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.audio.ogg b/netwerk/test/browser/thirdPartyChild.audio.ogg new file mode 100644 index 0000000..edda4e9 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.audio.ogg differ diff --git a/netwerk/test/browser/thirdPartyChild.embed.png b/netwerk/test/browser/thirdPartyChild.embed.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.embed.png differ diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html new file mode 100644 index 0000000..f7b7531 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.html</div> +<script> + var xhr = new XMLHttpRequest(); + xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); + xhr.send(); +</script> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.img.png b/netwerk/test/browser/thirdPartyChild.img.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.img.png differ diff --git a/netwerk/test/browser/thirdPartyChild.link.css b/netwerk/test/browser/thirdPartyChild.link.css new file mode 100644 index 0000000..cf8a82e --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.link.css @@ -0,0 +1 @@ +/* Dummy CSS file, used by browser_cacheFirstParty.js. */ \ No newline at end of file diff --git a/netwerk/test/browser/thirdPartyChild.object.png b/netwerk/test/browser/thirdPartyChild.object.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.object.png differ diff --git a/netwerk/test/browser/thirdPartyChild.script.js b/netwerk/test/browser/thirdPartyChild.script.js new file mode 100644 index 0000000..1cf2937 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.script.js @@ -0,0 +1 @@ +// Dummy child script, used by browser_cacheFirstParty.js diff --git a/netwerk/test/browser/thirdPartyChild.track.vtt b/netwerk/test/browser/thirdPartyChild.track.vtt new file mode 100644 index 0000000..b37cb40 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.track.vtt @@ -0,0 +1,13 @@ +WEBVTT FILE + +1 +00:00:00.500 --> 00:00:02.000 D:vertical A:start +blah blah blah + +2 +00:00:02.500 --> 00:00:04.300 +this is a test + +3 +00:00:05.000 --> 00:00:07.000 +one more line diff --git a/netwerk/test/browser/thirdPartyChild.video.ogv b/netwerk/test/browser/thirdPartyChild.video.ogv new file mode 100644 index 0000000..68dee3c Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.video.ogv differ diff --git a/netwerk/test/browser/thirdPartyChild.xhr.html b/netwerk/test/browser/thirdPartyChild.xhr.html new file mode 100644 index 0000000..b750364 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.xhr.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.html</div> +</body> +</html>

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit e223c84ed45e7bd935f1ab8f1aa6d655d4d458cc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 10:42:53 2015 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. Remove the JIT prefs, as they are now handled by the security slider. --- browser/app/profile/000-tor-browser.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6bef64..fd0a35c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -156,13 +156,6 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); -// Security enhancements -// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 -pref("javascript.options.ion.content", false); -pref("javascript.options.baselinejit.content", false); -pref("javascript.options.asmjs", false); -pref("javascript.options.typeinference", false); - // Audio_data is deprecated in future releases, but still present // in FF24. This is a dangerous combination (spotted by iSec) pref("media.audio_data.enabled", false);

1 0