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

[tor/maint-0.3.0] Merge branch 'bug20059_024_v2' into maint-0.3.0
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 567a56ae2e59aef26b31829f300c5700c7923f7b Merge: 9281394 ec5fe41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:07:38 2017 -0400 Merge branch 'bug20059_024_v2' into maint-0.3.0 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'bug20059_024_v2' into maint-0.3.0
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 567a56ae2e59aef26b31829f300c5700c7923f7b Merge: 9281394 ec5fe41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:07:38 2017 -0400 Merge branch 'bug20059_024_v2' into maint-0.3.0 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Avoid a double-mark bug when makring a pending circuit as "too old"
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit ec5fe41209add4b216029466774a6b7e833210ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 09:19:00 2017 -0400 Avoid a double-mark bug when makring a pending circuit as "too old" Fixes bug 20059; bugfix on 0.1.0.1-rc. --- changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 0000000..091fab0 --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Avoid a double-marked-circuit warning that can happen when we receive + DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc. diff --git a/src/or/onion.c b/src/or/onion.c index 1a0bcf1..de4b6a5 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) onion_queue_entry_remove(head); log_info(LD_CIRC, "Circuit create request is too old; canceling due to overload."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; }

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 3b2d6da45344774d58b97f709c77fb35d26ba180 Merge: 6004dd2 567a56a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:09:22 2017 -0400 Merge branch 'maint-0.3.0' changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 698984c18003cca9f7763561ac479c3d5849426a Merge: 0e101e6 567a56a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:09:17 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Mark GETINFO network-status as deprecated with a warning
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 16b64fcfe178704ab09ba317f4c6e834f46b75e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 10 12:05:50 2017 -0500 Mark GETINFO network-status as deprecated with a warning control-spec has marked it deprecated for a long time. Closes ticket 21703. --- changes/bug21703 | 4 ++++ src/or/control.c | 6 ++++++ src/or/dirserv.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/changes/bug21703 b/changes/bug21703 new file mode 100644 index 0000000..3034fc5 --- /dev/null +++ b/changes/bug21703 @@ -0,0 +1,4 @@ + o Minor features (controller): + - Warn the first time that a controller requests data in the + long-deprecated 'GETINFO network-status' format. Closes ticket 21703. + diff --git a/src/or/control.c b/src/or/control.c index 8ab31f1..7b17f47 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2047,6 +2047,12 @@ getinfo_helper_dir(control_connection_t *control_conn, } } } else if (!strcmp(question, "network-status")) { /* v1 */ + static int network_status_warned = 0; + if (!network_status_warned) { + log_warn(LD_CONTROL, "GETINFO network-status is deprecated; it will " + "go away in a future version of Tor."); + network_status_warned = 1; + } routerlist_t *routerlist = router_get_routerlist(); if (!routerlist || !routerlist->routers || list_server_status_v1(routerlist->routers, answer, 1) < 0) { diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f01668a..0b9504c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -814,6 +814,9 @@ directory_remove_invalid(void) * Allocate and return a description of the status of the server desc, * for use in a v1-style router-status line. The server is listed * as running iff is_live is true. + * + * This is deprecated: it's only used for controllers that want outputs in + * the old format. */ static char * list_single_server_status(const routerinfo_t *desc, int is_live) @@ -926,6 +929,9 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) * *router_status_out. Return 0 on success, -1 on failure. * * If for_controller is true, include the routers with very old descriptors. + * + * This is deprecated: it's only used for controllers that want outputs in + * the old format. */ int list_server_status_v1(smartlist_t *routers, char **router_status_out,

1 0

[tor/master] Merge branch 'deprecate_getinfo_network_status'
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 6004dd2162633d3af526c5e3cc7dda9326e1c95e Merge: a783c5c 16b64fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:01:26 2017 -0400 Merge branch 'deprecate_getinfo_network_status' changes/bug21703 | 4 ++++ src/or/control.c | 6 ++++++ src/or/dirserv.c | 6 ++++++ 3 files changed, 16 insertions(+)

1 0

[tor/master] Check for NULL as input to extrainfo_parse_entry_from_string()
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 5203cd2f11a1419db57d067d2713c2118787d0c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 6 11:31:11 2017 -0500 Check for NULL as input to extrainfo_parse_entry_from_string() We hope this will make the clangalyzer less worried about this function. Closes ticket 21496. --- changes/bug21496 | 4 ++++ src/or/routerparse.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/changes/bug21496 b/changes/bug21496 new file mode 100644 index 0000000..24ac85a --- /dev/null +++ b/changes/bug21496 @@ -0,0 +1,4 @@ + o Minor features (safety): + - Add an explict check to extrainfo_parse_entry_from_string() for NULL + inputs. We don't believe this can actually happen, but it may help + silence a warning from the Clang analyzer. Closes ticket 21496. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 0336c03..c4f3295 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2030,6 +2030,9 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, * parse that's covered by the hash. */ int can_dl_again = 0; + if (BUG(s == NULL)) + return NULL; + if (!end) { end = s + strlen(s); }

1 0

[tor/master] Merge remote-tracking branch 'public/feature21496'
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit a783c5cbaedc88842f76584b96c89a765713f78a Merge: 31c9bda 5203cd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 10:59:30 2017 -0400 Merge remote-tracking branch 'public/feature21496' changes/bug21496 | 4 ++++ src/or/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

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

15 Mar '17

commit 3f3886e1f210ad2853209c5aecd0951350a6f758 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 15 12:25:39 2017 +0100 Add the input_files_paths option --- NEWS | 2 ++ doc/rbm_config.asc | 6 ++++++ lib/RBM.pm | 23 ++++++++++++++++++++++- lib/RBM/DefaultConfig.pm | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5de36e0..4eac374 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the input_files_paths option + - Add the ENV option - Add the build_log option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 48e505c..2e9b8ab 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -220,6 +220,12 @@ input_files_id:: file of type +project+, and the +filename+ and the sha256sum of the file for any other type of input file. +input_files_paths:: + The value of this option is an array of all the paths of input + files that currently exist and are used in the build of the + current project and its dependencies. This is useful when + cleaning old build files, to find which ones are still used. + timestamp:: This is the UNIX timestamp, set as modification time on files created such as the sources tarball and rpm spec file. The diff --git a/lib/RBM.pm b/lib/RBM.pm index 632a8ba..79e0670 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -731,8 +731,9 @@ sub input_files { my ($action, $project, $options, $dest_dir) = @_; my @res_copy; my %res_getfnames; + my @res_getfpaths; my $getfnames_noname = 0; - my $need_dl = 1; + my $need_dl = $action ne 'getfpaths'; my $input_files_id = ''; $options = {$options ? %$options : ()}; my $input_files = project_config($project, 'input_files', $options,); @@ -840,6 +841,25 @@ sub input_files { $input_files_id .= "\n"; next; } + if ($action eq 'getfpaths') { + push @res_getfpaths, $fname if $fname; + if ($file_gpg_id && $fname) { + my $sig_ext = $t->('sig_ext'); + $sig_ext = ref $sig_ext eq 'ARRAY' ? $sig_ext : [ $sig_ext ]; + foreach my $s (@$sig_ext) { + if (-f "$fname.$s") { + push @res_getfpaths, "$fname.$s"; + last; + } + } + } + if ($input_file->{project} && $t->('project')) { + my $r = RBM::project_step_config($t->('project'), 'input_files_paths', + {%$options, step => $t->('pkg_type'), %$input_file}); + push @res_getfpaths, @$r if @$r; + } + next; + } exit_error "Missing file $name" unless $fname; if ($t->('sha256sum') && $t->('sha256sum') ne sha256_hex(read_file($fname))) { @@ -886,6 +906,7 @@ sub input_files { return sha256_hex($input_files_id) if $action eq 'input_files_id'; return @res_copy if $action eq 'copy'; return \%res_getfnames if $action eq 'getfnames'; + return \@res_getfpaths if $action eq 'getfpaths'; } sub system_log { diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index c0764bd..cf0ed74 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -583,6 +583,7 @@ ZIP_END arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); }, + input_files_paths => sub { RBM::input_files('getfpaths', @_); }, steps => { srpm => 'rpm', 'deb-src' => 'deb',

1 0