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

[tor/master] Update dirvote_act() to return the time of its next action.
by nickm＠torproject.org 01 May '18

01 May '18

commit 9870497f9df909c6a48a6f6c1e82171e99aa33a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 26 17:42:43 2018 -0400 Update dirvote_act() to return the time of its next action. This is remarkably simple, given the macros in the last commit. --- src/or/dirauth/dirvote.c | 19 +++++++++++++++---- src/or/dirauth/dirvote.h | 5 +++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index 90f8d2227..36f328d6c 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -2731,12 +2731,14 @@ get_detached_signatures_from_pending_consensuses(pending_consensus_t *pending, /** * Entry point: Take whatever voting actions are pending as of now. + * + * Return the time at which the next action should be taken. */ -void +time_t dirvote_act(const or_options_t *options, time_t now) { if (!authdir_mode_v3(options)) - return; + return TIME_MAX; tor_assert_nonfatal(voting_schedule.voting_starts); /* If we haven't initialized this object through this codeflow, we need to * recalculate the timings to match our vote. The reason to do that is if we @@ -2754,8 +2756,13 @@ dirvote_act(const or_options_t *options, time_t now) } #define IF_TIME_FOR_NEXT_ACTION(when_field, done_field) \ - if (voting_schedule.when_field < now && !voting_schedule.done_field) do { -#define ENDIF } while(0); + if (! voting_schedule.done_field) { \ + if (voting_schedule.when_field > now) { \ + return voting_schedule.when_field; \ + } else { +#define ENDIF \ + } \ + } IF_TIME_FOR_NEXT_ACTION(voting_starts, have_voted) { log_notice(LD_DIR, "Time to vote."); @@ -2792,8 +2799,12 @@ dirvote_act(const or_options_t *options, time_t now) /* XXXX We will want to try again later if we haven't got enough * signatures yet. Implement this if it turns out to ever happen. */ dirvote_recalculate_timing(options, now); + return voting_schedule.voting_starts; } ENDIF + tor_assert_nonfatal_unreached(); + return now + 1; + #undef ENDIF #undef IF_TIME_FOR_NEXT_ACTION } diff --git a/src/or/dirauth/dirvote.h b/src/or/dirauth/dirvote.h index f69e872c8..729496292 100644 --- a/src/or/dirauth/dirvote.h +++ b/src/or/dirauth/dirvote.h @@ -96,7 +96,7 @@ */ #ifdef HAVE_MODULE_DIRAUTH -void dirvote_act(const or_options_t *options, time_t now); +time_t dirvote_act(const or_options_t *options, time_t now); void dirvote_free_all(void); void dirvote_parse_sr_commits(networkstatus_t *ns, smartlist_t *tokens); @@ -114,11 +114,12 @@ int dirvote_add_signatures(const char *detached_signatures_body, #else /* HAVE_MODULE_DIRAUTH */ -static inline void +static inline time_t dirvote_act(const or_options_t *options, time_t now) { (void) options; (void) now; + return TIME_MAX; } static inline void

1 0

[tor/master] Reschedule voting callback when any cfg option affecting it changes.
by nickm＠torproject.org 01 May '18

01 May '18

commit a73603653a5b54260705b40c7d71bc38faaf6436 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 30 10:16:40 2018 -0400 Reschedule voting callback when any cfg option affecting it changes. --- src/or/config.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 1c2b4cf10..2b35138b6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -747,6 +747,8 @@ static int options_transition_affects_workers( const or_options_t *old_options, const or_options_t *new_options); static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); +static int options_transition_affects_dirauth_timing( + const or_options_t *old_options, const or_options_t *new_options); static int normalize_nickname_list(config_line_t **normalized_out, const config_line_t *lst, const char *name, char **msg); @@ -1746,6 +1748,32 @@ options_transition_affects_guards(const or_options_t *old_options, return 0; } +/** + * Return true if changing the configuration from old to new + * affects the timing of the voting subsystem + */ +static int +options_transition_affects_dirauth_timing(const or_options_t *old_options, + const or_options_t *new_options) +{ + tor_assert(old_options); + tor_assert(new_options); + + if (authdir_mode_v3(old_options) != authdir_mode_v3(new_options)) + return 1; + if (! authdir_mode_v3(new_options)) + return 0; + YES_IF_CHANGED_INT(V3AuthVotingInterval); + YES_IF_CHANGED_INT(V3AuthVoteDelay); + YES_IF_CHANGED_INT(V3AuthDistDelay); + YES_IF_CHANGED_INT(TestingV3AuthInitialVotingInterval); + YES_IF_CHANGED_INT(TestingV3AuthInitialVoteDelay); + YES_IF_CHANGED_INT(TestingV3AuthInitialDistDelay); + YES_IF_CHANGED_INT(TestingV3AuthVotingStartOffset); + + return 0; +} + /** Fetch the active option list, and take actions based on it. All of the * things we do should survive being done repeatedly. If present, * old_options contains the previous value of the options. @@ -2330,7 +2358,7 @@ options_act(const or_options_t *old_options) /* We may need to reschedule some directory stuff if our status changed. */ if (old_options) { - if (authdir_mode_v3(options) && !authdir_mode_v3(old_options)) { + if (options_transition_affects_dirauth_timing(old_options, options)) { dirvote_recalculate_timing(options, time(NULL)); reschedule_dirvote(options); }

1 0

[tor/master] Refactor to use safe_timer_diff.
by nickm＠torproject.org 01 May '18

01 May '18

commit 4a559e996055d4ad8aeb1be7aece036fad94a4e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:56:11 2018 -0400 Refactor to use safe_timer_diff. --- src/or/main.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 0708e647f..c03e80dc0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1994,13 +1994,7 @@ dirvote_callback(time_t now, const or_options_t *options) * fix itself in an hour or so? */ return 3600; } - if (BUG(next <= now)) { - /* This case shouldn't be possible, since "next" is computed by - * dirvote_act() based on the value of "now" we give it. */ - return 1; - } else { - return next - now; - } + return safe_timer_diff(now, next); } /** Reschedule the directory-authority voting event. Run this whenever the @@ -2046,14 +2040,8 @@ save_state_callback(time_t now, const or_options_t *options) const time_t next_write = get_or_state()->next_write; if (next_write == TIME_MAX) { return 86400; - } else if (BUG(next_write <= now)) { - /* This can't happen due to clock jumps, since the value of next_write - * is based on the same "now" that we passed to or_state_save(). - */ - return PERIODIC_EVENT_NO_UPDATE; - } else { - return (int)(next_write - now); } + return safe_timer_diff(now, next_write); } /** Reschedule the event for saving the state file.

1 0

[tor/master] Merge branch 'dirvote_act_refactor_v2_squashed'
by nickm＠torproject.org 01 May '18

01 May '18

commit afd4fc689a5212a9aafa084f4e377db28583360d Merge: bbf0b92b1 4a559e996 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:57:04 2018 -0400 Merge branch 'dirvote_act_refactor_v2_squashed' changes/ticket25937 | 9 ++++++++ src/or/config.c | 33 +++++++++++++++++++++++++++++- src/or/dirauth/dirvote.c | 53 ++++++++++++++++++++++++++++++++---------------- src/or/dirauth/dirvote.h | 5 +++-- src/or/main.c | 50 +++++++++++++++++++++++++++++++++++---------- src/or/main.h | 1 + src/or/networkstatus.c | 1 + 7 files changed, 121 insertions(+), 31 deletions(-)

1 0

[tor/master] Fix an assertion failure introduced by #25948
by nickm＠torproject.org 01 May '18

01 May '18

commit bbf0b92b1c03e1d5e132aebd4e2a06c9d78557af Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:47:44 2018 -0400 Fix an assertion failure introduced by #25948 Apparently, we can decide our state is dirty before we create the event to tell the mainloop that we should save it. That's not a problem, except for the assertion failure. --- src/or/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 1160f377e..b5ddfe6f2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2022,7 +2022,10 @@ save_state_callback(time_t now, const or_options_t *options) void reschedule_or_state_save(void) { - tor_assert(save_state_event); + if (save_state_event == NULL) { + /* This can happen early on during startup. */ + return; + } periodic_event_reschedule(save_state_event); }

1 0

[tor/master] Enable DISABLE_DISABLING_ED25519.
by nickm＠torproject.org 01 May '18

01 May '18

commit 9504fabb02788bde6bd698fb2a148f25330dc021 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Thu Apr 5 16:19:40 2018 +0200 Enable DISABLE_DISABLING_ED25519. We are going to stop recommending 0.2.5 so there is no reason to keep the undef statement anymore. Fixes #20522. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- src/or/dirserv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 68727f071..b3aaa25bf 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -259,11 +259,12 @@ dirserv_load_fingerprint_file(void) * identity to stop doing so. This is going to be essential for good identity * security: otherwise anybody who can attack RSA-1024 but not Ed25519 could * just sign fake descriptors missing the Ed25519 key. But we won't actually - * be able to prevent that kind of thing until we're confident that there - * isn't actually a legit reason to downgrade to 0.2.5. So for now, we have - * to leave this #undef. + * be able to prevent that kind of thing until we're confident that there isn't + * actually a legit reason to downgrade to 0.2.5. Now we are not recommending + * 0.2.5 anymore so there is no reason to keep the #undef. */ -#undef DISABLE_DISABLING_ED25519 + +#define DISABLE_DISABLING_ED25519 /** Check whether router has a nickname/identity key combination that * we recognize from the fingerprint list, or an IP we automatically act on

1 0

[tor/master] Add the change file of #20522.
by nickm＠torproject.org 01 May '18

01 May '18

commit 6ed2ad0f0031f011591837a44533d5b196a51e37 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Mon Apr 16 12:41:22 2018 +0200 Add the change file of #20522. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- changes/ticket20522 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket20522 b/changes/ticket20522 new file mode 100644 index 000000000..a5e6718e1 --- /dev/null +++ b/changes/ticket20522 @@ -0,0 +1,6 @@ + o Deprecated features: + - As we are not recommending 0.2.5 anymore we require relays that once had + an ed25519 key associated with their RSA key to always have that key + instead of allowing them to drop back to a version that didn't support + ed25519. This means they need to use a new RSA key if the want to + downgrade to an older version of tor without ed25519. Closes ticket 20522.

1 0

[tor/master] Merge remote-tracking branch 'ffmancera-1/bug20522'
by nickm＠torproject.org 01 May '18

01 May '18

commit 9ece027d6065e09743ac875aa873bf23583c133f Merge: d018bf199 6ed2ad0f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:43:40 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug20522' changes/ticket20522 | 6 ++++++ src/or/dirserv.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-)

1 0

[tor/master] mod: Build system changes for dirauth module
by nickm＠torproject.org 01 May '18

01 May '18

commit b27dc1cfb5867ad5853548acc6e1167a49395917 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 3 15:06:34 2018 -0400 mod: Build system changes for dirauth module Make our build system support a disable dirauth module option. It can only be disabled explicitly with: $ ./configure --disable-module-dirauth If *not* specified that is enabled, an automake conditional variable is set to true and a defined value for the C code: AM_CONDITIONAL: BUILD_MODULE_DIRAUTH AC_DEFINE: HAVE_MODULE_DIRAUTH=1 This introduces the dirauth/ module directory in src/or/ for which .c files are only compiled if the BUILD_MODULE_DIRAUTH is set. All the header files are compiled in regardless of the support so we can use the alternative entry point functions of the dirauth subsystem. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 13 +++++++++++++ src/or/include.am | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/configure.ac b/configure.ac index 878f5a88b..b423ea95e 100644 --- a/configure.ac +++ b/configure.ac @@ -230,6 +230,19 @@ if test "x$enable_android" = "xyes"; then fi +dnl --- +dnl Tor modules options. These options are namespaced with --disable-module-XXX +dnl --- + +dnl Directory Authority module. +AC_ARG_ENABLE([module-dirauth], + AS_HELP_STRING([--disable-module-dirauth], + [Do not build tor with the dirauth module]), + [], dnl Action if-given + AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], + [Compile with Directory Authority feature support])) +AM_CONDITIONAL(BUILD_MODULE_DIRAUTH, [test "x$enable_module_dirauth" != "xno"]) + dnl check for the correct "ar" when cross-compiling. dnl (AM_PROG_AR was new in automake 1.11.2, which we do not yet require, dnl so kludge up a replacement for the case where it isn't there yet.) diff --git a/src/or/include.am b/src/or/include.am index 9a68df5c3..56d41e47d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -114,6 +114,16 @@ LIBTOR_A_SOURCES = \ src/or/onion_ntor.c \ $(tor_platform_source) +# +# Modules are conditionnally compiled in tor starting here. We add the C files +# only if the modules has been enabled at configure time. +# + +# The Directory Authority module. +if BUILD_MODULE_DIRAUTH +#LIBTOR_A_SOURCES += +endif + src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) @@ -259,6 +269,12 @@ ORHEADERS = \ src/or/torcert.h \ src/or/tor_api_internal.h +# We add the headers of the modules even though they are disabled so we can +# properly compiled the entry points stub. + +# The Directory Authority module headers. +#ORHEADERS += + # This may someday want to be an installed file? noinst_HEADERS += src/or/tor_api.h

1 0

[tor/master] dirvote: Move voting_schedule_t to dirvote.c
by nickm＠torproject.org 01 May '18

01 May '18

commit 5e1e906a5c479ba9294d345b0221c99725d45d8c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Apr 5 11:27:39 2018 -0400 dirvote: Move voting_schedule_t to dirvote.c Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dirvote.c | 34 ++++++++++++++++++++++++++++++++++ src/or/dirvote.h | 36 ------------------------------------ 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9f4893c37..67ab1d4ff 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -72,6 +72,40 @@ typedef struct pending_consensus_t { networkstatus_t *consensus; } pending_consensus_t; +/** Scheduling information for a voting interval. */ +typedef struct { + /** When do we generate and distribute our vote for this interval? */ + time_t voting_starts; + /** When do we send an HTTP request for any votes that we haven't + * been posted yet?*/ + time_t fetch_missing_votes; + /** When do we give up on getting more votes and generate a consensus? */ + time_t voting_ends; + /** When do we send an HTTP request for any signatures we're expecting to + * see on the consensus? */ + time_t fetch_missing_signatures; + /** When do we publish the consensus? */ + time_t interval_starts; + + /* True iff we have generated and distributed our vote. */ + int have_voted; + /* True iff we've requested missing votes. */ + int have_fetched_missing_votes; + /* True iff we have built a consensus and sent the signatures around. */ + int have_built_consensus; + /* True iff we've fetched missing signatures. */ + int have_fetched_missing_signatures; + /* True iff we have published our consensus. */ + int have_published_consensus; + + /* True iff this voting schedule was set on demand meaning not through the + * normal vote operation of a dirauth or when a consensus is set. This only + * applies to a directory authority that needs to recalculate the voting + * timings only for the first vote even though this object was initilized + * prior to voting. */ + int created_on_demand; +} voting_schedule_t; + /* DOCDOC dirvote_add_signatures_to_all_pending_consensuses */ static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, diff --git a/src/or/dirvote.h b/src/or/dirvote.h index dd388fd96..88d0d56ff 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -96,42 +96,6 @@ void ns_detached_signatures_free_(ns_detached_signatures_t *s); /* cert manipulation */ authority_cert_t *authority_cert_dup(authority_cert_t *cert); -/* vote scheduling */ - -/** Scheduling information for a voting interval. */ -typedef struct { - /** When do we generate and distribute our vote for this interval? */ - time_t voting_starts; - /** When do we send an HTTP request for any votes that we haven't - * been posted yet?*/ - time_t fetch_missing_votes; - /** When do we give up on getting more votes and generate a consensus? */ - time_t voting_ends; - /** When do we send an HTTP request for any signatures we're expecting to - * see on the consensus? */ - time_t fetch_missing_signatures; - /** When do we publish the consensus? */ - time_t interval_starts; - - /* True iff we have generated and distributed our vote. */ - int have_voted; - /* True iff we've requested missing votes. */ - int have_fetched_missing_votes; - /* True iff we have built a consensus and sent the signatures around. */ - int have_built_consensus; - /* True iff we've fetched missing signatures. */ - int have_fetched_missing_signatures; - /* True iff we have published our consensus. */ - int have_published_consensus; - - /* True iff this voting schedule was set on demand meaning not through the - * normal vote operation of a dirauth or when a consensus is set. This only - * applies to a directory authority that needs to recalculate the voting - * timings only for the first vote even though this object was initilized - * prior to voting. */ - int created_on_demand; -} voting_schedule_t; - void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out); time_t dirvote_get_start_of_next_interval(time_t now, int interval,

1 0