- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.3.0esr-7.0-1] Bug 21830: Copying large text from web console leaks to /tmp
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 7a1b25245e73051cb724a7eb6a66de18263f88c2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:55:49 2017 +0000 Bug 21830: Copying large text from web console leaks to /tmp Patch written by Neill Miller --- widget/nsTransferable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index e99d45401df8..976180c7581e 100644 --- a/widget/nsTransferable.cpp +++ b/widget/nsTransferable.cpp @@ -39,6 +39,7 @@ Notes to self: #include "nsIFile.h" #include "nsILoadContext.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) @@ -248,6 +249,11 @@ nsTransferable::Init(nsILoadContext* aContext) if (aContext) { mPrivateData = aContext->UsePrivateBrowsing(); + } else { + // without aContext here to provide PrivateBrowsing information, + // we defer to the active configured setting + mPrivateData = + mozilla::Preferences::GetBool("browser.privatebrowsing.autostart"); } #ifdef DEBUG mInitialized = true;

1 0

[tor-browser-build/master] Bug 23039: fix detection of runc version
by gk＠torproject.org 19 Sep '17

19 Sep '17

commit 1f054c59ddc349cf5719447bc51eaccde554312a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 19 13:28:34 2017 +0200 Bug 23039: fix detection of runc version In the previous patch, we wrongly assumed that all runc 0.1.1 versions exited with 0 when given an unknown command, and used that to detect the version. It seems it is not true on all systems. We are now using the 'runc --version' command to find the version of runc. We don't support versions older than 0.1.1. --- rbm.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index ef37575..a93fa1a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -375,11 +375,10 @@ ENV: ( var_p => { # runc100 is true if we are using runc >= 1.0.0 + # we assume that any version that is not 0.1.1 is >= 1.0.0 runc100 => sub { - # runc >= 1.0.0 exits with an error when trying to use an unknown - # command while older versions exit with 0 - my (undef, undef, $success) = capture_exec('sudo', 'runc', 'xyzxyzxyz'); - return !$success; + my ($out) = capture_exec('sudo', 'runc', '--version'); + return !($out =~ m/^runc version 0.1.1/); }, }, )

1 0

[tor-browser-build/master] Bug 23039: add support for runc 1.0.0
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 209818fc10ba14e8ebfb126cc364c26300795af9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 14 19:08:14 2017 +0200 Bug 23039: add support for runc 1.0.0 The var_p/runc100 option is used to detect the version of runc we are using. The format of the output of `runc --version` is different in both versions, so it is not easy to parse. However I noticed that runc 0.1.1 does not exit with an error when we try to use a command that does not exist while runc >= 1.0.0 does, so we use that to detect the runc version we are using. When using runc >= 1.0.0, we use `runc run` instead of `runc start': https://github.com/opencontainers/runc/commit/c669b8d1568633c68bd915561ceb2… In the runc config.json file, the format of the capabilities has been changed. Instead of having one list of capabilities, there are now separate lists for bounding, effective, inheritable, permitted and ambient capabilities (and we use the same list for all of them): https://github.com/opencontainers/runtime-spec/commit/eb114f057094dd2314682… We also add /proc/timer_list and /sys/firmware to the "maskedPaths", as those paths are now listed by default in the config.json file generated by `runc spec` with runc 1.0.0. --- README | 3 -- projects/common/runc-config.json | 91 +++++++++++++++++++++++++++++++++++++++- rbm.conf | 16 ++++++- 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/README b/README index 10cadec..5b4a2bc 100644 --- a/README +++ b/README @@ -8,9 +8,6 @@ To build Tor Browser, you need a Linux distribution that has support for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). On Debian jessie, the runc package is available in backports. On Debian stretch, the runc package is available in the main repository. -Version 0.1.1 of runc is required (which is the version available in -Debian stretch and jessie-backports). It is not yet working with runc -version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have sudo access, which is required to be able to extract container file systems, start containers and copy files to and diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 02be3b0..a4386c6 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -1,5 +1,5 @@ { - "ociVersion": "1.0.0-rc1", + "ociVersion": "1.0.0[% IF !c("var_p/runc100") %]-rc1[% END %]", "platform": { "os": "linux", [% IF c("var/container/arch") == 'i386' -%] @@ -22,6 +22,90 @@ "TERM=xterm" ], "cwd": "/", +[% IF c("var_p/runc100") -%] + "capabilities": { + "bounding": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "effective": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "inheritable": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "permitted": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ], + "ambient": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_SETGID", + "CAP_SETUID", + "CAP_MKNOD", + "CAP_SYS_CHROOT", +[% IF c("var/container/CAP_SYS_ADMIN") -%] + "CAP_SYS_ADMIN", +[% END -%] + "CAP_FSETID", + "CAP_FOWNER", + "CAP_DAC_OVERRIDE", + "CAP_CHOWN" + ] + }, +[% ELSE -%] "capabilities": [ "CAP_AUDIT_WRITE", "CAP_KILL", @@ -38,6 +122,7 @@ "CAP_DAC_OVERRIDE", "CAP_CHOWN" ], +[% END -%] "rlimits": [ { "type": "RLIMIT_NOFILE", @@ -165,6 +250,10 @@ "/proc/kcore", "/proc/latency_stats", "/proc/timer_stats", +[% IF c("var_p/runc100") -%] + "/proc/timer_list", + "/sys/firmware", +[% END -%] "/proc/sched_debug" ], "readonlyPaths": [ diff --git a/rbm.conf b/rbm.conf index 7bda275..ef37575 100644 --- a/rbm.conf +++ b/rbm.conf @@ -329,7 +329,7 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] + sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] remote_put: | #!/bin/sh @@ -369,3 +369,17 @@ runc: ENV: TZ: UTC LC_ALL: C +--- | + # This part of the file contains options written in perl + use IO::CaptureOutput qw(capture_exec); + ( + var_p => { + # runc100 is true if we are using runc >= 1.0.0 + runc100 => sub { + # runc >= 1.0.0 exits with an error when trying to use an unknown + # command while older versions exit with 0 + my (undef, undef, $success) = capture_exec('sudo', 'runc', 'xyzxyzxyz'); + return !$success; + }, + }, + )

1 0

[torbutton/master] Bug 23526: 2017 Donation banner text ready for translation
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 0387a6f7f086c101e5b3612a8cfc94a956227a4a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 14 21:41:36 2017 -0700 Bug 23526: 2017 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index f9723bf..4436e21 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance. +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[tor-browser-build/master] Bumping rbm commit for bug 23513
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 90653b4d43d04c8394df3c194d5469aee8980510 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 15 06:21:33 2017 +0000 Bumping rbm commit for bug 23513 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 296fba7..78d9b11 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 +Subproject commit 78d9b11aead5ba9b2386f7ebb2003772823fa293

1 0

[rbm/master] Bug 23513: run remote_finish when there was an error in remote_start
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 78d9b11aead5ba9b2386f7ebb2003772823fa293 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 14 14:03:27 2017 +0200 Bug 23513: run remote_finish when there was an error in remote_start We were looking at the $remote_tmp_src and $remote_tmp_dst variables to decide if running remote_finish is needed. However, those variables are not defined if there was an error in remote_start, and we should still run remote_finish in that case. Instead we look at the remote_exec option to decide if we need to run remote_finish. --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b14909f..96a1b9b 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1103,7 +1103,7 @@ sub build_run { } } EXIT: - if ($remote_tmp_src && $remote_tmp_dst) { + if (project_config($project, "remote_exec", $options)) { my $cmd = project_config($project, "remote_finish", $options); if ($cmd && (run_script($project, $cmd, sub { system(@_) }) != 0)) { $error ||= "Error finishing remote";

1 0

[tor-browser-build/master] Bug 23454: restore stderr in build logs
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 75af4379125bcf3979f54b5773f1ced1c37eb9c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 11 14:30:03 2017 +0200 Bug 23454: restore stderr in build logs In #23425 we redirected the output from runc start to /dev/null to avoid annoying messages saying "stdin: is not a tty". However this also removes stderr from build logs. The command producing the `stdin: is not a tty` message is the `chown -R` command from runc/remote_put, so we now only hide stderr from that part while keeping it for the runc command running the build script. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d574f7a..7bda275 100644 --- a/rbm.conf +++ b/rbm.conf @@ -329,7 +329,7 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] remote_put: | #!/bin/sh @@ -340,7 +340,10 @@ runc: -%] sudo mkdir -p '[% c("var/container/dir") %]'/rootfs/[% dst %] sudo cp -aP [% src %] '[% c("var/container/dir") %]'/rootfs/[% dst %] - [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst }) %] + # On Ubuntu, the /root/.profile file contains a `mesg n` line which is + # producing some `stdin: is not a tty` messages. To hide them, we hide + # stderr from this part by setting runc_hide_stderr. + [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst, runc_hide_stderr => 1 }) %] remote_get: | #!/bin/sh

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 7169757638781da3a706c7700bcd4eb2bc613591 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon May 29 00:38:57 2017 -0500 Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj MinGW applies the gnu_printf format attribute, which expects non-Windows format specifiers. These macros were not designed to handle MinGW. MozReview-Commit-ID: HuJrK43Bg1A --HG-- extra : rebase_source : 6ccc1b2f4ab0e71584f442e86d94322e2c6382fb --- mfbt/SizePrintfMacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfbt/SizePrintfMacros.h b/mfbt/SizePrintfMacros.h index ec55c62c5955..94eff2fe255b 100644 --- a/mfbt/SizePrintfMacros.h +++ b/mfbt/SizePrintfMacros.h @@ -18,7 +18,7 @@ * http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx */ -#if defined(XP_WIN) +#if defined(XP_WIN) && !defined(__MINGW32__) # define PRIoSIZE "Io" # define PRIuSIZE "Iu" # define PRIxSIZE "Ix"

1 0

[tor-browser-build/master] Add tmp to .gitignore
by boklm＠torproject.org 08 Sep '17

08 Sep '17

commit 84881888708f4fd163b1867193fed6471d0c53a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 8 11:13:10 2017 +0200 Add tmp to .gitignore With #23403 we started using the tor-browser-build/tmp directory for the builds. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c4c3919..efd3840 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testbuild /rbm.local.conf /logs +/tmp

1 0

[tor-browser-build/master] Bug 23425: fix build when there is no terminal
by gk＠torproject.org 08 Sep '17

08 Sep '17

commit e21581e108a44915c0bd0f2acd346b02288a52a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 16:58:01 2017 +0200 Bug 23425: fix build when there is no terminal Set process.terminal to false when building, but keep it to true when we open a debugging shell. https://github.com/opencontainers/runtime-spec/blob/master/config.md#process To do that we update the runc config.json in runc/remote_exec rather than only once in runc/remote_start. We also redirect runc stderr to /dev/null to avoid some messages saying "stdin: is not a tty" during the build. --- projects/common/runc-config.json | 2 +- rbm.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 3da6c24..02be3b0 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -9,7 +9,7 @@ [% END -%] }, "process": { - "terminal": true, + "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %], "user": { "uid": 0, "gid": 0 diff --git a/rbm.conf b/rbm.conf index a93df7f..d574f7a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -308,9 +308,6 @@ runc: fi mkdir -p '[% c("var/container/dir") %]'/rootfs/rbm sudo tar -C '[% c("var/container/dir") %]'/rootfs -xf $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'*) - cat > '[% c("var/container/dir") %]'/config.json << EOF - [% INCLUDE 'runc-config.json' %] - EOF [% SET user = c("var/container/user") -%] [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'id ' _ user _ ' >/dev/null 2>&1 || adduser -m ' _ user _ ' || useradd -m ' _ user }) %] @@ -329,7 +326,10 @@ runc: echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rootfs/rbm/run chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/cmd chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/run - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] + cat > '[% c("var/container/dir") %]'/config.json << EOF + [% INCLUDE 'runc-config.json' %] + EOF + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] remote_put: | #!/bin/sh

1 0