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

[rbm/master] Add support for optional local configuration file rbm.local.conf
by boklm＠torproject.org 13 Feb '17

13 Feb '17

commit a57b4846c8aba5697ce1f197996e2962ffb5b534 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 00:28:45 2017 +0100 Add support for optional local configuration file rbm.local.conf --- NEWS | 2 ++ doc/rbm_cli.asc | 3 +++ doc/rbm_config.asc | 29 ++++++++++++++++++++++++++--- lib/RBM.pm | 10 +++++++++- lib/RBM/DefaultConfig.pm | 1 + rbm | 3 ++- 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 82890a5..1a1789f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add support for optional local configuration file rbm.local.conf + - add the git_submodule option - add the hg_opt option diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index 92b84ef..66f6025 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -31,6 +31,9 @@ The following options can be set on the command line : --sysconf-file=<file>:: Set the optional system configuration file path + --localconf-file=<file>:: + Set the optional local configuration file path + --target=<target>:: Set the target. This option can be used multiple times to use more than one target. See link:rbm_targets.html[rbm_targets(7)] for diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 27b8f7a..e8decd9 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -8,11 +8,13 @@ rbm_config - The rbm configuration DESCRIPTION ----------- -All configuration options can be defined in 3 different places : +All configuration options can be defined in 5 different places : -- in the main configuration in your working directory +- in the main configuration in your working directory (+rbm.conf+) -- in the global system configuration +- in the local configuration in your working directory (+rbm.local.conf+) + +- in the global system configuration (+/etc/rbm.conf+) - in a project configuration @@ -30,6 +32,14 @@ The option values are used with the following priority order : - project config +- local config for matching step and target + +- local config for matching step + +- local config for matching target + +- local config + - workspace config for matching step and target - workspace config for matching step @@ -62,6 +72,13 @@ This is where you will put configuration relevant to all projects under this working directory. All relative paths used in the configuration are relative from the +rbm.conf+ location. +The local configuration file is +rbm.local.conf+ (or the file defined +by the +localconf_file+ option), in the same directory as the +rbm.conf+ +file. If the file does not exists, it is ignored. The +rbm.local.conf+ +file is used to override some options from +rbm.conf+ relevent to your +local setup, whithout modifying the +rbm.conf+ file which is usually +maintained in a VCS. + An example +rbm.conf+ file will look like this : ---- @@ -89,6 +106,12 @@ sysconf_file:: is +/etc/rbm.conf+. This can also be set with the --sysconf-file command line parameter. +localconf_file:: + The path to an optional local configuration file. The default + is +rbm.local.conf+. If the path is relative, it is relative to + the directory where the +rbm.conf+ file is located. This can + also be set with the --localconf-file command line parameter. + projects_dir:: The directory containing the projects definitions. The default value is +projects+. diff --git a/lib/RBM.pm b/lib/RBM.pm index ad39526..4b5bfe9 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -61,6 +61,13 @@ sub load_system_config { $config->{system} = -f $cfile ? load_config_file($cfile) : {}; } +sub load_local_config { + my ($project) = @_; + my $cfile = project_config($project ? $project : 'undef', 'localconf_file'); + $cfile = path($cfile); + $config->{local} = -f $cfile ? load_config_file($cfile) : {}; +} + sub find_config_file { for (my $dir = getcwd; $dir ne '/'; $dir = dirname($dir)) { return "$dir/rbm.conf" if -f "$dir/rbm.conf"; @@ -209,7 +216,8 @@ sub project_config { my $opt_save = $config->{opt}; $config->{opt} = { %{$config->{opt}}, %$options } if $options; $res = config($project, $name, $options, ['opt'], ['run'], - ['projects', $project], [], ['system'], ['default']); + ['projects', $project], ['local'], [], + ['system'], ['default']); if (!$options->{no_tmpl} && defined($res) && !ref $res && !notmpl(confkey_str($name), $project)) { $res = process_template($project, $res, diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 8172f04..052cf16 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -103,6 +103,7 @@ sub docker_version { our %default_config = ( sysconf_file => '/etc/rbm.conf', + localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', projects_dir => 'projects', output_dir => 'out', diff --git a/rbm b/rbm index 52f3076..c618ada 100755 --- a/rbm +++ b/rbm @@ -95,7 +95,7 @@ sub set_options { gpg-keyring=s gpg-keyring-dir=s gpg-args=s gpg-bin=s sysconf-file=s debsign-keyid=s use-pbuilder! step=s target=s@ publish-src-dir=s debug! hg-clone-dir=s - hg-hash=s); + hg-hash=s localconf-file=s); my %val; Getopt::Long::GetOptionsFromArray(\@_, \%val, @options) || exit 1; foreach my $k (keys %val) { @@ -108,6 +108,7 @@ sub set_options { $RBM::config->{run}{$l} = $val{$k}; } RBM::load_system_config(@_); + RBM::load_local_config(@_); return $RBM::config->{run}{args} = \@_; }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug21116_030_01'
by nickm＠torproject.org 13 Feb '17

13 Feb '17

commit dca8ae5cfa8b081230d033158c980d50840b072a Merge: b421b3f e129393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 15:56:01 2017 -0500 Merge remote-tracking branch 'dgoulet/bug21116_030_01' changes/bug21116 | 3 +++ src/test/test_util.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] test: Add missing socket errno in test_util.c
by nickm＠torproject.org 13 Feb '17

13 Feb '17

commit e129393e40ae291b825d41946580d8a4cf63a61d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 8 08:56:39 2017 -0500 test: Add missing socket errno in test_util.c According to 21116, it seems to be needed for Wheezy Raspbian build. Also, manpage of socket(2) does confirm that this errno value should be catched as well in case of no support from the OS of IPv4 or/and IPv6. Fixes #21116 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21116 | 3 +++ src/test/test_util.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug21116 b/changes/bug21116 new file mode 100644 index 0000000..2304ab0 --- /dev/null +++ b/changes/bug21116 @@ -0,0 +1,3 @@ + o Minor bugfixes (test): + - Fix Raspbian build missing socket errno in test util. Fixes bug 21116.; + bugfix on tor-0.2.8.2. Patch by "hein". diff --git a/src/test/test_util.c b/src/test/test_util.c index fafb84f..c317e72 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5091,7 +5091,8 @@ test_util_socket(void *arg) fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0); int err = tor_socket_errno(fd1); - if (fd1 < 0 && err == SOCK_ERRNO(EPROTONOSUPPORT)) { + if (fd1 < 0 && (err == SOCK_ERRNO(EPROTONOSUPPORT) || + err == SOCK_ERRNO(EAFNOSUPPORT))) { /* Assume we're on an IPv4-only or IPv6-only system, and give up now. */ goto done; }

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit 5c4235888af142b72aa6b88737bcf1020797e35c Merge: 75fe218 e778a41 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:28:50 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug20384 | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[tor/master] be sure to remember the changes file for #20384
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit 635c5a8a92c8066412645b291817eadcc82d8f8f Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:22:36 2017 -0500 be sure to remember the changes file for #20384 --- changes/bug20384 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/changes/bug20384 b/changes/bug20384 new file mode 100644 index 0000000..591015a --- /dev/null +++ b/changes/bug20384 @@ -0,0 +1,10 @@ + o Major features (security fixes): + - Prevent a class of security bugs caused by treating the contents + of a buffer chunk as if they were a NUL-terminated string. At + least one such bug seems to be present in all currently used + versions of Tor, and would allow an attacker to remotely crash + most Tor instances, especially those compiled with extra compiler + hardening. With this defense in place, such bugs can't crash Tor, + though we should still fix them as they occur. Closes ticket + 20384 (TROVE-2016-10-001). +

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit 144ec3d58cd7358e6563023737a5f91844db93b0 Merge: 124062e 635c5a8 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:23:50 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug20384 | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit e778a411b9e75ad2c1b46a6624d586a6f4a0c554 Merge: 43c18b1 144ec3d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:27:57 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug20384 | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit 4a2afd5b33f02ed3e5eb591dd29537fa4f69399f Merge: a86f95d 9ff7618 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:41:20 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit 9ff76185d284f1982b5f49b2c652f7a05e71ba2b Merge: 9b90d51 5c42358 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/master] Merge branch 'maint-0.2.9'
by arma＠torproject.org 13 Feb '17

13 Feb '17

commit b421b3f621986318e28d4cc44c28aae7fa909b86 Merge: d9827e4 4a2afd5 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 15:41:56 2017 -0500 Merge branch 'maint-0.2.9'

1 0