- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32976_v3'
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit e1127b38167b902a1b77b14b8c06cfbce9bae653 Merge: 6c24592 f531a00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 27 12:25:59 2020 +0100 Merge remote-tracking branch 'gk/bug_32976_v3' projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 32976: Build and bundle geckodriver
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit f531a004aaa169d9a4a06a3b6d7c04c6fd812f9c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 19 21:06:37 2020 +0000 Bug 32976: Build and bundle geckodriver Geckodriver is not built by default in release builds. However, it's useful if we build it reproducibly so we can avoid trusting some binary downloaded from the Internet for our QA and Selenium related work. Only the 64bit Linux version is built and included as I doubt we'll need geckodriver on anything else for our purposes. --- projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index b42b301..22c5b5d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -151,6 +151,9 @@ rm -f js/src/configure [% END %] [% IF c("var/linux") %] + [% IF c("var/linux-x86_64") %] + cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir + [% END %] cp -a obj-*/dist/firefox/* $distdir/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $distdir/Browser/firefox-bin @@ -213,6 +216,8 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir [% IF c("var/linux-x86_64") %] + # No need for an unstripped geckodriver + strip geckodriver mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -258,6 +263,10 @@ END; tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', }) %] +[% c('tar', { + tar_src => [ 'geckodriver' ], + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz', + }) %] [% END %] [% c('zip', { diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 19d2885..59517cd 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -33,6 +33,8 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection +# We want to bundle an own geckodriver, so we can use it for QA and other work +ac_add_options --enable-geckodriver # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2c72e03..4d44f12 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -292,6 +292,7 @@ SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz + cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ [% END -%] [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug
by boklm＠torproject.org 23 Jan '20

23 Jan '20

commit 3b2165b8be4f7fd7889c17cbb39a4348f7666bc8 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jan 13 20:41:14 2020 +0000 Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug Using a weak RNG for the form boundary allows a website operator to perform several attacks on users (as outlined in https://trac.torproject.org/projects/tor/ticket/22919) These include: - Identifying Windows users based on the unseeded RNG - Identify the number of form submissions that have occurred cross-origin between same-origin submissions Additionally, a predictable boundary makes it possible to forge a boundary in the middle of a file upload. Differential Revision: https://phabricator.services.mozilla.com/D56056 --HG-- extra : moz-landing-system : lando --- dom/html/HTMLFormSubmission.cpp | 7 ++++--- mfbt/RandomNum.cpp | 8 ++++++++ mfbt/RandomNum.h | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dom/html/HTMLFormSubmission.cpp b/dom/html/HTMLFormSubmission.cpp index baaed020ec3f..384ca3661426 100644 --- a/dom/html/HTMLFormSubmission.cpp +++ b/dom/html/HTMLFormSubmission.cpp @@ -37,6 +37,7 @@ #include "mozilla/dom/Directory.h" #include "mozilla/dom/File.h" #include "mozilla/StaticPrefs.h" +#include "mozilla/RandomNum.h" namespace mozilla { namespace dom { @@ -367,9 +368,9 @@ FSMultipartFormData::FSMultipartFormData(nsIURI* aActionURL, mTotalLength = 0; mBoundary.AssignLiteral("---------------------------"); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); } FSMultipartFormData::~FSMultipartFormData() { diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp index 69f19e9d01fa..c3bb9ecef444 100644 --- a/mfbt/RandomNum.cpp +++ b/mfbt/RandomNum.cpp @@ -150,4 +150,12 @@ MFBT_API Maybe<uint64_t> RandomUint64() { #endif } +MFBT_API uint64_t RandomUint64OrDie() { + Maybe<uint64_t> maybeRandomNum = RandomUint64(); + + MOZ_RELEASE_ASSERT(maybeRandomNum.isSome()); + + return maybeRandomNum.value(); +} + } // namespace mozilla diff --git a/mfbt/RandomNum.h b/mfbt/RandomNum.h index 5af510d621a6..5d392c9a6819 100644 --- a/mfbt/RandomNum.h +++ b/mfbt/RandomNum.h @@ -30,6 +30,12 @@ namespace mozilla { */ MFBT_API Maybe<uint64_t> RandomUint64(); +/** + * Like RandomUint64, but always returns a uint64_t or crashes with an assert + * if the underlying RandomUint64 call failed. + */ +MFBT_API uint64_t RandomUint64OrDie(); + } // namespace mozilla #endif // mozilla_RandomNum_h_

1 0

[tor-browser-build/master] Bug 33012: Remove unneeded namecoin and snowflake definitions
by gk＠torproject.org 21 Jan '20

21 Jan '20

commit 6c245925b40b13f8508ca3ade45425338a56acdf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 21 13:30:28 2020 +0100 Bug 33012: Remove unneeded namecoin and snowflake definitions --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 213971e..f0e22a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -232,8 +232,6 @@ targets: android_min_api_armv7: 16 android_min_api_x86: 16 android_min_api_x86_64: 21 - snowflake: 0 - namecoin: 0 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: @@ -332,7 +330,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python @@ -361,7 +358,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 32435: Add WebAssembly support for RLBox
by boklm＠torproject.org 21 Jan '20

21 Jan '20

commit a1eab9035af5b5d6cc8ab21615676f9f237c074f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 21 08:03:42 2020 +0000 Bug 32435: Add WebAssembly support for RLBox --- projects/clang/build | 5 ++++- rbm.conf | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/clang/build b/projects/clang/build index 825b21e..d95e9af 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -40,7 +40,10 @@ cd llvm export LLVM_HOME=$(pwd) mkdir build cd build -cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME +cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/rbm.conf b/rbm.conf index 73c617b..213971e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -262,6 +262,8 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 + # We only support RLBox on the nightly channel and x86_64 for now + rlbox: '[% c("var/nightly") %]' linux-i686: arch: i686 var:

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.3 and 9.0.4
by sysrqb＠torproject.org 20 Jan '20

20 Jan '20

commit e8afa21c48b081abb0581287a0b891c02cc28799 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jan 20 14:30:22 2020 +0000 Fold in stable changelog for 9.0.3 and 9.0.4 --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e8e5741..a123447 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,30 @@ Tor Browser 9.5a4 -- January 10 2020 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs +Tor Browser 9.0.4 -- January 9 2020 + * All Platforms + * Update Firefox to 68.4.1esr + +Tor Browser 9.0.3 -- January 7 2020 + * All Platforms + * Update Firefox to 68.4.0esr + * Bump NoScript to 11.0.11 + * Translations update + * Update OpenPGP keyring + * Bug 32606: Set up default bridge at Georgetown University + * Bug 32659: Remove IPv6 address of default bridge + * Bug 32547: Add new default bridge at UMN + * Bug 31855: Remove End of Year Fundraising Campaign from about:tor + * Windows + OS X + Linux + * Bump Tor to 0.4.2.5 + * Update Tor Launcher to 0.2.20.5 + * Bug 32636: Clean up locales shipped with Tor Launcher + * Android + * Bug 32405: Crash immediately after bootstrap on Android + * Build System + * Linux + * Bug 32676: Create a tarball with all Linux x86_64 language packs + Tor Browser 9.0.2 -- December 3 2019 * All Platforms * Update Firefox to 68.3.0esr

1 0

[tor-browser-build/master] Bug 32979: Update README to add File::Slurp to the list of dependencies
by gk＠torproject.org 17 Jan '20

17 Jan '20

commit 14bb4de90418ce84b8bf603e0f7392c0a08dfbd1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 16 19:52:02 2020 +0100 Bug 32979: Update README to add File::Slurp to the list of dependencies --- README | 3 ++- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index 5dbf77e..8e97e2f 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ You also need a few perl modules installed: - File::Temp - Path::Tiny - File::Path +- File::Slurp - File::Copy::Recursive - String::ShellQuote - Sort::Versions @@ -42,7 +43,7 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git runc \ + libfile-copy-recursive-perl libfile-slurp-perl git runc \ mercurial The build system is based on rbm, which is included as a git submodule diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index 4e84709..92b35e8 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -19,6 +19,7 @@ - libdata-uuid-perl - libdata-dump-perl - libfile-copy-recursive-perl + - libfile-slurp-perl - libgtk2.0-dev - curl - runc

1 0

[tor-browser-build/master] Add missing Changelog item
by gk＠torproject.org 12 Jan '20

12 Jan '20

commit 4e4ffefc35645faafe4af93d78965c6b073e5be0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:03:24 2020 +0000 Add missing Changelog item --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b60ee3b..e8e5741 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1509,6 +1509,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 26049: Reduce delay for showing update prompt to 1 hour * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer) * Bug 19910: Rip out optimistic data socks handshake variant (#3875) @@ -1696,6 +1697,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 17965: Isolate HPKP and HSTS to URL bar domain * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 22564: Hide Firefox Sync * Bug 25090: Disable updater telemetry

1 0

[tor-browser-build/master] Bump release date in ChangeLog
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 99944666ff3784b48ddd3d7e3be536b7545ac4b6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:30:14 2020 +0000 Bump release date in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3a6f424..b60ee3b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.5a4 -- January 9 2020 +Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11

1 0

[tor-browser-build/master] Changelog update and versions bump for 68.4.1esr
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 32ed0c3d083b3eaf4453af5e912590c59030c8d1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:24:40 2020 +0000 Changelog update and versions bump for 68.4.1esr --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9082c04..f780084 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.0 + firefox_platform_version: 68.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 96eddbe..3a6f424 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.5a4 -- January 8 2020 +Tor Browser 9.5a4 -- January 9 2020 * All Platforms - * Update Firefox to 68.4.0esr + * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11 * Translations update * Update OpenPGP keyring diff --git a/rbm.conf b/rbm.conf index 5ac3328..73c617b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a3 project_name: tor-browser

1 0