[tor-commits] [tor/master] dirvote: Handling adding vote and signature if module is disabled

[nickm@xxxxxxxxxxxxxx]

commit 0f3b765b3c8ba6f4f105440861e87ecaf4ea4323
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Apr 25 11:12:56 2018 -0400

    dirvote: Handling adding vote and signature if module is disabled
    
    Both functions are used for directory request but they can only be used if the
    running tor instance is a directory authority.
    
    For this reason, make those symbols visible but hard assert() if they are
    called when the module is disabled. This would mean we failed to safeguard the
    entry point into the module.
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
 src/or/dirauth/dirvote.h | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/or/dirauth/dirvote.h b/src/or/dirauth/dirvote.h
index 69d628766..59cfd6b99 100644
--- a/src/or/dirauth/dirvote.h
+++ b/src/or/dirauth/dirvote.h
@@ -104,6 +104,14 @@ void dirvote_clear_commits(networkstatus_t *ns);
 void dirvote_dirreq_get_status_vote(const char *url, smartlist_t *items,
                                     smartlist_t *dir_items);
 
+/* Storing signatures and votes functions */
+struct pending_vote_t * dirvote_add_vote(const char *vote_body,
+                                         const char **msg_out,
+                                         int *status_out);
+int dirvote_add_signatures(const char *detached_signatures_body,
+                           const char *source,
+                           const char **msg_out);
+
 #else /* HAVE_MODULE_DIRAUTH */
 
 static inline void
@@ -140,16 +148,32 @@ dirvote_dirreq_get_status_vote(const char *url, smartlist_t *items,
   (void) dir_items;
 }
 
+static inline struct pending_vote_t *
+dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
+{
+  (void) vote_body;
+  (void) msg_out;
+  (void) status_out;
+  /* If the dirauth module is disabled, this should NEVER be called else we
+   * failed to safeguard the dirauth module. */
+  tor_assert_nonfatal_unreached();
+}
+
+static inline int
+dirvote_add_signatures(const char *detached_signatures_body, const char *source,
+                       const char **msg_out)
+{
+  (void) detached_signatures_body;
+  (void) source;
+  (void) msg_out;
+  /* If the dirauth module is disabled, this should NEVER be called else we
+   * failed to safeguard the dirauth module. */
+  tor_assert_nonfatal_unreached();
+}
+
 #endif /* HAVE_MODULE_DIRAUTH */
 
 void dirvote_recalculate_timing(const or_options_t *options, time_t now);
-/* Invoked on timers and by outside triggers. */
-struct pending_vote_t * dirvote_add_vote(const char *vote_body,
-                                         const char **msg_out,
-                                         int *status_out);
-int dirvote_add_signatures(const char *detached_signatures_body,
-                           const char *source,
-                           const char **msg_out);
 /* Item access */
 MOCK_DECL(const char*, dirvote_get_pending_consensus,
           (consensus_flavor_t flav));



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits