[tor-commits] [tor/master] dirauth: Recalculate voting schedule at first vote

[nickm at torproject.org]

commit fa70aabb62652aa49537a6730eb4a3a95f9219c3
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Nov 8 14:36:04 2017 -0500

    dirauth: Recalculate voting schedule at first vote
    
    Commit e67f4441eb2646368e3e7cb1bcee403667b786f0 introduced a safeguard against
    using an uninitialized voting schedule object. However, the dirvote_act() code
    was looking roughly at the same thing to know if it had to compute the timings
    before voting with this condition:
    
      if (!voting_schedule.voting_starts) {
        ...
        dirvote_recalculate_timing(options, now);
      }
    
    The sr_init() function is called very early and goes through the safeguard
    thus the voting schedule is always initilized before the first vote.
    
    That first vote is a crucial one because we need to have our voting schedule
    aligned to the "now" time we are about to use for voting. Then, the schedule
    is updated when we publish our consensus or/and when we set a new consensus.
    From that point on, we only want to update the voting schedule through that
    code flow.
    
    This "created_on_demand" is indicating that the timings have been recalculated
    on demand by another subsystem so if it is flagged, we know that we need to
    ignore its values before voting.
    
    Fixes #24186
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/dirvote.c | 9 ++++++++-
 src/or/dirvote.h | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index f2194ed6e..ce82a5ef4 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2865,6 +2865,7 @@ dirvote_get_next_valid_after_time(void)
   if (tor_mem_is_zero((const char *) &voting_schedule,
                       sizeof(voting_schedule))) {
     dirvote_recalculate_timing(get_options(), time(NULL));
+    voting_schedule.created_on_demand = 1;
   }
   return voting_schedule.interval_starts;
 }
@@ -2892,7 +2893,13 @@ dirvote_act(const or_options_t *options, time_t now)
 {
   if (!authdir_mode_v3(options))
     return;
-  if (!voting_schedule.voting_starts) {
+  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
+   * have a voting schedule initialized 1 minute ago, the voting timings might
+   * not be aligned to what we should expect with "now". This is especially
+   * true for TestingTorNetwork using smaller timings.  */
+  if (voting_schedule.created_on_demand) {
     char *keys = list_v3_auth_ids();
     authority_cert_t *c = get_my_v3_authority_cert();
     log_notice(LD_DIR, "Scheduling voting.  Known authority IDs are %s. "
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index f8eb52de8..72a35fea6 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -168,6 +168,13 @@ typedef struct {
   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);