May 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'bug18761_028_squashed' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.8] Confim we want certificates from fallbacks
by nickm＠torproject.org 12 May '16

12 May '16

commit 797ece042d9666beae3ffc801b148e8bebcd88c0 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 11 13:08:45 2016 -0400 Confim we want certificates from fallbacks Comment-only change --- src/or/routerlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 85e9e7d..d40d704 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -913,7 +913,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (smartlist_len(fps) > 1) { resource = smartlist_join_strings(fps, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ + /* We want certs from mirrors, because they will almost always succeed. + */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, DL_WANT_ANY_DIRSERVER); @@ -959,7 +960,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) if (smartlist_len(fp_pairs) > 1) { resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ + /* We want certs from mirrors, because they will almost always succeed. + */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, DL_WANT_ANY_DIRSERVER);

1 0

[tor/release-0.2.8] Revert "Switch between fallback and authority when auth cert fetch fails"
by nickm＠torproject.org 12 May '16

12 May '16

commit 2cbad2aac76d911cce7cee95e91aebc1b1fcb509 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 11 13:06:13 2016 -0400 Revert "Switch between fallback and authority when auth cert fetch fails" This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b. --- changes/bug18816 | 2 -- src/or/routerlist.c | 14 ++++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 index 0545512..7265f5a 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,6 +1,4 @@ o Minor bugfix (bootstrap): - Consistently use the consensus download schedule for authority certificates. - - When downloading authority certificates fails, switch from - using a fallback to using an authority. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3169343..85e9e7d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,14 +912,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fps) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fps, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -961,14 +958,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fp_pairs) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fp_pairs, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else they were all pending */

1 0

[tor/release-0.2.8] refactor the #19003 patches
by nickm＠torproject.org 12 May '16

12 May '16

commit b8b5bccfd9f350cd796a8bcd6b79b9d303a79e11 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 13:03:49 2016 -0400 refactor the #19003 patches fix the logic in one of the comments --- src/or/circuituse.c | 2 +- src/or/router.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fa6c666..a4b5801 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1677,7 +1677,7 @@ circuit_launch(uint8_t purpose, int flags) /* Do we have enough descriptors to build paths? * If need_exit is true, return 1 if we can build exit paths. * (We need at least one Exit in the consensus to build exit paths.) - * If need_exit is false, return 0 if we can build internal paths. + * If need_exit is false, return 1 if we can build internal paths. */ static int have_enough_path_info(int need_exit) diff --git a/src/or/router.c b/src/or/router.c index dd84210..3f94703 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1549,9 +1549,9 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe both our ORPort and DirPort (if present) are reachable from + * - We believe our ORPort and DirPort (if present) are reachable from * the outside; or - * - We believe both our ORPort is reachable from the outside, and we can't + * - We believe our ORPort is reachable from the outside, and we can't * check our DirPort because the consensus has no exits; or * - We are an authoritative directory server. */ @@ -1570,14 +1570,15 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - /* If there are no exits in the consensus, but have enough descriptors to - * build internal paths, we can't possibly verify our DirPort. - * This only happens in small networks without exits. */ - if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) - return check_whether_orport_reachable(); - - /* If there are exits in the consensus, use an exit to check our DirPort. */ - return check_whether_orport_reachable() && check_whether_dirport_reachable(); + if (!check_whether_orport_reachable()) + return 0; + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { + /* All set: there are no exits in the consensus (maybe this is a tiny + * test network), so we can't check our DirPort reachability. */ + return 1; + } else { + return check_whether_dirport_reachable(); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[tor/maint-0.2.8] Merge branch 'bug18977_024_v2' into bug18977_026_v2
by nickm＠torproject.org 12 May '16

12 May '16

commit 20b01cece8cd2ceb7f8051aee04294bdba471f1a Merge: 0b477bf e57f26c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 14:39:06 2016 -0400 Merge branch 'bug18977_024_v2' into bug18977_026_v2 Had conflicts related to other correct_tm bugs in 0.2.6. Added wday for another case. changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+) diff --cc src/common/compat.c index 1788e32,90132fc..103ce24 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -2683,18 -2461,11 +2683,20 @@@ correct_tm(int islocal, const time_t *t r->tm_year = 8099; r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; + } else if (r->tm_year < (1-1900)) { + r->tm_year = (1-1900); + r->tm_mon = 0; + r->tm_mday = 1; + r->tm_yday = 0; ++ r->tm_wday = 0; + r->tm_hour = 0; + r->tm_min = 0; + r->tm_sec = 0; } return r; } @@@ -2708,7 -2479,8 +2710,8 @@@ r->tm_year = 70; /* 1970 CE */ r->tm_mon = 0; r->tm_mday = 1; - r->tm_yday = 1; + r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@@ -2721,7 -2493,8 +2724,8 @@@ r->tm_year = 137; /* 2037 CE */ r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59;

1 0

[tor/maint-0.2.8] Merge branch 'bug18977_026_v2' into maint-0.2.7
by nickm＠torproject.org 12 May '16

12 May '16

commit 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 Merge: d40e869 20b01ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 15:33:35 2016 -0400 Merge branch 'bug18977_026_v2' into maint-0.2.7 changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1 Merge: ce6f2d1 4165b1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 15:33:47 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)

1 0

[tor/master] Have correct_tm set tm_wday as well.
by nickm＠torproject.org 12 May '16

12 May '16

commit e57f26c135b03f5dbde77aea24551b6a9fc20889 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 10:49:55 2016 -0400 Have correct_tm set tm_wday as well. The tm_wday field had been left uninitialized, which was causing some assertions to fail on Windows unit tests. Fixes bug 18977. --- changes/bug18977 | 4 ++++ src/common/compat.c | 3 +++ src/common/util.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/changes/bug18977 b/changes/bug18977 new file mode 100644 index 0000000..3f46b09 --- /dev/null +++ b/changes/bug18977 @@ -0,0 +1,4 @@ + o Minor bugfixes (time handling): + - When correcting a corrupt 'struct tm' value, fill in the tm_wday + field. Otherwise, our unit tests crash on Windows. + Fixes bug 18977; bugfix on 0.2.2.25-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..90132fc 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2462,6 +2462,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; @@ -2479,6 +2480,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 1; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@ -2492,6 +2494,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; diff --git a/src/common/util.c b/src/common/util.c index 5eb0f9a..31dc2a4 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1460,6 +1460,7 @@ parse_iso_time(const char *cp, time_t *t) st_tm.tm_hour = hour; st_tm.tm_min = minute; st_tm.tm_sec = second; + st_tm.tm_wday = 0; /* Should be ignored. */ if (st_tm.tm_year < 70) { char *esc = esc_for_log(cp); @@ -1517,6 +1518,7 @@ parse_http_time(const char *date, struct tm *tm) tm->tm_hour = (int)tm_hour; tm->tm_min = (int)tm_min; tm->tm_sec = (int)tm_sec; + tm->tm_wday = 0; /* Leave this unset. */ month[3] = '\0'; /* Okay, now decode the month. */

1 0

[tor/master] Merge branch 'bug18977_024_v2' into bug18977_026_v2
by nickm＠torproject.org 12 May '16

12 May '16

commit 20b01cece8cd2ceb7f8051aee04294bdba471f1a Merge: 0b477bf e57f26c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 14:39:06 2016 -0400 Merge branch 'bug18977_024_v2' into bug18977_026_v2 Had conflicts related to other correct_tm bugs in 0.2.6. Added wday for another case. changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+) diff --cc src/common/compat.c index 1788e32,90132fc..103ce24 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -2683,18 -2461,11 +2683,20 @@@ correct_tm(int islocal, const time_t *t r->tm_year = 8099; r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; + } else if (r->tm_year < (1-1900)) { + r->tm_year = (1-1900); + r->tm_mon = 0; + r->tm_mday = 1; + r->tm_yday = 0; ++ r->tm_wday = 0; + r->tm_hour = 0; + r->tm_min = 0; + r->tm_sec = 0; } return r; } @@@ -2708,7 -2479,8 +2710,8 @@@ r->tm_year = 70; /* 1970 CE */ r->tm_mon = 0; r->tm_mday = 1; - r->tm_yday = 1; + r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@@ -2721,7 -2493,8 +2724,8 @@@ r->tm_year = 137; /* 2037 CE */ r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59;

1 0

[tor/master] Merge branch 'bug18977_026_v2' into maint-0.2.7
by nickm＠torproject.org 12 May '16

12 May '16

commit 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 Merge: d40e869 20b01ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 15:33:35 2016 -0400 Merge branch 'bug18977_026_v2' into maint-0.2.7 changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)

1 0