mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Bootstrap: stop requiring descriptors to count exits as usable

Browse source 
Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.
This commit is contained in:
teor 2018-08-24 11:55:41 +10:00
parent d0007db1f0
commit 588c77677a
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/or/nodelist.c
View file

@ -2118,9 +2118,9 @@ get_dir_info_status_string(void)
* *
* If <b>in_set</b> is non-NULL, only consider those routers in <b>in_set</b>. * If <b>in_set</b> is non-NULL, only consider those routers in <b>in_set</b>.
* If <b>exit_only</b> & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes * If <b>exit_only</b> & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
* with an exit policy that accepts at least one port. * present if they have an exit policy that accepts at least one port.
* If <b>exit_only</b> & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes * If <b>exit_only</b> & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
* with the exit flag in the consensus. * usable if they have the exit flag in the consensus.
* *
* If *<b>descs_out</b> is present, add a node_t for each usable descriptor * If *<b>descs_out</b> is present, add a node_t for each usable descriptor
* to it. * to it.
@ -2147,12 +2147,6 @@ count_usable_descriptors(int *num_present, int *num_usable,
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1)) if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
continue; continue;
if (client_would_use_router(rs, now)) { if (client_would_use_router(rs, now)) {
/* Do the policy check last, because it's potentially expensive */
if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
node_has_preferred_descriptor(node, 0) &&
node_exit_policy_rejects_all(node)) {
continue;
}
const char * const digest = rs->descriptor_digest; const char * const digest = rs->descriptor_digest;
int present; int present;
++*num_usable; /* the consensus says we want it. */ ++*num_usable; /* the consensus says we want it. */
@ -2161,7 +2155,14 @@ count_usable_descriptors(int *num_present, int *num_usable,
else else
present = NULL != router_get_by_descriptor_digest(digest); present = NULL != router_get_by_descriptor_digest(digest);
if (present) { if (present) {
/* we have the descriptor listed in the consensus. */ /* Do the policy check last, because it requires a descriptor,
* and is potentially expensive */
if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
node_exit_policy_rejects_all(node)) {
continue;
}
/* we have the descriptor listed in the consensus, and it
* satisfies our exit constraints (if any) */
++*num_present; ++*num_present;
} }
if (descs_out) if (descs_out)
@ -2239,7 +2240,7 @@ compute_frac_paths_available(const networkstatus_t *consensus,
np, np,
nu); nu);
/* We need at least 1 exit present in the consensus to consider /* We need at least 1 exit usable in the consensus to consider
* building exit paths */ * building exit paths */
/* Update our understanding of whether the consensus has exits */ /* Update our understanding of whether the consensus has exits */
consensus_path_type_t old_have_consensus_path = have_consensus_path; consensus_path_type_t old_have_consensus_path = have_consensus_path;