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

[tor/master] Prevent SRV assert when called from misconfigured bridge auth.
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit 931948ac6ad0c6f5327fd3c212ce6fe241a071f1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 1 15:56:29 2017 +0200 Prevent SRV assert when called from misconfigured bridge auth. --- changes/bug21586 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug21586 b/changes/bug21586 new file mode 100644 index 0000000..200d55a --- /dev/null +++ b/changes/bug21586 @@ -0,0 +1,4 @@ + o Minor bugfix (directory authority): + - Prevent the shared randomness subsystem from asserting when initialized + by a bridge authority with an incomplete configuration file. Fixes bug + #21856; bugfix on 0.2.9.8. diff --git a/src/or/main.c b/src/or/main.c index 5549f97..475587e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2405,7 +2405,7 @@ do_main_loop(void) } /* Setup shared random protocol subsystem. */ - if (authdir_mode_publishes_statuses(get_options())) { + if (authdir_mode_v3(get_options())) { if (sr_init(1) < 0) { return -1; }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug21586'
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit a0a4f8ae5d94a667ad431e487e08bc935a6989b5 Merge: 10ccb2b 931948a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:21:34 2017 -0500 Merge remote-tracking branch 'asn/bug21586' changes/bug21586 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Pick a date
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit 92944a65beebdc1391cfbcf698d0b4e9e54a7c70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:13:02 2017 -0500 Pick a date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb750be..b4a738a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.0.4-rc - 2017-03-?? +Changes in version 0.3.0.4-rc - 2017-03-01 Tor 0.3.0.4-rc fixes some remaining bugs, large and small, in the 0.3.0 release series, and introduces a few reliability features to keep them from coming back.

1 0

[tor/master] Master: remove 2 more changes files that are merged in 0.3.0.4-rc
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit 10ccb2bb4be39504dcd309108a37a824e3f37c48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:10:54 2017 -0500 Master: remove 2 more changes files that are merged in 0.3.0.4-rc --- changes/bug21415 | 4 ---- changes/bug21581 | 5 ----- 2 files changed, 9 deletions(-) diff --git a/changes/bug21415 b/changes/bug21415 deleted file mode 100644 index f0aa72f..0000000 --- a/changes/bug21415 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfix (entry guards): - - Silence a BUG() warning when attempting to use a guard whose descriptor - we don't know and make this scenario more unlikely to happen. Fixes bug - 21415; bugfix on 0.3.0.1-alpha. diff --git a/changes/bug21581 b/changes/bug21581 deleted file mode 100644 index 1077719..0000000 --- a/changes/bug21581 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Restore support for test-network.sh on BSD and other systems without - bash. (But use bash if it's available.) This is a workaround until we - remove bash-specific code in 19699. - Fixes bug 21581; bugfix on 21562, not in any released version of tor.

1 0

[tor/release-0.3.0] Make it clear that we fixed 2 cases of 20711
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit f0dab06fca70da04d2b2aa300f2e093a2fc7130e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:08:04 2017 -0500 Make it clear that we fixed 2 cases of 20711 --- ChangeLog | 4 ++-- changes/bug21415 | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d91e96d..2115352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,10 +74,10 @@ Changes in version 0.3.0.4-rc - 2017-03-?? o Minor bugfixes (directory mirrors): - Allow relays to use directory mirrors without a DirPort: these relays need to be contacted over their ORPorts using a begindir - connection. Fixes bug 20711; bugfix on 0.2.8.2-alpha. + connection. Fixes one case of bug 20711; bugfix on 0.2.8.2-alpha. - Clarify the message logged when a remote relay is unexpectedly missing an ORPort or DirPort: users were confusing this with a - local port. Fixes bug 20711; bugfix on 0.2.8.2-alpha. + local port. Fixes another case of bug 20711; bugfix on 0.2.8.2-alpha. o Minor bugfixes (guards): - Don't warn about a missing guard state on timeout-measurement diff --git a/changes/bug21415 b/changes/bug21415 deleted file mode 100644 index f0aa72f..0000000 --- a/changes/bug21415 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfix (entry guards): - - Silence a BUG() warning when attempting to use a guard whose descriptor - we don't know and make this scenario more unlikely to happen. Fixes bug - 21415; bugfix on 0.3.0.1-alpha.

1 0

[tor/release-0.3.0] Reflow changelog
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit 9e574fce98be21ab504c242d1773848081fa3356 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:09:10 2017 -0500 Reflow changelog --- ChangeLog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f78311f..bb750be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,15 +77,16 @@ Changes in version 0.3.0.4-rc - 2017-03-?? connection. Fixes one case of bug 20711; bugfix on 0.2.8.2-alpha. - Clarify the message logged when a remote relay is unexpectedly missing an ORPort or DirPort: users were confusing this with a - local port. Fixes another case of bug 20711; bugfix on 0.2.8.2-alpha. + local port. Fixes another case of bug 20711; bugfix + on 0.2.8.2-alpha. o Minor bugfixes (guards): - Don't warn about a missing guard state on timeout-measurement circuits: they aren't supposed to be using guards. Fixes an instance of bug 21007; bugfix on 0.3.0.1-alpha. - - Silence a BUG() warning when attempting to use a guard whose descriptor - we don't know, and make this scenario less likely to happen. Fixes bug - 21415; bugfix on 0.3.0.1-alpha. + - Silence a BUG() warning when attempting to use a guard whose + descriptor we don't know, and make this scenario less likely to + happen. Fixes bug 21415; bugfix on 0.3.0.1-alpha. o Minor bugfixes (hidden service): - Pass correct buffer length when encoding legacy ESTABLISH_INTRO

1 0

[tor/release-0.3.0] Remove 21581 changes file: "bugfix not on any released Tor"
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit ea95c6d1ba9aba18a08e38b578d089f33476bae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:09:30 2017 -0500 Remove 21581 changes file: "bugfix not on any released Tor" --- changes/bug21581 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changes/bug21581 b/changes/bug21581 deleted file mode 100644 index 1077719..0000000 --- a/changes/bug21581 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Restore support for test-network.sh on BSD and other systems without - bash. (But use bash if it's available.) This is a workaround until we - remove bash-specific code in 19699. - Fixes bug 21581; bugfix on 21562, not in any released version of tor.

1 0

[tor/release-0.3.0] Fold in changelog of bug 21415
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit d1054b09b9fd3778cf26a6fb4eeca8287a415eb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:08:52 2017 -0500 Fold in changelog of bug 21415 --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2115352..f78311f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,9 @@ Changes in version 0.3.0.4-rc - 2017-03-?? - Don't warn about a missing guard state on timeout-measurement circuits: they aren't supposed to be using guards. Fixes an instance of bug 21007; bugfix on 0.3.0.1-alpha. + - Silence a BUG() warning when attempting to use a guard whose descriptor + we don't know, and make this scenario less likely to happen. Fixes bug + 21415; bugfix on 0.3.0.1-alpha. o Minor bugfixes (hidden service): - Pass correct buffer length when encoding legacy ESTABLISH_INTRO

1 0

[tor/release-0.3.0] Remove changes files that got merged to 0.3.0.4-rc changelog
by nickm＠torproject.org 02 Mar '17

02 Mar '17

commit 18a4a4d7fd636de11547bba2d6005f36378058de Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 09:04:55 2017 -0500 Remove changes files that got merged to 0.3.0.4-rc changelog --- changes/bug20711 | 7 ------- changes/bug20894 | 9 --------- changes/bug21007_case2 | 4 ---- changes/bug21027 | 8 -------- changes/bug21116 | 3 --- changes/bug21278_extras | 4 ---- changes/bug21278_prevention | 4 ---- changes/bug21369_check | 3 --- changes/bug21420 | 3 --- changes/bug21447 | 4 ---- changes/bug21450 | 4 ---- changes/bug21471 | 5 ----- changes/bug21472 | 3 --- changes/bug21492 | 5 ----- changes/bug21553 | 7 ------- changes/bug21562 | 4 ---- changes/feature21570 | 5 ----- changes/geoip-february2017 | 4 ---- changes/ticket20656 | 3 --- changes/trove-2017-001.2 | 8 -------- 20 files changed, 97 deletions(-) diff --git a/changes/bug20711 b/changes/bug20711 deleted file mode 100644 index 0bc0d94..0000000 --- a/changes/bug20711 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (directory mirrors): - - Allow relays to use directory mirrors without a DirPort: these relays - need to be contacted over their ORPorts using a begindir connection. - Fixes bug 20711; bugfix on 0.2.8.2-alpha. - - Clarify the message logged when a remote relay is unexpectedly missing - an ORPort or DirPort: users were confusing this with a local port. - Fixes bug 20711; bugfix on 0.2.8.2-alpha. diff --git a/changes/bug20894 b/changes/bug20894 deleted file mode 100644 index 2dbf9b9..0000000 --- a/changes/bug20894 +++ /dev/null @@ -1,9 +0,0 @@ - o Major bugfixes (HTTP, parsing): - - When parsing a malformed content-length field from an HTTP message, - do not read off the end of the buffer. This bug was a potential - remote denial-of-service attack against Tor clients and relays. - A workaround was released in October 2016, which prevents this - bug from crashing Tor. This is a fix for the underlying issue, - which should no longer matter (if you applied the earlier patch). - Fixes bug 20894; bugfix on 0.2.0.16-alpha. Bug found by fuzzing - using AFL (http://lcamtuf.coredump.cx/afl/) diff --git a/changes/bug21007_case2 b/changes/bug21007_case2 deleted file mode 100644 index 4334444..0000000 --- a/changes/bug21007_case2 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (guards): - - Don't warn about a missing guard state on timeout-measurement - circuits: they aren't supposed to be using guards. Fixes an - instance of bug 21007; bugfix on 0.3.0.1-alpha. diff --git a/changes/bug21027 b/changes/bug21027 deleted file mode 100644 index d20df87..0000000 --- a/changes/bug21027 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (bridges): - - - When the same bridge is configured multiple times at different - address:port combinations (but with the same identity), treat - those bridge instances as separate guards. This allows clients to - configure the same bridge with multiple pluggable transports, once - again. Fixes bug 21027; bugfix on 0.3.0.1-alpha. - diff --git a/changes/bug21116 b/changes/bug21116 deleted file mode 100644 index 6c94f8f..0000000 --- a/changes/bug21116 +++ /dev/null @@ -1,3 +0,0 @@ - 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/changes/bug21278_extras b/changes/bug21278_extras deleted file mode 100644 index 73eac67..0000000 --- a/changes/bug21278_extras +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (code correctness): - - Repair a couple of (unreachable or harmless) cases of the risky - comparison-by-subtraction pattern that caused bug 21278. - diff --git a/changes/bug21278_prevention b/changes/bug21278_prevention deleted file mode 100644 index 37f84cb..0000000 --- a/changes/bug21278_prevention +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (directory authority): - - Directory authorities now reject descriptors that claim to be - malformed versions of Tor. Helps prevent exploitation of bug 21278. - diff --git a/changes/bug21369_check b/changes/bug21369_check deleted file mode 100644 index 2cd808c..0000000 --- a/changes/bug21369_check +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (reliability, crash): - - Try better to detect problems in buffers where they might grow (or - think they have grown) over 2 GB in size. Diagnostic for bug 21369. diff --git a/changes/bug21420 b/changes/bug21420 deleted file mode 100644 index 0144044..0000000 --- a/changes/bug21420 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (certificate expiration time): - - Avoid using link certificates that don't become valid till - some time in the future. Fixes bug 21420; bugfix on 0.2.4.11-alpha diff --git a/changes/bug21447 b/changes/bug21447 deleted file mode 100644 index c025b92..0000000 --- a/changes/bug21447 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - Rename "make fuzz" to "make test-fuzz-corpora", since it doesn't - actually fuzz anything. Fixes bug 21447; bugfix on 0.3.0.3-alpha. - diff --git a/changes/bug21450 b/changes/bug21450 deleted file mode 100644 index a1cf89a..0000000 --- a/changes/bug21450 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (voting consistency): - - Reject version numbers with components that exceed INT32_MAX. - Otherwise 32-bit and 64-bit platforms would behave inconsistently. - Fixes bug 21450; bugfix on 0.0.8pre1. diff --git a/changes/bug21471 b/changes/bug21471 deleted file mode 100644 index 677e21b..0000000 --- a/changes/bug21471 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (hidden service directory v3): - - When a descriptor lookup was done and it was not found in the directory - cache, it would crash on a NULL pointer instead of returning the 404 - code back to the client like it was suppose to. Fixes bug 21471; - bugfixes on tor-0.3.0.1-alpha. diff --git a/changes/bug21472 b/changes/bug21472 deleted file mode 100644 index f31ec91..0000000 --- a/changes/bug21472 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Small fixes to the fuzzing documentation. Closes ticket - 21472. diff --git a/changes/bug21492 b/changes/bug21492 deleted file mode 100644 index 2ed7947..0000000 --- a/changes/bug21492 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (correctness): - - Remove a redundant check for the UseEntryGuards option from the - options_transition_affects_guards() function. Fixes bug 21492; - bugfix on 0.3.0.1-alpha. - diff --git a/changes/bug21553 b/changes/bug21553 deleted file mode 100644 index 2da167e..0000000 --- a/changes/bug21553 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (hidden service): - - When encoding a legacy ESTABLISH_INTRO cell, we were using the sizeof() - on a pointer instead of real size of the destination buffer leading to - an overflow passing an enormous value to the signing digest function. - Fortunately, that value was only used to make sure the destination - buffer length was big enough for the key size and in this case it was. - Fixes bug 21553; bugfix on 0.3.0.1-alpha. diff --git a/changes/bug21562 b/changes/bug21562 deleted file mode 100644 index 930d991..0000000 --- a/changes/bug21562 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - Use bash in src/test/test-network.sh. This ensures we reliably call - chutney's newer tools/test-network.sh when available. - Fixes bug 21562; bugfix on 0.2.9.1-alpha. diff --git a/changes/feature21570 b/changes/feature21570 deleted file mode 100644 index 40555ee..0000000 --- a/changes/feature21570 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (testing): - - During 'make test-network-all', if tor logs any warnings, ask chutney - to output them. Requires a recent version of chutney with the 21572 - patch. - Implements 21570. diff --git a/changes/geoip-february2017 b/changes/geoip-february2017 deleted file mode 100644 index f8a4909..0000000 --- a/changes/geoip-february2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/ticket20656 b/changes/ticket20656 deleted file mode 100644 index 28192e8..0000000 --- a/changes/ticket20656 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor feature (protover): - - Add new protocol version for proposal 224. HSIntro now advertises - version "3-4" and HSDir version "1-2". Fixes ticket 20656. diff --git a/changes/trove-2017-001.2 b/changes/trove-2017-001.2 deleted file mode 100644 index 3ef073c..0000000 --- a/changes/trove-2017-001.2 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (parsing): - - Fix an integer underflow bug when comparing malformed Tor versions. - This bug is harmless, except when Tor has been built with - --enable-expensive-hardening, which would turn it into a crash; - or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with - -ftrapv by default. - Part of TROVE-2017-001. Fixes bug 21278; bugfix on - 0.0.8pre1. Found by OSS-Fuzz.

1 0

[rbm/master] Add the ENV option
by boklm＠torproject.org 02 Mar '17

02 Mar '17

commit 1945b67fefbcf7b834b71275e301da06232f0241 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 1 14:53:34 2017 +0100 Add the ENV option Add the ENV option, allowing to define some default environment variables. --- NEWS | 2 ++ doc/rbm_config.asc | 7 +++++++ lib/RBM.pm | 4 ++++ rbm | 1 + test.pl | 1 + 5 files changed, 15 insertions(+) diff --git a/NEWS b/NEWS index 663a281..5de36e0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the ENV option + - Add the build_log option - Add support for optional local configuration file rbm.local.conf diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index a461b3d..48e505c 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -151,6 +151,13 @@ fetch:: repository is fetched only if the selected commit cannot be found in the local clone. The default is +if_needed+. +ENV:: + This option, defined in the workspace config, is a hash + containing the environment variables that will be defined + when rbm is starting. This is useful for defining variables + that can affect how the templates are processed (for instance + the +TZ+ variable if dates are used). + include::options_tar.asc[] arch:: diff --git a/lib/RBM.pm b/lib/RBM.pm index 2248b41..632a8ba 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -75,6 +75,10 @@ sub find_config_file { exit_error("Can't find config file"); } +sub set_default_env { + %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; +} + sub path { my ($path, $basedir) = @_; $basedir //= $config->{basedir}; diff --git a/rbm b/rbm index 050cff5..9a8ccf2 100755 --- a/rbm +++ b/rbm @@ -198,6 +198,7 @@ if (@ARGV == 0 || !$actions{$ARGV[0]}) { } usage('usage', $ARGV[0]) if grep { $_ eq '--help' } @ARGV[1..(@ARGV - 1)]; RBM::load_config unless $actions{$ARGV[0]}->{no_config}; +RBM::set_default_env unless $actions{$ARGV[0]}->{no_config}; $actions{$ARGV[0]}->{run}->(@ARGV); # vim: expandtab sw=4 diff --git a/test.pl b/test.pl index 64bffd7..2748614 100755 --- a/test.pl +++ b/test.pl @@ -19,6 +19,7 @@ sub set_step { BEGIN { use_ok('RBM') }; chdir 'test'; RBM::load_config; +RBM::set_default_env; ok($RBM::config, 'load config'); my @tests = (

1 0