September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'asn/bug23531'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit c4c4d0341221da6e2f5c5f8bfebaf91e1ed9f1f4 Merge: 123337bbc 88c58078f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 08:16:20 2017 -0400 Merge remote-tracking branch 'asn/bug23531' changes/prop224 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket23528'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 123337bbc998b39929da76a379331417f8580833 Merge: 72391fce2 42e7d0ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 08:15:36 2017 -0400 Merge remote-tracking branch 'teor/ticket23528' src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Explain the restrictions on divisor in round*_to_next_multiple_of
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 42e7d0ea14fb88500d488983c82003a668d0446a Author: teor <teor2345(a)gmail.com> Date: Fri Sep 15 16:06:17 2017 +1000 Explain the restrictions on divisor in round*_to_next_multiple_of Closes 23528. --- src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 36d0f4d06..ac2fd6700 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -477,7 +477,7 @@ round_to_power_of_2(uint64_t u64) /** Return the lowest x such that x is at least number, and x modulo * divisor == 0. If no such x can be expressed as an unsigned, return - * UINT_MAX */ + * UINT_MAX. Asserts if divisor is zero. */ unsigned round_to_next_multiple_of(unsigned number, unsigned divisor) { @@ -491,7 +491,7 @@ round_to_next_multiple_of(unsigned number, unsigned divisor) /** Return the lowest x such that x is at least number, and x modulo * divisor == 0. If no such x can be expressed as a uint32_t, return - * UINT32_MAX */ + * UINT32_MAX. Asserts if divisor is zero. */ uint32_t round_uint32_to_next_multiple_of(uint32_t number, uint32_t divisor) { @@ -506,7 +506,7 @@ round_uint32_to_next_multiple_of(uint32_t number, uint32_t divisor) /** Return the lowest x such that x is at least number, and x modulo * divisor == 0. If no such x can be expressed as a uint64_t, return - * UINT64_MAX */ + * UINT64_MAX. Asserts if divisor is zero. */ uint64_t round_uint64_to_next_multiple_of(uint64_t number, uint64_t divisor) {

1 0

[tor/master] Explain where bridge download statuses are initialised
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit d60e7df2da5bfae62750bc4b41581d47e504e4bf Author: teor <teor2345(a)gmail.com> Date: Fri Sep 15 13:50:29 2017 +1000 Explain where bridge download statuses are initialised And why we can't initialise them on config Comment-only change, follow-up to 23347. --- src/or/bridges.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/bridges.c b/src/or/bridges.c index 0d4549dd1..812b0ddce 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -455,8 +455,8 @@ bridge_add_from_config(bridge_line_t *bridge_line) b->fetch_status.schedule = DL_SCHED_BRIDGE; b->fetch_status.backoff = DL_SCHED_RANDOM_EXPONENTIAL; b->fetch_status.increment_on = DL_SCHED_INCREMENT_ATTEMPT; - /* This will fail if UseBridges is not set -- and it does. */ - // download_status_reset(&b->fetch_status); + /* We can't reset the bridge's download status here, because UseBridges + * might be 0 now, and it might be changed to 1 much later. */ b->socks_args = bridge_line->socks_args; if (!bridge_list) bridge_list = smartlist_new(); @@ -625,6 +625,7 @@ fetch_bridge_descriptors(const or_options_t *options, time_t now) SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { + /* This resets the download status on first use */ if (!download_status_is_ready(&bridge->fetch_status, now, IMPOSSIBLE_TO_DOWNLOAD)) continue; /* don't bother, no need to retry yet */

1 0

[tor/master] Avoid an instance of the bug warning in any_bridge_descriptors_known()
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 6e87c0b23e622e95d8348650f7bdf2af75ab824e Author: teor <teor2345(a)gmail.com> Date: Fri Sep 15 14:17:41 2017 +1000 Avoid an instance of the bug warning in any_bridge_descriptors_known() Part of 23524. --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 01d9fc617..630524db6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5379,7 +5379,7 @@ find_dl_schedule(const download_status_t *dls, const or_options_t *options) } case DL_SCHED_BRIDGE: /* A bridge client downloading bridge descriptors */ - if (any_bridge_descriptors_known()) { + if (options->UseBridges && any_bridge_descriptors_known()) { /* A bridge client with one or more running bridges */ return options->TestingBridgeDownloadSchedule; } else {

1 0

[tor/master] Make an assert into a BUG warning in the bridge code
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 033691212a49d3d32f8a684a493c8c11b8887eee Author: teor <teor2345(a)gmail.com> Date: Fri Sep 15 14:02:22 2017 +1000 Make an assert into a BUG warning in the bridge code If future code asks if there are any running bridges, without checking if bridges are enabled, log a BUG warning rather than crashing. Fixes 23524 on 0.3.0.1-alpha --- changes/bug23524 | 4 ++++ src/or/bridges.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug23524 b/changes/bug23524 new file mode 100644 index 000000000..c8ece5293 --- /dev/null +++ b/changes/bug23524 @@ -0,0 +1,4 @@ + o Minor bugfixes (DoS-resistance): + - If future code asks if there are any running bridges, without checking + if bridges are enabled, log a BUG warning rather than crashing. + Fixes 23524 on 0.3.0.1-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 812b0ddce..1eec4e39e 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -836,7 +836,9 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) MOCK_IMPL(int, any_bridge_descriptors_known, (void)) { - tor_assert(get_options()->UseBridges); + if (BUG(!get_options()->UseBridges)) { + return 0; + } if (!bridge_list) return 0;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug23524'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 72391fce2336cf028e6d0b6cb0be41b2db81ebcf Merge: 61b5d0535 6e87c0b23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 08:13:45 2017 -0400 Merge remote-tracking branch 'teor/bug23524' changes/bug23524 | 4 ++++ src/or/bridges.c | 9 ++++++--- src/or/directory.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)

1 0

[tor/master] Make control port download status next attempts consistent
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 61b5d053580410775a94fc24394a607642258ebd Author: teor <teor2345(a)gmail.com> Date: Fri Sep 15 14:11:34 2017 +1000 Make control port download status next attempts consistent Make download status next attempts reported over the control port consistent with the time used by tor. This issue only occurs if a download status has not been reset before it is queried over the control port. Fixes 23525, not in any released version of tor. --- changes/bug23525 | 6 ++++++ src/or/control.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug23525 b/changes/bug23525 new file mode 100644 index 000000000..3a9c766c3 --- /dev/null +++ b/changes/bug23525 @@ -0,0 +1,6 @@ + o Minor bugfixes (control port): + - Make download status next attempts reported over the control port + consistent with the time used by tor. This issue only occurs if a + download status has not been reset before it is queried over the + control port. + Fixes 23525, not in any released version of tor. diff --git a/src/or/control.c b/src/or/control.c index ce2a4c8cf..b5dc87b83 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2158,7 +2158,7 @@ download_status_to_string(const download_status_t *dl) if (dl) { /* Get some substrings of the eventual output ready */ - format_iso_time(tbuf, dl->next_attempt_at); + format_iso_time(tbuf, download_status_get_next_attempt_at(dl)); switch (dl->schedule) { case DL_SCHED_GENERIC:

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

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 15 Sep '17

15 Sep '17

commit 49e03941af4edeeb796b7788d26106713228a51b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 15 06:48:02 2017 +0000 Update translations for tails-openpgp-applet_completed --- el/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/openpgp-applet.pot b/el/openpgp-applet.pot index 48f435316..81394eac3 100644 --- a/el/openpgp-applet.pot +++ b/el/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-14 22:12+0000\n" +"PO-Revision-Date: 2017-09-15 06:28+0000\n" "Last-Translator: metamec\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n"

1 0