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

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 15 Jul '16

15 Jul '16

commit 1ca4e649547a905449f81f154fa3055a8364d1f3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 22 15:58:14 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Avoid compilation errors when MOZ_UPDATER is not defined. Fixes bug 19484. --- toolkit/xre/nsAppRunner.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 67bb2d3..1426d77 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2712,7 +2712,10 @@ static bool gDoProfileReset = false; // 6) display the profile-manager UI static nsresult SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, - nsIFile *aAppDir, nsINativeAppSupport* aNative, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsIFile *aAppDir, +#endif + nsINativeAppSupport* aNative, bool* aStartOffline, nsACString* aProfileName) { StartupTimeline::Record(StartupTimeline::SELECT_PROFILE); @@ -4303,10 +4306,19 @@ XREMain::XRE_mainStartup(bool* aExitFlag) } #endif +#if (defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) + nsCOMPtr<nsIFile> exeFile, exeDir; + bool persistent; + rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, 1); + rv = exeFile->GetParent(getter_AddRefs(exeDir)); + NS_ENSURE_SUCCESS(rv, 1); +#endif + #if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID) // Check for and process any available updates nsCOMPtr<nsIFile> updRoot; - bool persistent; rv = mDirProvider.GetFile(XRE_UPDATE_ROOT_DIR, &persistent, getter_AddRefs(updRoot)); // XRE_UPDATE_ROOT_DIR may fail. Fallback to appDir if failed @@ -4341,12 +4353,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag) if (CheckArg("test-process-updates")) { SaveToEnv("MOZ_TEST_PROCESS_UPDATES=1"); } - nsCOMPtr<nsIFile> exeFile, exeDir; - rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, - getter_AddRefs(exeFile)); - NS_ENSURE_SUCCESS(rv, 1); - rv = exeFile->GetParent(getter_AddRefs(exeDir)); - NS_ENSURE_SUCCESS(rv, 1); #ifdef TOR_BROWSER_UPDATE nsAutoCString compatVersion(TOR_BROWSER_VERSION); #endif @@ -4395,7 +4401,10 @@ XREMain::XRE_mainStartup(bool* aExitFlag) return 1; } - rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, exeDir, + rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + exeDir, +#endif mNativeApp, &mStartOffline, &mProfileName); if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {

1 0

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

14 Jul '16

commit 1198d77c4ef82db7878e04920523b13ab0e678e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 14 17:09:12 2016 +0200 Bug 18923: Add a script to run all Tor Browser specific tests --- run-tbb-tests | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tbb-tests-ignore.txt | 4 ++++ 2 files changed, 64 insertions(+) diff --git a/run-tbb-tests b/run-tbb-tests new file mode 100755 index 0000000..5e266f9 --- /dev/null +++ b/run-tbb-tests @@ -0,0 +1,60 @@ +#!/bin/bash + +# This script runs all the Mochitest tests that have been added or +# modified since the last ffxbld commit. +# +# It does not currently run XPCShell tests. We should change this if we +# start using this type or other types of tests. +# +# The logs of the tests are stored in the tbb-tests.log file. +# Ignored tests are listed in the tbb-tests-ignore.txt file. +# +# https://trac.torproject.org/projects/tor/ticket/18923 + +IFS=$'\n' + +if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ] +then + echo "Using tests list from file tbb-tests-list.txt" + tests=($(cat tbb-tests-list.txt)) +else + ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ + | head -1 | cut -d ' ' -f 2) + + tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ + grep -e '^[AM].*/test_[^/]\+\.$html\|xul$$' \ + -e '^[AM].*/browser_[^/]\+\.js$' \ + | sed 's/^[AM]\s\+//')) +fi + +echo 'The following tests will be run:' +for i in "${!tests[@]}" +do + if [ -z "$USE_TESTS_LIST" ] \ + && grep -q "^${tests[$i]}$" tbb-tests-ignore.txt + then + unset "tests[$i]" + continue + fi + echo "- ${tests[$i]}" +done + +if [ -n "$WRITE_TESTS_LIST" ] +then + rm -f tbb-tests-list.txt + for i in "${!tests[@]}" + do + echo "${tests[$i]}" >> tbb-tests-list.txt + done + exit 0 +fi + +rm -f tbb-tests.log +echo $'\n''Starting tests' +./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ + "${tests[@]}" + +echo "*************************" +echo "*************************" +echo "Summary of failed tests:" +grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt new file mode 100644 index 0000000..00978df --- /dev/null +++ b/tbb-tests-ignore.txt @@ -0,0 +1,4 @@ +# This file contains the list of tests ignored by the run-tbb-tests script + +#19575: Test for privacy.thirdparty.isolate fails with a timeout +dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html

1 0

[tor-browser-bundle/maint-6.0] Bug 19269: Icon doesn't appear in Applications folder or Dock
by gk＠torproject.org 14 Jul '16

14 Jul '16

commit a444e50be76078eead724908f9154d9217ec3f91 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 13 15:30:49 2016 -0400 Bug 19269: Icon doesn't appear in Applications folder or Dock On OSX, when building with DATA_OUTSIDE_APP_DIR = 1, set the mode on all files and directories properly so that standard (unprivileged) users can access all files in the app bundle. --- gitian/build-helpers/ddmg.sh | 16 ++++++++++------ gitian/descriptors/mac/gitian-bundle.yml | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index cb513e8..a58e774 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,17 +5,21 @@ export LC_ALL=C DMGFILE=$1 shift -# We need group readability for some Macs to be able to handle /Applications -# installation. Still unclear exactly why this is -- it is not dependent on -# OSX version... -find $@ -executable -exec chmod 750 {} \; -find $@ ! -executable -exec chmod 640 {} \; +if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then + EXE_MODE=0755 + OTHER_MODE=0644 +else + EXE_MODE=0750 + OTHER_MODE=0640 +fi +find $@ -executable -exec chmod $EXE_MODE {} \; +find $@ ! -executable -exec chmod $OTHER_MODE {} \; cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode $EXE_MODE -new-dir-mode $EXE_MODE cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a1a4ed8..d644a56 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -71,6 +71,9 @@ script: | export TORBROWSER_APP="TorBrowser" export TORBROWSER_NAME="TorBrowserBundle" + # ddmg.sh needs DATA_OUTSIDE_APP_DIR + export DATA_OUTSIDE_APP_DIR + if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then DOCSPATH=Contents/Resources/TorBrowser/Docs EXTSPATH=Contents/Resources/distribution/extensions

1 0

[tor-browser-bundle/master] Bug 19269: Icon doesn't appear in Applications folder or Dock
by gk＠torproject.org 14 Jul '16

14 Jul '16

commit 3c39bce72160b9dbbf1196deea613ad8e2116eaa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 13 15:30:49 2016 -0400 Bug 19269: Icon doesn't appear in Applications folder or Dock On OSX, when building with DATA_OUTSIDE_APP_DIR = 1, set the mode on all files and directories properly so that standard (unprivileged) users can access all files in the app bundle. --- gitian/build-helpers/ddmg.sh | 16 ++++++++++------ gitian/descriptors/mac/gitian-bundle.yml | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index e36fca9..dc76b6f 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,11 +5,15 @@ export LC_ALL=C DMGFILE=$1 shift -# We need group readability for some Macs to be able to handle /Applications -# installation. Still unclear exactly why this is -- it is not dependent on -# OSX version... -find $@ -executable -exec chmod 750 {} \; -find $@ ! -executable -exec chmod 640 {} \; +if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then + EXE_MODE=0755 + OTHER_MODE=0644 +else + EXE_MODE=0750 + OTHER_MODE=0640 +fi +find $@ -executable -exec chmod $EXE_MODE {} \; +find $@ ! -executable -exec chmod $OTHER_MODE {} \; [ -n "$REFERENCE_DATETIME" ] && \ find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; @@ -18,7 +22,7 @@ cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode $EXE_MODE -new-dir-mode $EXE_MODE cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a1a4ed8..d644a56 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -71,6 +71,9 @@ script: | export TORBROWSER_APP="TorBrowser" export TORBROWSER_NAME="TorBrowserBundle" + # ddmg.sh needs DATA_OUTSIDE_APP_DIR + export DATA_OUTSIDE_APP_DIR + if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then DOCSPATH=Contents/Resources/TorBrowser/Docs EXTSPATH=Contents/Resources/distribution/extensions

1 0

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

13 Jul '16

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

1 0

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

12 Jul '16

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

1 0

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

12 Jul '16

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

1 0

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

12 Jul '16

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

1 0

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

12 Jul '16

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

1 0

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

01 Jul '16

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

1 0