June 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit aa5af6a238bc5f1cae548e416ada261b3a105d16 Merge: 75c6fdd 4060253 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 4da0fe0234f2a05d1f2221fc9a2cba0bc1d1cdfe Merge: 315667c aa5af6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0

1 0

[tor/master] Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit e84127d99e3f3ac95239cc857d401289ef5cb768 Merge: a242d19 6009c89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:48:52 2017 -0400 Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0 changes/bug21969 | 3 +++ src/or/bridges.c | 6 +++++- src/or/directory.c | 6 ++++-- src/or/directory.h | 4 +++- src/or/entrynodes.c | 28 ++++++++++++++++++++++++++++ src/or/entrynodes.h | 4 ++++ src/or/router.c | 3 ++- src/or/routerlist.c | 2 +- 8 files changed, 50 insertions(+), 6 deletions(-)

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 75c6fdd28693aff7a61402a3c9f3d5eb7a24babb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:53:52 2017 -0400 whitespace fix --- src/or/directory.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/directory.h b/src/or/directory.h index 3d430f4..1459c3b 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -12,7 +12,6 @@ #ifndef TOR_DIRECTORY_H #define TOR_DIRECTORY_H - int directories_have_accepted_server_descriptor(void); void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, dirinfo_type_t type, const char *payload,

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit c520a2de3b928054432a14046769919cb9eeda8e Merge: 01404d7 6b2c886 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:49:28 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 6b2c88649ddb9496d6ae738d2c08436304fed0ea Merge: c239b2f e84127d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:49:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours" merge to avoid taking backport of 21969

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit c57a119eb886d705bc2a067635ca7ef8bc74f1de Merge: 6b2c886 75c6fdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:54:00 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid taking redundant ws fix

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 590cfe2b89626e277075ffed466e2dfd7a0107f8 Merge: c520a2d c57a119 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 13:54:12 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/release-0.3.0] Refactor directory_initiate_command() so that it accepts guard_state.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit e102ad60d0490abf97102644960a9c602c658992 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon May 22 15:45:46 2017 +0300 Refactor directory_initiate_command() so that it accepts guard_state. --- src/or/bridges.c | 2 +- src/or/directory.c | 6 ++++-- src/or/directory.h | 4 +++- src/or/router.c | 3 ++- src/or/routerlist.c | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/or/bridges.c b/src/or/bridges.c index 88154c6..58375ca 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -575,7 +575,7 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) bridge->identity, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - DIRIND_ONEHOP, "authority.z", NULL, 0, 0); + DIRIND_ONEHOP, "authority.z", NULL, 0, 0, NULL); } /** Fetching the bridge descriptor from the bridge authority returned a diff --git a/src/or/directory.c b/src/or/directory.c index 70437fe..edd07af 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1131,6 +1131,7 @@ directory_command_should_use_begindir(const or_options_t *options, * router_purpose, making an (in)direct connection as specified in * indirection, with command resource, payload of * payload_len, and asking for a result only if_modified_since. + * If guard_state is set, assign it to the directory circuit. */ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, @@ -1139,7 +1140,8 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, uint8_t dir_purpose, uint8_t router_purpose, dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, - time_t if_modified_since) + time_t if_modified_since, + circuit_guard_state_t *guard_state) { tor_addr_port_t or_ap, dir_ap; @@ -1166,7 +1168,7 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, digest, dir_purpose, router_purpose, indirection, resource, payload, payload_len, - if_modified_since, NULL, NULL); + if_modified_since, NULL, guard_state); } /** Same as directory_initiate_command(), but accepts rendezvous data to diff --git a/src/or/directory.h b/src/or/directory.h index 8be1f8e..3d430f4 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -12,6 +12,7 @@ #ifndef TOR_DIRECTORY_H #define TOR_DIRECTORY_H + int directories_have_accepted_server_descriptor(void); void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, dirinfo_type_t type, const char *payload, @@ -79,7 +80,8 @@ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, - time_t if_modified_since); + time_t if_modified_since, + struct circuit_guard_state_t *guard_state); #define DSR_HEX (1<<0) #define DSR_BASE64 (1<<1) diff --git a/src/or/router.c b/src/or/router.c index e4fa72a..ddcf9ab 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1390,7 +1390,8 @@ consider_testing_reachability(int test_or, int test_dir) me->cache_info.identity_digest, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_GENERAL, - DIRIND_ANON_DIRPORT, "authority.z", NULL, 0, 0); + DIRIND_ANON_DIRPORT, "authority.z", + NULL, 0, 0, NULL); } } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 45b3838..b68db75 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -961,7 +961,7 @@ authority_certs_fetch_resource_impl(const char *resource, DIR_PURPOSE_FETCH_CERTIFICATE, 0, indirection, - resource, NULL, 0, 0); + resource, NULL, 0, 0, NULL); return; }

1 0

[tor/release-0.3.0] Set guard state on bridge descriptor fetches.
by nickm＠torproject.org 28 Jun '17

28 Jun '17

commit 6009c891655748eb2089afa8bc4a3d54ec2ddab9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon May 22 14:10:38 2017 +0300 Set guard state on bridge descriptor fetches. We used to not set the guard state in launch_direct_bridge_descriptor_fetch(). So when a bridge descriptor fetch failed, the guard subsystem would never learn about the fail (and hence the guard's reachability state would not be updated). --- changes/bug21969 | 3 +++ src/or/bridges.c | 6 +++++- src/or/entrynodes.c | 28 ++++++++++++++++++++++++++++ src/or/entrynodes.h | 4 ++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug21969 b/changes/bug21969 new file mode 100644 index 0000000..9b116fc --- /dev/null +++ b/changes/bug21969 @@ -0,0 +1,3 @@ + o Major bugfixes (entry guards): + - Don't block bootstrapping when a primary bridge is offline and we can't + get its descriptor. Fixes bug 21969; bugfix on 0.3.0.3-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 58375ca..0b45883 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -547,6 +547,7 @@ static void launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) { const or_options_t *options = get_options(); + circuit_guard_state_t *guard_state = NULL; if (connection_get_by_type_addr_port_purpose( CONN_TYPE_DIR, &bridge->addr, bridge->port, @@ -570,12 +571,15 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } + guard_state = get_guard_state_for_bridge_desc_fetch(bridge->identity); + directory_initiate_command(&bridge->addr, bridge->port, NULL, 0, /*no dirport*/ bridge->identity, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - DIRIND_ONEHOP, "authority.z", NULL, 0, 0, NULL); + DIRIND_ONEHOP, "authority.z", NULL, 0, 0, + guard_state); } /** Fetching the bridge descriptor from the bridge authority returned a diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5b5e13b..f8c7024 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2926,6 +2926,34 @@ entry_guard_get_by_id_digest(const char *digest) get_guard_selection_info(), digest); } +/** We are about to connect to bridge with identity digest to fetch its + * descriptor. Create a new guard state for this connection and return it. */ +circuit_guard_state_t * +get_guard_state_for_bridge_desc_fetch(const char *digest) +{ + circuit_guard_state_t *guard_state = NULL; + entry_guard_t *guard = NULL; + + guard = entry_guard_get_by_id_digest_for_guard_selection( + get_guard_selection_info(), digest); + if (!guard) { + return NULL; + } + + /* Update the guard last_tried_to_connect time since it's checked by the + * guard susbsystem. */ + guard->last_tried_to_connect = approx_time(); + + /* Create the guard state */ + guard_state = tor_malloc_zero(sizeof(circuit_guard_state_t)); + guard_state->guard = entry_guard_handle_new(guard); + guard_state->state = GUARD_CIRC_STATE_USABLE_ON_COMPLETION; + guard_state->state_set_at = approx_time(); + guard_state->restrictions = NULL; + + return guard_state; +} + /** Release all storage held by e. */ STATIC void entry_guard_free(entry_guard_t *e) diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index f02901f..c2ddeca 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -323,6 +323,10 @@ const node_t *guards_choose_dirguard(circuit_guard_state_t **guard_state_out); entry_guard_t *entry_guard_get_by_id_digest_for_guard_selection( guard_selection_t *gs, const char *digest); entry_guard_t *entry_guard_get_by_id_digest(const char *digest); + +circuit_guard_state_t * +get_guard_state_for_bridge_desc_fetch(const char *digest); + void entry_guards_changed_for_guard_selection(guard_selection_t *gs); void entry_guards_changed(void); guard_selection_t * get_guard_selection_info(void);

1 0