June 2012 - tor-commits - lists.torproject.org

[tor/release-0.2.3] Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit bdc8270280b345f0e02a6615f8670f3c47d99a22 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Thu Jun 28 00:21:06 2012 -0700 Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238) --- changes/bug5238 | 3 +++ src/or/routerlist.c | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/changes/bug5238 b/changes/bug5238 new file mode 100644 index 0000000..2f18707 --- /dev/null +++ b/changes/bug5238 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Downgrade "Got a certificate, but we already have it" log mesages from + warning to info, except when we're a dirauth. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 490c123..8349b7a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -217,9 +217,18 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store, * probably means we wanted a different secret key or we are trying to * replace an expired cert that has not in fact been updated. */ if (!from_store) { - log_warn(LD_DIR, "Got a certificate for %s, but we already have it. " - "Maybe they haven't updated it. Waiting for a while.", - ds ? ds->nickname : "an old or new authority"); + if (authdir_mode(get_options())) { + log_warn(LD_DIR, + "Got a certificate for %s, but we already have it. " + "Maybe they haven't updated it. Waiting for a while.", + ds ? ds->nickname : "an old or new authority"); + } else { + log_info(LD_DIR, + "Got a certificate for %s, but we already have it. " + "Maybe they haven't updated it. Waiting for a while.", + ds ? ds->nickname : "an old or new authority"); + } + authority_cert_dl_failed(cert->cache_info.identity_digest, 404); }

1 0

[tor/release-0.2.3] Fix GETINFO address-mappings/... with wildcarded addresses.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 28c42fe029a2a6029b17cc35821d82ba2b9bf318 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 23:55:01 2012 -0400 Fix GETINFO address-mappings/... with wildcarded addresses. --- changes/bug6244_part2 | 4 ++++ src/or/connection_edge.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changes/bug6244_part2 b/changes/bug6244_part2 new file mode 100644 index 0000000..ffeb5cd --- /dev/null +++ b/changes/bug6244_part2 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When formatting wildcarded address mappings for the controller, + be sure to include "*." as appropriate. Partial fix for bug 6244; + bugfix on 0.2.3.9-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9892078..3c8b4bc 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1702,17 +1702,22 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires, addressmap_ent_remove(key, val); continue; } else if (val->new_address) { + const char *src_wc = val->src_wildcard ? "*." : ""; + const char *dst_wc = val->dst_wildcard ? "*." : ""; if (want_expiry) { if (val->expires < 3 || val->expires == TIME_MAX) - smartlist_add_asprintf(sl, "%s %s NEVER", key, val->new_address); + smartlist_add_asprintf(sl, "%s%s %s%s NEVER", + src_wc, key, dst_wc, val->new_address); else { char time[ISO_TIME_LEN+1]; format_iso_time(time, val->expires); - smartlist_add_asprintf(sl, "%s %s \"%s\"", key, val->new_address, - time); + smartlist_add_asprintf(sl, "%s%s %s%s \"%s\"", + src_wc, key, dst_wc, val->new_address, + time); } } else { - smartlist_add_asprintf(sl, "%s %s", key, val->new_address); + smartlist_add_asprintf(sl, "%s%s %s%s", + src_wc, key, dst_wc, val->new_address); } } }

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 217862b3172490d5a620d947d7d56be47ccf1dde Merge: dc9dd23 28c42fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 10:49:32 2012 -0400 Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3 changes/bug6244_part2 | 4 ++++ src/or/connection_edge.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.3] Add version and bug number to 5238 changes file
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit dc9dd2324b848643908082442207469c50a46f43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 10:45:56 2012 -0400 Add version and bug number to 5238 changes file --- changes/bug5238 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug5238 b/changes/bug5238 index 2f18707..866f796 100644 --- a/changes/bug5238 +++ b/changes/bug5238 @@ -1,3 +1,4 @@ o Minor bugfixes: - Downgrade "Got a certificate, but we already have it" log mesages from - warning to info, except when we're a dirauth. + warning to info, except when we're a dirauth. Fixes bug #5238; bugfix + on 0.2.1.7-alpha.

1 0

[tor/release-0.2.3] Clean up check-spaces block; make it cover the right files
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit aad40483b3b7e9a26a0324b7c86b496fb2f4de87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 11:04:52 2012 -0400 Clean up check-spaces block; make it cover the right files --- Makefile.am | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index b8d18d4..a80763d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,13 +54,14 @@ test: all # eventdns.[hc], tinytest*.[ch] check-spaces: ./contrib/checkSpace.pl -C \ - src/common/*.h \ - src/common/[^asO]*.c \ - src/common/address.c \ - src/or/[^e]*.[ch] \ - src/or/eventdns_tor.h \ - src/test/test*.[ch] \ - src/tools/*.[ch] \ + src/common/*.h \ + src/common/[^asO]*.c \ + src/common/address.c \ + src/or/[^e]*.[ch] \ + src/or/eventdns_tor.h \ + src/test/test*.[ch] \ + src/test/[^t]*.[ch] \ + src/tools/*.[ch] \ src/tools/tor-fw-helper/*.[ch] check-docs:

1 0

[tor/release-0.2.3] fold in more changes entries
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 36d8a2535e01bce2c1c5242e76a4a2e134f06040 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 13:42:30 2012 -0400 fold in more changes entries --- ChangeLog | 10 +++++++++- changes/bug5238 | 4 ---- changes/bug6244 | 4 ---- changes/bug6244_part2 | 4 ---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c88187..8eb082c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Changes in version 0.2.3.18-rc - 2012-06-28 o Major bugfixes: + - Allow wildcarded mapaddress targets to be specified on the + controlport. Partially fixes bug 6244; bugfix on 0.2.3.9-alpha. - Make our linker option detection code more robust against linkers such as on FreeBSD 8, where a bad combination of options completes successfully but makes an unrunnable binary. Fixes bug 6173; @@ -11,8 +13,11 @@ Changes in version 0.2.3.18-rc - 2012-06-28 the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. - Replace "Sending publish request" log messages with "Launching upload", so that they no longer confusingly imply that we're - sending somtheing to a directory we might not even be connected + sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Downgrade "Got a certificate, but we already have it" log messages + from warning to info, except when we're a dirauth. Fixes bug 5238; + bugfix on 0.2.1.7-alpha. - When checking for requested signatures on the latest consensus before serving it to a client, make sure to check the right consensus flavor. Bugfix on 0.2.2.6-alpha. @@ -26,6 +31,9 @@ Changes in version 0.2.3.18-rc - 2012-06-28 launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. + - When formatting wildcarded address mappings for the controller, + be sure to include "*." as appropriate. Partially fixes bug 6244; + bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - Make format_helper_exit_status() avoid unnecessary space padding and diff --git a/changes/bug5238 b/changes/bug5238 deleted file mode 100644 index 866f796..0000000 --- a/changes/bug5238 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Downgrade "Got a certificate, but we already have it" log mesages from - warning to info, except when we're a dirauth. Fixes bug #5238; bugfix - on 0.2.1.7-alpha. diff --git a/changes/bug6244 b/changes/bug6244 deleted file mode 100644 index c6d64ff..0000000 --- a/changes/bug6244 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Allow wildcarded mapaddress targets to be specified on the controlport. - Partial fix for bug 6244; bugfix on 0.2.3.9-alpha. - diff --git a/changes/bug6244_part2 b/changes/bug6244_part2 deleted file mode 100644 index ffeb5cd..0000000 --- a/changes/bug6244_part2 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When formatting wildcarded address mappings for the controller, - be sure to include "*." as appropriate. Partial fix for bug 6244; - bugfix on 0.2.3.9-alpha.

1 0

[tor/release-0.2.3] bump to 0.2.3.18-rc
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 64f8e68e65f32c742eab85d993da2a838f90dcf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:34:33 2012 -0400 bump to 0.2.3.18-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 556bb66..e9ef4f8 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.17-beta-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.18-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6643925..75b2567 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.17-beta-dev" +!define VERSION "0.2.3.18-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 3449277..a5bd2ee 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.17-beta-dev" +#define VERSION "0.2.3.18-rc"

1 0

[tor/release-0.2.3] add a blurb for 0.2.3.18-rc, other minor cleanups
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 81cd3d7ad641a8dbf1076e011d209cfc3d6af2b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 15:32:36 2012 -0400 add a blurb for 0.2.3.18-rc, other minor cleanups --- ChangeLog | 29 +++++++++++++++++------------ src/common/util.c | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8eb082c..3d666a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.2.3.18-rc - 2012-06-28 + Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.x + series. It fixes a few smaller bugs, but generally appears stable. + Please test it and let us know whether it is! o Major bugfixes: - Allow wildcarded mapaddress targets to be specified on the @@ -15,6 +18,10 @@ Changes in version 0.2.3.18-rc - 2012-06-28 upload", so that they no longer confusingly imply that we're sending something to a directory we might not even be connected to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha. + - Make sure to set *socket_error in all error cases in + connection_connect(), so it can't produce a warning about + errno being zero from errno_to_orconn_end_reason(). Bugfix on + 0.2.1.1-alpha; resolves ticket 6028. - Downgrade "Got a certificate, but we already have it" log messages from warning to info, except when we're a dirauth. Fixes bug 5238; bugfix on 0.2.1.7-alpha. @@ -25,10 +32,16 @@ Changes in version 0.2.3.18-rc - 2012-06-28 Fixes bug 5932; bugfix on 0.2.2.7-alpha. o Minor bugfixes (on 0.2.3.x): + - Make format_helper_exit_status() avoid unnecessary space padding + and stop confusing log_from_pipe(). Fixes ticket 5557; bugfix + on 0.2.3.1-alpha. - Downgrade a message about cleaning the microdescriptor cache to "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. - - Improve log message issued when a managed proxy fails to - launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha. + - Log a BUG message at severity INFO if we have a networkstatus with + a missing entry for some microdescriptor. Continues on a patch + to 0.2.3.2-alpha. + - Improve the log message when a managed proxy fails to launch. Fixes + bug 5099; bugfix on 0.2.3.6-alpha. - Don't do DNS lookups when parsing corrupted managed proxy protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. - When formatting wildcarded address mappings for the controller, @@ -36,22 +49,14 @@ Changes in version 0.2.3.18-rc - 2012-06-28 bugfix on 0.2.3.9-alpha. - Avoid a warning caused by using strcspn() from glibc with clang 3.0. Bugfix on 0.2.3.13-alpha. - - Make format_helper_exit_status() avoid unnecessary space padding and - stop confusing log_from_pipe(). Fixes ticket 5557. - - Make sure to set *socket_error in all error cases in - connection_connect(), so it can't produce a warning about errno - being zero from errno_to_orconn_end_reason(). Resolves ticket 6028. - - Remove non-bug log messages about running with circuit timeout - learning enabled from LD_BUG. Fixes bug 6169; bugfix on - 0.2.3.17-beta. + - Stop logging messages about running with circuit timeout learning + enabled at severity LD_BUG. Fixes bug 6169; bugfix on 0.2.3.17-beta. - Disable a spurious warning about reading on a marked and flushing connection. We shouldn't be doing that, but apparently we sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta. - Fix a bug that stopped AllowDotExit from working on addresses that had an entry in the DNS cache. Fixes bug 6211; bugfix on 0.2.3.17-beta. - - Log a BUG message at INFO if we have a networkstatus with a missing - entry for some microdescriptor. o Code simplification, refactoring, unit tests: - Move tor_gettimeofday_cached() into compat_libevent.c, and use diff --git a/src/common/util.c b/src/common/util.c index 51d9321..a0dff2e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3888,7 +3888,7 @@ tor_get_exit_code(const process_handle_t *process_handle, } /** Helper: return the number of characters in s preceding the first - * occurence of ch. If ch does not occur in s, return + * occurrence of ch. If ch does not occur in s, return * the length of s. Should be equivalent to strspn(s, "ch"). */ static INLINE size_t str_num_before(const char *s, char ch)

1 0

[tor/release-0.2.3] fix grammar in comment
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit dd7a27d17e2240ed7f7fdf62116c009358224b5d Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 13:43:01 2012 -0400 fix grammar in comment --- src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 074b78d..6d1e4e7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3503,7 +3503,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) if (state && options->UseEntryGuards && (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { - /* This is request for an entry server to use for a regular circuit, + /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ return choose_random_entry(state); }

1 0

[tor/release-0.2.3] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 0600e8cab17d2128d663b31d93b93ddc1ab95ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 11:48:03 2012 -0400 Disable warning for marked-but-reading in main.c It turns out this can happen. Even though there is no reason for connections to be marked but reading, we leave them reading anyway, so warning here is unwarranted. Let's turn that back on once we do something sensible and disable reading when we mark. Bugfix for 6203 on Tor 0.2.3.17-beta. Thanks to cypherpunks for pointing out the general stupidity of the original code here. --- changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6203 b/changes/bug6203 new file mode 100644 index 0000000..bf96753 --- /dev/null +++ b/changes/bug6203 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. + diff --git a/src/or/main.c b/src/or/main.c index f8740d7..1f3117b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -848,7 +848,10 @@ conn_close_if_marked(int i) "Holding conn (fd %d) open for more flushing.", (int)conn->s)); conn->timestamp_lastwritten = now; /* reset so we can flush more */ - } else if (sz == 0) { /* retval is also 0 */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + /* Connection must flush before closing, but it's being rate-limited. * Let's remove from Libevent, and mark it as blocked on bandwidth * so it will be re-added on next token bucket refill. Prevents @@ -860,6 +863,13 @@ conn_close_if_marked(int i) connection_stop_writing(conn); } if (connection_is_reading(conn)) { + /* XXXX024 We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ +#if 0 #define MARKED_READING_RATE 180 static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); char *m; @@ -870,6 +880,7 @@ conn_close_if_marked(int i) conn_state_to_string(conn->type, conn->state), m); tor_free(m); } +#endif conn->read_blocked_on_bw = 1; connection_stop_reading(conn); }

1 0