- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Fix a log printout.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit d39450e0386b211b7e813d43320100067e08f0e6 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:42:58 2015 +0100 Fix a log printout. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index ab8d36f..271f1ec 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -51,7 +51,7 @@ while [ $status != done ]; do date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-$(date -u +%s).log && status=done - printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Fix emailing of log files and remove a couple of default values.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit db856ac0155791bbca283da574b14ed4ae5bd515 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:32:36 2015 +0100 Fix emailing of log files and remove a couple of default values. --- tools/continuous-builds/build-tbb.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 010b41d..ab8d36f 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -18,12 +18,29 @@ BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 -[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 +# Set PGPKEYID="--local-user KEY-ID" to override default PGP key used +# for signing. +[ -z "$PGPKEYID" ] && PGPKEYID="" +# mail(1) from Debian package bsd-mailx lost `-f envelope-sender' in +# DSA-3104-1. Install package heirloom-mailx and set +# MAILX=/usr/bin/heirloom-mailx in order to override envelope sender +# using `-r' in LOGSENDER. +[ -z "$MAILX" ] && MAILX="" + +# Name of log file. logfile=$(date -u +%s).log -logrecipients="gk(a)torproject.org linus(a)torproject.org" -. ~/setup-gitian-build-env.sh +# LOGRECIPIENTS is a space separated list of email addresses or an +# empty string. +[ -z "$LOGRECIPIENTS" ] && LOGRECIPIENTS="" + +# Set LOGSENDER to "-r user@domain" to override envelope sender. If +# empty the default envelope sender is used. +[ -z "$LOGSENDER" ] && LOGSENDER="" + +[ -f ~/setup-gitian-build-env.sh ] && . ~/setup-gitian-build-env.sh + cd $BUILDDIR || exit 1 status=init n=0 @@ -45,11 +62,17 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 + gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile - tail -n 50 $logfile ../../gitian-builder/var/build.log ../../gitian-builder/var/target.log | mail -s "Nightly build failure -- $(date +%F)" $logrecipients + if [ -n "$LOGRECIPIENTS" ]; then + FILES="$logfile \ + ../../gitian-builder/var/build.log \ + ../../gitian-builder/var/target.log" + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + $sender -- $LOGRECIPIENTS + fi fi

1 0

[tor-browser-bundle/master] Bug 14303: Adapt fix for #13015 to signing script
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit c2f819863f5dd5031346fd483c7adf2d77bec42e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:41:44 2015 +0000 Bug 14303: Adapt fix for #13015 to signing script --- gitian/signmars.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index fdb531e..ed42971 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -30,6 +30,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C

1 0

[tor-browser-bundle/master] Fix Changelog
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit df55f898a05620110275c3e6e72c3cfbc54aca3d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:36:02 2015 +0000 Fix Changelog --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7416e0c..2dd58e7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-3 -- Jan 16 2015 +Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr * Update Tor to 0.2.6.2-alpha @@ -16,6 +16,7 @@ Tor Browser 4.5-alpha-3 -- Jan 16 2015 * Bug 13671: Fixup for circuit display if bridges are used * Translation updates * Update Tor Launcher to 0.2.7.1 + * Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set * Translation updates * Bug 13379: Sign our MAR files * Bug 13788: Fix broken meek in 4.5-alpha series

1 0

[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] 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/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-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 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-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/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] 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] 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

[tor-browser-bundle/master] Prepare 4.5-alpha-3 release
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 3946059dcf9c3125f9106c5f97a4f260776a3c6f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:55:53 2015 +0000 Prepare 4.5-alpha-3 release Update changelog; update config.yml; bump versions --- Bundle-Data/Docs/ChangeLog.txt | 31 +++++++++++++++++++++++++++++++ gitian/versions.alpha | 18 +++++++++--------- tools/update-responses/config.yml | 15 +++++---------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 11cf88b..7416e0c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,34 @@ +Tor Browser 4.5-alpha-3 -- Jan 16 2015 + * All Platforms + * Update Firefox to 31.4.0esr + * Update Tor to 0.2.6.2-alpha + * Update NoScript to 2.6.9.10 + * Update HTTPS Everywhere to 5.0development.2 + * Update meek to 0.15 + * Update Torbutton to 1.8.1.3 + * Bug 13998: Handle changes in NoScript 2.6.9.8+ + * Bug 14100: Option to hide NetworkSettings menuitem + * Bug 13079: Option to skip control port verification + * Bug 13835: Option to change default Tor Browser homepage + * Bug 11449: Fix new identity error if NoScript is not enabled + * Bug 13881: Localize strings for tor circuit display + * Bug 9387: Incorporate user feedback + * Bug 13671: Fixup for circuit display if bridges are used + * Translation updates + * Update Tor Launcher to 0.2.7.1 + * Translation updates + * Bug 13379: Sign our MAR files + * Bug 13788: Fix broken meek in 4.5-alpha series + * Bug 13439: No canvas prompt for content callers + +Tor Browser 4.0.3 -- Jan 13 2015 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.5-alpha-2 -- Dec 5 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1dd1fdf..890b6a3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.1-alpha -TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.1.2 +TOR_TAG=tor-0.2.6.2-alpha +TORLAUNCHER_TAG=0.2.7.1 +TORBUTTON_TAG=1.8.1.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -36,7 +36,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -50,13 +50,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.1 +HTTPSE_VER=5.0development.2 GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -86,8 +86,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 6b0018d..37c0ead 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,19 +6,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-2 + alpha: 4.5-alpha-3 versions: - 4.0.2: - platformVersion: 31.3.0 + 4.5-alpha-3: + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 - 4.5-alpha-2: - platformVersion: 31.3.0 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-3 incremental_from: - - 4.5-alpha-1 + - 4.5-alpha-2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-4.0] We have 2015 meanwhile
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 83854943dfa37dcece8d84e7225574b68c2e3000 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 11:08:23 2015 +0000 We have 2015 meanwhile --- 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 12f5180..953ae64 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.0.3 -- Jan 13 2014 +Tor Browser 4.0.3 -- Jan 13 2015 * All Platforms * Update Firefox to 31.4.0esr * Update NoScript to 2.6.9.10

1 0

[torbutton/master] Update CHANGELOG; update translations
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit ac15b60896018504e2ea466a53438270ecc6a104 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:08:25 2015 +0000 Update CHANGELOG; update translations --- src/CHANGELOG | 11 +++++++++++ src/chrome/locale/ar/torbutton.dtd | 14 +++++++------- src/chrome/locale/ja/torbutton.dtd | 2 +- src/chrome/locale/ko/torbutton.dtd | 14 +++++++------- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 14 +++++++------- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 7 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a8b6b3a..a3e859e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,14 @@ +1.8.1.3 + * Bug 13998: Handle changes in NoScript 2.6.9.8+ + * Bug 14100: Option to hide NetworkSettings menuitem + * Bug 13079: Option to skip control port verification + * Bug 13835: Option to change default Tor Browser homepage + * Bug 11449: Fix new identity error if NoScript is not enabled + * Bug 13881: Localize strings for tor circuit display + * Bug 9387: Incorporate user feedback + * Bug 13671: Fixup for circuit display if bridges are used + * Translation updates + 1.8.1.2 * Bug 13672: Make circuit display optional * Bug 13671: Make bridges visible on circuit display diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index e30348e..94ef3aa 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "زر تور"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات الأمان والخصوصية"> <!ENTITY torbutton.prefs.block_thread "امنع قراءة تاريخ التصفح أثناء عمل تور (حَرِج)"> <!ENTITY torbutton.prefs.block_thwrite "امنع كتابة تاريخ التصفح أثناء عمل تور (محبّذ)"> <!ENTITY torbutton.prefs.block_nthread "امنع قراءة تاريخ التصفح أثناء توقف تور (اختياري)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> +<!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> +<!ENTITY torbutton.prefs.sec_med_low "شبه منخفض"> +<!ENTITY torbutton.prefs.sec_med_high "شبه عالٍ"> +<!ENTITY torbutton.prefs.sec_high "عالٍ"> +<!ENTITY torbutton.prefs.sec_custom "قيم مخصصة"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4add4d2..1f1d0a2 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -1,7 +1,7 @@ <!ENTITY torbutton.prefs.title "Torbutton設定"> <!ENTITY torbutton.prefs.tor_settings "プロクシ設定"> <!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロクシ設定を使う"> -<!ENTITY torbutton.prefs.use_privoxy "プロクシを使う"> +<!ENTITY torbutton.prefs.use_privoxy "プロキシを使う"> <!ENTITY torbutton.prefs.use_polipo "Polipoを使う"> <!ENTITY torbutton.prefs.custom_settings "カスタム設定のプロキシを使う"> <!ENTITY torbutton.prefs.proxy.host.http "HTTPプロキシ"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 0b96309..26023f7 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "개인 정보와 보안 설정"> <!ENTITY torbutton.prefs.block_thread "Tor 사용 시, 사용 기록을 외부에서 읽어가는 것을 차단 (중요)"> <!ENTITY torbutton.prefs.block_thwrite "Tor 사용 시, 사용 기록을 남기지 않기 (추천)"> <!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때, 사용 기록을 외부에서 읽어가는 것을 차단 (선택)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "보안 등급"> +<!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> +<!ENTITY torbutton.prefs.sec_med_low "중간 낮음"> +<!ENTITY torbutton.prefs.sec_med_high "중간 높음"> +<!ENTITY torbutton.prefs.sec_high "높음"> +<!ENTITY torbutton.prefs.sec_custom "맞춤 값"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index d911237..606928a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Ayarlar"> <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları"> -<!ENTITY torbutton.prefs.recommended_settings "Firefox'umda önerilen vekil sunucu ayarlarını kullan"> +<!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy'i kullan"> <!ENTITY torbutton.prefs.use_polipo "Polipo'yu kullan"> <!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarlarını kullan"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index f0f31b5..39b07dc 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "隐私与安全设置"> <!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> <!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> <!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "安全等级"> +<!ENTITY torbutton.prefs.sec_low "低（默认）"> +<!ENTITY torbutton.prefs.sec_med_low "中低"> +<!ENTITY torbutton.prefs.sec_med_high "中高"> +<!ENTITY torbutton.prefs.sec_high "高"> +<!ENTITY torbutton.prefs.sec_custom "自定义"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 6425d8c..49bb702 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.launch = 下载文件 torbutton.popup.cancel = 取消 torbutton.popup.dontask = 自动下载文件于 torbutton.popup.test.no_http_proxy = Tor 代理测试：本地 HTTP 代理不可达，您的 Polipo 正常启动了吗？ -torbutton.popup.captcha.title = 避免 Google Captchas？ +torbutton.popup.captcha.title = 避免 Google Captcha？ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您是否愿意把本次搜索重定向到使用其他搜索引擎？ torbutton.popup.captcha.always = 此后总是使用此操作 torbutton.popup.redirect = 重定向

1 0

[torbutton/master] Bump version to 1.8.1.3
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 071e39ef291faf81417c78f51ad6f29bb60fe946 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:09:15 2015 +0000 Bump version to 1.8.1.3 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ae524b2..e4045ad 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.8.1.2</em:version> + <em:version>1.8.1.3</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

[tor-launcher/master] Bump version to 0.2.7.1
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit beddbd16ac481746284eb90df1830c4ec3d1f63a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 09:04:52 2015 +0000 Bump version to 0.2.7.1 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b78c677..7eac647 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.2</em:version> + <em:version>0.2.7.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Try to make the security slider less eager to switch to "custom".
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 7975b2023d5dc9bc0437cb5d5fbfe539448900e4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 08:35:00 2015 -0800 Try to make the security slider less eager to switch to "custom". We actually need to rewrite the entire check for the custom settings here, but this quick hack will make it flap a bit less I think. --- src/chrome/content/torbutton.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8adef28..9cdb792 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -124,8 +124,6 @@ var torbutton_unique_pref_observer = this._branch.addObserver("gfx", this, false); this._branch.addObserver("noscript", this, false); this._branch.addObserver("media", this, false); - this._branch.addObserver("capability.policy.maonoscript.sites", this, - false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -144,7 +142,6 @@ var torbutton_unique_pref_observer = this._branch.removeObserver("gfx", this); this._branch.removeObserver("noscript", this); this._branch.removeObserver("media", this); - this._branch.removeObserver("capability.policy.maonoscript.sites", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -246,7 +243,9 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - case "capability.policy.maonoscript.sites": + // XXX: This logic is bad.. Instead, we need a check here + // that only sets custom if the prefs differ from the current + // security slider level (and also can set it back if they are the same). if (!m_tb_sliderUpdate) { // Do we already have custom settings? let customSlider = m_tb_prefs.

1 0

[torbutton/master] Add changelog for 1.7.0.2 for historical archive.
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 5848794c74c3dfa2421c0a2f413a12168cf802b8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 25 16:28:48 2014 -0800 Add changelog for 1.7.0.2 for historical archive. --- src/CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 5bc86c6..a8b6b3a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -26,6 +26,10 @@ * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs +1.7.0.2 + * Bug 13019: Synchronize locale spoofing pref with our Firefox patch + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + 1.7.0.1 * Bug 13378: Prevent addon reordering in toolbars on first-run.

1 0

[torbutton/master] Bug 13998: Bind volatilePrivatePermissions to disk
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit eb343e2cdcbd35ae6140543f248969a7e3b9aa8d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:57:00 2015 +0000 Bug 13998: Bind volatilePrivatePermissions to disk We set `noscript.volatilePrivatePermissions` to `true` if disk records are disabled and otherwise to `false`. All this in the assumption NoScript is enabled at all. --- src/chrome/content/preferences.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 75937eb..f67906c 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -286,6 +286,20 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked); + // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` + // to `true` if we are blocking disk records and to `false` if we are + // enabling them. + try { + if ("@maone.net/noscript-service;1" in Components.classes) { + let o_noscriptprefs = torbutton_get_prefbranch('noscript.'); + if (o_torprefs.getBoolPref('block_disk')) { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', true); + } else { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', false); + } + } + } catch (e) {} + o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_blockPlugins').checked); o_torprefs.setBoolPref('restrict_thirdparty', doc.getElementById('torbutton_restrictThirdParty').checked);

1 0

[torbutton/master] Bug 13998: Adapt code to fixed globalHttpsWhitelist
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 915ec73bb2b556aa937a827fbe746b21dacec1f3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 12 13:03:34 2015 +0000 Bug 13998: Adapt code to fixed globalHttpsWhitelist --- src/chrome/content/torbutton.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4715fb6..8adef28 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2166,6 +2166,7 @@ var torbutton_sec_ml_bool_prefs = { var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, + "noscript.global" : false, "noscript.globalHttpsWhitelist" : true, // XXX: pref for disableing SVG is missing }; @@ -2198,7 +2199,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2224,7 +2228,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2244,17 +2251,14 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_ml_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } - for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - } + // Order matters here as both the high mode and the medium-high mode + // share some preferences/values. So, let's revert the high mode + // preferences first and set the medium-high mode ones afterwards. for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. - // missing. - if (capValue.indexOf(" https:") < 0) { - m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue + - " https:"); + for (p in torbutton_sec_mh_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) } m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); break; @@ -2276,7 +2280,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", ""));

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/ticket_13015_v2'
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0ca8d445690515e053e3dfbdaaf3b683b1021431 Merge: 5401e06 28e1585 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 15:09:56 2015 +0000 Merge remote-tracking branch 'boklm/ticket_13015_v2' gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-)

1 0

[tor-browser-bundle/master] Bug #13015: use git tags to set tor-browser version
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 28e1585aff3e8dd8d15ef7a7add7f95508e9a50b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 27 18:00:01 2014 +0100 Bug #13015: use git tags to set tor-browser version This commit adds a get-tb-version script which uses the git tags to output the Tor Browser version and its build directory. The output should be used with 'eval' in shell scripts to define the variables. It takes as argument the type of version (release, alpha or beta). If the current commit is tagged with tag tbb-4.2-build15, get-tb-version will output this: TORBROWSER_VERSION=4.2 TORBROWSER_BUILDDIR=4.2-build15 TORBROWSER_SYMLINK_VERSION=1 If the current commit is not tagged, get-tb-version will use the version from the last tagged commit in history. The build directory will include the commit hash rather than a build number. The output will be something like this: TORBROWSER_VERSION=4.0 TORBROWSER_BUILDDIR=4.0-1a98e3efb368 TORBROWSER_SYMLINK_VERSION=0 The TORBROWSER_BUILDDIR variable is used as the build directory. The TORBROWSER_SYMLINK_VERSION variable indicates whether we should create a symlink TORBROWSER_VERSION -> TORBROWSER_BUILDDIR. The various files which source the versions files and use TORBROWSER_VERSION have been updated to eval the output of get-tb-version too, and use TORBROWSER_BUILDDIR as build directory. --- gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 0622512..71a57f2 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -24,6 +24,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) VALID="" VALID_incrementals="" @@ -33,11 +34,11 @@ do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -53,18 +54,18 @@ done cd ../.. # XXX: We should refactor this code into a shared function -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then for u in $USERS do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -83,18 +84,18 @@ cd ../.. exit_val=0 if [ -z "$VALID" ]; then - echo "No bundle hashes or sigs published for $TORBROWSER_VERSION." + echo "No bundle hashes or sigs published for $TORBROWSER_BUILDDIR." echo exit_val=1 else echo "Matching bundles exist from the following users: $VALID" fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then if [ -z "$VALID_incrementals" ] then - echo "No incremental mars hashes or sigs published for $TORBROWSER_VERSION." + echo "No incremental mars hashes or sigs published for $TORBROWSER_BUILDDIR." exit_val=1 else echo "Matching incremental mars exist from the following users: $VALID_incrementals" diff --git a/gitian/get-tb-version b/gitian/get-tb-version new file mode 100755 index 0000000..9a4a102 --- /dev/null +++ b/gitian/get-tb-version @@ -0,0 +1,53 @@ +#!/usr/bin/perl -w +use strict; + +sub run_cmd { + my @cmd = @_; + my $pid = open(my $fh, '-|'); + if (!$pid) { + exec(@cmd); + } + my @res = <$fh>; + waitpid($pid, 0); + die "Error running " . join(' ', @cmd) if $?; + chomp @res; + return @res; +} + +my %types = ( + release => qr/tbb-([^ab]+)-build(.+)$/, + beta => qr/tbb-(.+b.+)-build(.+)$/, + alpha => qr/tbb-(.+a.+)-build(.+)$/, +); +my $type = $ARGV[0] ? $ARGV[0] : 'release'; +exit 0 if $type eq 'nightly'; +die "Unknown type $type" unless $types{$type}; +my %tags; +foreach my $tag (run_cmd('git', 'tag')) { + if ($tag =~ m/$types{$type}/) { + my ($commit) = run_cmd('git', 'show', '-s', '--format=%H', + "$tag^{commit}"); + $tags{$commit} = [ $1, $2 ]; + } +} + +my ($current_commit) = run_cmd('git', 'show', '-s', '--format=%H'); +if ($tags{$current_commit}) { + print "TORBROWSER_VERSION=$tags{$current_commit}->[0]\n"; + print 'TORBROWSER_BUILDDIR=', $tags{$current_commit}->[0], '-build', + $tags{$current_commit}->[1], "\n"; + print "TORBROWSER_SYMLINK_VERSION=1\n"; + exit 0; +} + +foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { + next unless $tags{$commit}; + print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; + print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", + substr($commit, 0, 12), "\n"; + print "TORBROWSER_SYMLINK_VERSION=0\n"; + exit 0; +} + +print STDERR "Could not find TORBROWSER version from tags\n"; +exit 1; diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index 2684158..37efdb1 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -14,10 +14,11 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C -cd $TORBROWSER_VERSION +cd $TORBROWSER_BUILDDIR rm -f sha256sums.txt sha256sums.incrementals.txt sha256sum `ls -1 | grep -v '\.incremental\.mar$' | sort` > sha256sums.txt if ls -1 | grep -q '\.incremental\.mar$' diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 45f4f9b..4a773b8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -252,11 +254,11 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo @@ -264,6 +266,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Linux Bundle complete ******" echo diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8a3aba6..ed54dc6 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -219,8 +221,8 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-mac.gbuilt else echo @@ -228,6 +230,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Mac Bundle complete ******" echo diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e950884..945511b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -222,10 +224,10 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo @@ -233,6 +235,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Windows Bundle complete ******" echo diff --git a/gitian/upload-signature.sh b/gitian/upload-signature.sh index 58059aa..c403cd5 100755 --- a/gitian/upload-signature.sh +++ b/gitian/upload-signature.sh @@ -21,21 +21,22 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) -if [ ! -f $TORBROWSER_VERSION/sha256sums.txt.asc ]; +if [ ! -f $TORBROWSER_BUILDDIR/sha256sums.txt.asc ]; then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.txt popd fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] \ - && [ ! -f $TORBROWSER_VERSION/sha256sums.incrementals.txt.asc ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] \ + && [ ! -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc ] then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.incrementals.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.incrementals.txt popd fi -ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_VERSION" -scp $TORBROWSER_VERSION/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_VERSION/ -ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_VERSION && chmod 644 $BASE_DIR/$TORBROWSER_VERSION/*" +ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_BUILDDIR" +scp $TORBROWSER_BUILDDIR/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_BUILDDIR/ +ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_BUILDDIR && chmod 644 $BASE_DIR/$TORBROWSER_BUILDDIR/*" diff --git a/gitian/versions b/gitian/versions index b6ec79f..36f315d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.1 +TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b84f92e..5306d6b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.5-alpha-1 +TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..3678b37 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e6ea2a1..d812187 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,4 +1,7 @@ +TORBROWSER_VERSION_TYPE=nightly TORBROWSER_VERSION=tbb-nightly +TORBROWSER_BUILDDIR=tbb-nightly +TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" BUILD_PT_BUNDLES=1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits