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

[tor-browser-bundle/master] Don't shift unconditionally.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0b888ea05c97153c40a02b4c676d5291f9b3b4c8 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 19 13:00:17 2016 +0200 Don't shift unconditionally. --- tools/continuous-builds/park-nightly.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 944e3a1..dff87e2 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -7,8 +7,11 @@ if [ "$1" = "-v" ]; then shift fi -DESTDIR=$1; shift -[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds +DESTDIR=~/public_html/builds +if [ -n "$DESTDIR" ]; then + DESTDIR=$1 + shift +fi do_check() { SAVEDPWD=$PWD

1 0

[torbutton/master] Bug 19837: Whitelist internal URLs that Firefox requires for media.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 61b395a433c821bd4b17f69b956eb149f12f525e Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Aug 15 18:53:05 2016 +0000 Bug 19837: Whitelist internal URLs that Firefox requires for media. Firefox requires being able to load chrome:// and resource:// URLs for things like the media player, with the origin set to the remote URL that triggered the load. This is unfortunate in that there's no way to disambiguate malicious JS versus someone opening a video file (for example). See https://trac.torproject.org/projects/tor/ticket/19837#comment:5 for why this is a huge nightmare and will eventually require C++ code. --- src/components/content-policy.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index e025ecd..3379eb7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -21,7 +21,26 @@ ContentPolicy.prototype = { contractID: "@torproject.org/content-policy;1", QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), + uriWhitelist: { + // Video playback. + "chrome://global/content/TopLevelVideoDocument.js": Ci.nsIContentPolicy.TYPE_SCRIPT, + "resource://gre/res/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/skin/media/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/content/bindings/videocontrols.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/progressmeter.xml": Ci.nsIContentPolicy.TYPE_XBL, + + // Image display. + "resource://gre/res/ImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "resource://gre/res/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/skin/media/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + + // Resizing text boxes. + "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + }, + shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { + // Accept if no content URI or scheme is not a resource/chrome. if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) return Ci.nsIContentPolicy.ACCEPT; @@ -34,6 +53,16 @@ ContentPolicy.prototype = { if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) return Ci.nsIContentPolicy.ACCEPT; + // There's certain things that break horribly if they aren't allowed to + // access URIs with proscribed schemes, with `aContentOrigin` basically + // set to arbibrary URIs. + // + // XXX: Feature gate this behind the security slider or something, I don't + // give a fuck. + if (aContentLocation.spec in this.uriWhitelist) + if (this.uriWhitelist[aContentLocation.spec] == aContentType) + return Ci.nsIContentPolicy.ACCEPT; + return Ci.nsIContentPolicy.REJECT_REQUEST; },

1 0

[tor-browser-bundle/hardened-builds] Version bumps for hardened nightly
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0d8810c64d578e2b7cf659f2aecfe12b07d2fab5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:21:00 2016 +0000 Version bumps for hardened nightly --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index dead59c..1d216fa 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -55,7 +55,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.2.0 CLANG_VER=r247539 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.160 ## 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.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -112,7 +112,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] NoScript version bump for nightlies
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0a0a8c01236ddb50f5f4f87da28758f8e65214de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:19:11 2016 +0000 NoScript version bump for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 749f8ea..f92a471 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## 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.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 10aa41a5d6abf25a912616c39d9e39ebb7cc29d6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 09:15:28 2016 +0200 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c0abf86..4506e37 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 6.0.4 -- August 16 + * All Platforms + * Update Tor to 0.2.8.6 + * Update NoScript to 2.9.0.14 + * Bug 19890: Disable installation of system addons + Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Update Firefox to 45.3.0esr

1 0

[tor-browser-bundle/hardened-builds] Add BUILD_TBB_FAKE_STATUS knob.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 1ca598902fc50e0064c82a66414630ccbea5d385 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:05:52 2016 +0200 Add BUILD_TBB_FAKE_STATUS knob. Useful when testing parts of the machinery not related to the actualy build, like uploading to remote host. Set BUILD_TBB_FAKE_STATUS to 'done' and the script will skip the build part. --- tools/continuous-builds/build-tbb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 37e912a..7a7e812 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -43,6 +43,7 @@ logfile=build-logs/$(date -u +%s).log cd $BUILDDIR || exit 1 status=init +[ -n "$BUILD_TBB_FAKE_STATUS" ] && status=$BUILD_TBB_FAKE_STATUS n=0 MAKE_TARGET=$TARGET while [ $status != done ]; do

1 0

[tor-browser-bundle/hardened-builds] Make park-nightly.sh deal with hardened builds as well.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 3c531d7b77ef6420de1ac03e793afb200a9dd72c Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:02:42 2016 +0200 Make park-nightly.sh deal with hardened builds as well. - Get the name of the directory in the tar file from the tar file rather than trying to construct it using a static string and date(1). This to accomodate hardened builds and to remove the bug where we start the build before midnight but finish it after. - Add explaining comments. - Change the name of the stamp file to reflect that we're using this for more than ordinary nightlies. - Rename some badly named variables. - Prune old hardened builds too. --- tools/continuous-builds/park-nightly.sh | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 63967c9..944e3a1 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -1,18 +1,14 @@ #! /bin/sh -# usage: park-nightly.sh [DIR] - -V=1 #debug is enabled by default for now +# usage: park-nightly.sh [DESTDIR] +V=0 # Verbose. if [ "$1" = "-v" ]; then V=1 shift fi -DIR=$1 -[ -z "$DIR" ] && DIR=~/public_html/builds - -DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. -[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" +DESTDIR=$1; shift +[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds do_check() { SAVEDPWD=$PWD @@ -25,29 +21,41 @@ do_check() { cd $SAVEDPWD } -if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then - [ -z "$V" ] || echo "Files already here, just doing the checking" - do_check $DIR/$DSTDIR - exit -fi - +# Create a staging directory and cd there. STAGINGDIR=.staging.$(date -u +%s) [ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" [ -d $STAGINGDIR ] || mkdir $STAGINGDIR chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 +# Untar incoming data. [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v tar $TAROPT -f - || exit 6 -touch $DSTDIR/tbb-nightly.stamp -do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ - rm -rf $DIR/$DSTDIR -[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" -mv $DSTDIR $DIR/ || exit 1 +# Tar file should contain exactly one directory. +INCOMING=$(ls | head -1) +[ -z "$V" ] || echo "Aiming to fill up $DESTDIR/$INCOMING" + +# Stamp the directory. +touch $INCOMING/park-nightly.stamp + +# Verify checksums. +do_check $INCOMING || exit 2 + +# Clean up destination directory iff it has a stamp file. +[ -d $DESTDIR/$INCOMING ] && [ -e $DESTDIR/$INCOMING/park-nightly.stamp ] && \ + rm -rf $DESTDIR/$INCOMING + +# Move incoming data to destination directory. +[ -d $DESTDIR ] || mkdir $DESTDIR +[ -z "$V" ] || echo "Moving $INCOMING to $DESTDIR/" +mv $INCOMING $DESTDIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" +# Clean up staging directory and remove old builds. cd ..; rmdir $STAGINGDIR -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR +if [ -x ~/usr/bin/prune-old-builds ]; then + ~/usr/bin/prune-old-builds --prefix=tbb-nightly- $DESTDIR + ~/usr/bin/prune-old-builds --prefix=tbb-nightly-hardened- $DESTDIR +fi

1 0

[tor-browser-bundle/master] Add BUILD_TBB_FAKE_STATUS knob.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 028d1d1e9385e5bc254d228c986872c136225cbb Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:05:52 2016 +0200 Add BUILD_TBB_FAKE_STATUS knob. Useful when testing parts of the machinery not related to the actualy build, like uploading to remote host. Set BUILD_TBB_FAKE_STATUS to 'done' and the script will skip the build part. --- tools/continuous-builds/build-tbb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 37e912a..7a7e812 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -43,6 +43,7 @@ logfile=build-logs/$(date -u +%s).log cd $BUILDDIR || exit 1 status=init +[ -n "$BUILD_TBB_FAKE_STATUS" ] && status=$BUILD_TBB_FAKE_STATUS n=0 MAKE_TARGET=$TARGET while [ $status != done ]; do

1 0

[tor-browser-bundle/master] Make park-nightly.sh deal with hardened builds as well.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit c13c5f559ad3e6d848b73a3ca42f08e2ae657161 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:02:42 2016 +0200 Make park-nightly.sh deal with hardened builds as well. - Get the name of the directory in the tar file from the tar file rather than trying to construct it using a static string and date(1). This to accomodate hardened builds and to remove the bug where we start the build before midnight but finish it after. - Add explaining comments. - Change the name of the stamp file to reflect that we're using this for more than ordinary nightlies. - Rename some badly named variables. - Prune old hardened builds too. --- tools/continuous-builds/park-nightly.sh | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 63967c9..944e3a1 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -1,18 +1,14 @@ #! /bin/sh -# usage: park-nightly.sh [DIR] - -V=1 #debug is enabled by default for now +# usage: park-nightly.sh [DESTDIR] +V=0 # Verbose. if [ "$1" = "-v" ]; then V=1 shift fi -DIR=$1 -[ -z "$DIR" ] && DIR=~/public_html/builds - -DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. -[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" +DESTDIR=$1; shift +[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds do_check() { SAVEDPWD=$PWD @@ -25,29 +21,41 @@ do_check() { cd $SAVEDPWD } -if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then - [ -z "$V" ] || echo "Files already here, just doing the checking" - do_check $DIR/$DSTDIR - exit -fi - +# Create a staging directory and cd there. STAGINGDIR=.staging.$(date -u +%s) [ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" [ -d $STAGINGDIR ] || mkdir $STAGINGDIR chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 +# Untar incoming data. [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v tar $TAROPT -f - || exit 6 -touch $DSTDIR/tbb-nightly.stamp -do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ - rm -rf $DIR/$DSTDIR -[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" -mv $DSTDIR $DIR/ || exit 1 +# Tar file should contain exactly one directory. +INCOMING=$(ls | head -1) +[ -z "$V" ] || echo "Aiming to fill up $DESTDIR/$INCOMING" + +# Stamp the directory. +touch $INCOMING/park-nightly.stamp + +# Verify checksums. +do_check $INCOMING || exit 2 + +# Clean up destination directory iff it has a stamp file. +[ -d $DESTDIR/$INCOMING ] && [ -e $DESTDIR/$INCOMING/park-nightly.stamp ] && \ + rm -rf $DESTDIR/$INCOMING + +# Move incoming data to destination directory. +[ -d $DESTDIR ] || mkdir $DESTDIR +[ -z "$V" ] || echo "Moving $INCOMING to $DESTDIR/" +mv $INCOMING $DESTDIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" +# Clean up staging directory and remove old builds. cd ..; rmdir $STAGINGDIR -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR +if [ -x ~/usr/bin/prune-old-builds ]; then + ~/usr/bin/prune-old-builds --prefix=tbb-nightly- $DESTDIR + ~/usr/bin/prune-old-builds --prefix=tbb-nightly-hardened- $DESTDIR +fi

1 0

[tor-browser-bundle/hardened-builds] Don't tail nonexistent files.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit ba295be2532724b81433795e16f94d53cbaa3321 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Aug 18 10:27:15 2016 +0200 Don't tail nonexistent files. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f0ff132..37e912a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -69,9 +69,9 @@ if [ $status = done ]; then else echo "$0: giving up after $n tries" | tee -a $logfile if [ -n "$LOGRECIPIENTS" ]; then - FILES="$logfile \ - ../../gitian-builder/var/build.log \ - ../../gitian-builder/var/target.log" + FILES="$logfile" + [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" + [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi

1 0