[tor-commits] [tor] branch main updated: use consensus ip:port for dir auths if different

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

The following commit(s) were added to refs/heads/main by this push:
     new c56980f5e5 use consensus ip:port for dir auths if different
     new c408d0a7f9 Merge branch 'tor-gitlab/mr/657'
c56980f5e5 is described below

commit c56980f5e5fc22c9feace1dc3b6192fbd9f1ebdb
Author: Roger Dingledine <arma at torproject.org>
AuthorDate: Tue Oct 25 03:00:03 2022 -0400

    use consensus ip:port for dir auths if different
    
    Directory authorities and relays now interact properly with directory
    authorities if they change addresses. In the past, they would continue
    to upload votes, signatures, descriptors, etc to the hard-coded address
    in the configuration. Now, if the directory authority is listed in
    the consensus at a different address, they will direct queries to this
    new address.
    
    Specifically, these three activities have changed:
    
    * Posting a vote, a signature, or a relay descriptor to all the dir auths.
    
    * Dir auths fetching missing votes or signatures from all the dir auths.
    
    * Dir auths fetching new descriptors from a specific dir auth when they
    just learned about them from that dir auth's vote.
    
    We already do this desired behavior (prefer the address in the consensus,
    but fall back to the hard-coded dirservers info if needed) when fetching
    missing certs.
    
    There is a fifth case, in router_pick_trusteddirserver(), where clients
    and relays are trying to reach a random dir auth to fetch something. I
    left that case alone for now because the interaction with fallbackdirs
    is complicated.
    
    Implements ticket 40705.
---
 changes/ticket40705               |  7 +++++++
 src/feature/dirclient/dirclient.c | 23 +++++++++++++++++------
 src/feature/nodelist/routerlist.c | 15 +++++++++++----
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/changes/ticket40705 b/changes/ticket40705
new file mode 100644
index 0000000000..2de01c76d5
--- /dev/null
+++ b/changes/ticket40705
@@ -0,0 +1,7 @@
+  o Major features (dirauth):
+    - Directory authorities and relays now interact properly with
+      directory authorities if they change addresses. In the past, they
+      would continue to upload votes, signatures, descriptors, etc to
+      the hard-coded address in the configuration. Now, if the directory
+      authority is listed in the consensus at a different address, they
+      will direct queries to this new address. Implements ticket 40705.
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index 9555714e79..84eefdd90b 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -242,7 +242,14 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
    * harmless, and we may as well err on the side of getting things uploaded.
    */
   SMARTLIST_FOREACH_BEGIN(dirservers, dir_server_t *, ds) {
-      routerstatus_t *rs = &(ds->fake_status);
+      const routerstatus_t *rs = router_get_consensus_status_by_id(ds->digest);
+      if (!rs) {
+        /* prefer to use the address in the consensus, but fall back to
+         * the hard-coded trusted_dir_server address if we don't have a
+         * consensus or this digest isn't in our consensus. */
+        rs = &ds->fake_status;
+      }
+
       size_t upload_len = payload_len;
 
       if ((type & ds->type) == 0)
@@ -276,10 +283,8 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
       }
       if (purpose_needs_anonymity(dir_purpose, router_purpose, NULL)) {
         indirection = DIRIND_ANONYMOUS;
-      } else if (!reachable_addr_allows_dir_server(ds,
-                                                     FIREWALL_DIR_CONNECTION,
-                                                     0)) {
-        if (reachable_addr_allows_dir_server(ds, FIREWALL_OR_CONNECTION, 0))
+      } else if (!reachable_addr_allows_rs(rs, FIREWALL_DIR_CONNECTION, 0)) {
+        if (reachable_addr_allows_rs(rs, FIREWALL_OR_CONNECTION, 0))
           indirection = DIRIND_ONEHOP;
         else
           indirection = DIRIND_ANONYMOUS;
@@ -590,7 +595,13 @@ directory_get_from_all_authorities(uint8_t dir_purpose,
         continue;
       if (!(ds->type & V3_DIRINFO))
         continue;
-      const routerstatus_t *rs = &ds->fake_status;
+      const routerstatus_t *rs = router_get_consensus_status_by_id(ds->digest);
+      if (!rs) {
+        /* prefer to use the address in the consensus, but fall back to
+         * the hard-coded trusted_dir_server address if we don't have a
+         * consensus or this digest isn't in our consensus. */
+        rs = &ds->fake_status;
+      }
       directory_request_t *req = directory_request_new(dir_purpose);
       directory_request_set_routerstatus(req, rs);
       directory_request_set_router_purpose(req, router_purpose);
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index 8bcc42bc3f..9f0f845126 100644
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -2651,7 +2651,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
   digestmap_t *map = NULL;
   smartlist_t *no_longer_old = smartlist_new();
   smartlist_t *downloadable = smartlist_new();
-  routerstatus_t *source = NULL;
+  const routerstatus_t *source = NULL;
   int authdir = authdir_mode(options);
   int n_delayed=0, n_have=0, n_would_reject=0, n_wouldnt_use=0,
     n_inprogress=0, n_in_oldrouters=0;
@@ -2667,10 +2667,17 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
     networkstatus_voter_info_t *voter = smartlist_get(consensus->voters, 0);
     tor_assert(voter);
     ds = trusteddirserver_get_by_v3_auth_digest(voter->identity_digest);
-    if (ds)
-      source = &(ds->fake_status);
-    else
+    if (ds) {
+      source = router_get_consensus_status_by_id(ds->digest);
+      if (!source) {
+        /* prefer to use the address in the consensus, but fall back to
+         * the hard-coded trusted_dir_server address if we don't have a
+         * consensus or this digest isn't in our consensus. */
+        source = &ds->fake_status;
+      }
+    } else {
       log_warn(LD_DIR, "couldn't lookup source from vote?");
+    }
   }
 
   map = digestmap_new();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.