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

[tor/master] prop224: Add XXX about opaqueness of link_specifier_t.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 686891d67ebf69808ac3d2b2c98263d21a3fe143 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 8 21:25:04 2017 +0300 prop224: Add XXX about opaqueness of link_specifier_t. --- src/trunnel/ed25519_cert.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index 782bd5958..0aa953d17 100644 --- a/src/trunnel/ed25519_cert.h +++ b/src/trunnel/ed25519_cert.h @@ -59,6 +59,10 @@ struct link_specifier_st { }; #endif typedef struct link_specifier_st link_specifier_t; +/** XXX hs_link_specifier_dup() violates the opaqueness of link_specifier_t by + * taking its sizeof(). If we ever want to turn on TRUNNEL_OPAQUE we would + * need to refactor that function to do the coyp by encoding and decoding the + * object. */ #if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT) struct ed25519_cert_st { uint8_t version;

1 0

[tor/master] Re-run trunnel.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 8e84968ffbf6d284e8a877ddcde6ded40b3f5681 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 20:34:39 2017 -0400 Re-run trunnel. --- src/trunnel/channelpadding_negotiation.c | 10 +++++----- src/trunnel/channelpadding_negotiation.h | 10 +++++----- src/trunnel/ed25519_cert.h | 4 ---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/trunnel/channelpadding_negotiation.c b/src/trunnel/channelpadding_negotiation.c index 172d6f8a0..02fd823bf 100644 --- a/src/trunnel/channelpadding_negotiation.c +++ b/src/trunnel/channelpadding_negotiation.c @@ -1,4 +1,4 @@ -/* channelpadding_negotiation.c -- generated by Trunnel v1.4.3. +/* channelpadding_negotiation.c -- generated by Trunnel v1.5.1. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -57,7 +57,7 @@ channelpadding_negotiate_free(channelpadding_negotiate_t *obj) } uint8_t -channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp) +channelpadding_negotiate_get_version(const channelpadding_negotiate_t *inp) { return inp->version; } @@ -72,7 +72,7 @@ channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_t va return 0; } uint8_t -channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp) +channelpadding_negotiate_get_command(const channelpadding_negotiate_t *inp) { return inp->command; } @@ -87,7 +87,7 @@ channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_t va return 0; } uint16_t -channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t *inp) +channelpadding_negotiate_get_ito_low_ms(const channelpadding_negotiate_t *inp) { return inp->ito_low_ms; } @@ -98,7 +98,7 @@ channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uint16_ return 0; } uint16_t -channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t *inp) +channelpadding_negotiate_get_ito_high_ms(const channelpadding_negotiate_t *inp) { return inp->ito_high_ms; } diff --git a/src/trunnel/channelpadding_negotiation.h b/src/trunnel/channelpadding_negotiation.h index e58bda3be..631c99670 100644 --- a/src/trunnel/channelpadding_negotiation.h +++ b/src/trunnel/channelpadding_negotiation.h @@ -1,4 +1,4 @@ -/* channelpadding_negotiation.h -- generated by by Trunnel v1.4.3. +/* channelpadding_negotiation.h -- generated by by Trunnel v1.5.1. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -60,7 +60,7 @@ int channelpadding_negotiate_clear_errors(channelpadding_negotiate_t *obj); /** Return the value of the version field of the * channelpadding_negotiate_t in 'inp' */ -uint8_t channelpadding_negotiate_get_version(channelpadding_negotiate_t *inp); +uint8_t channelpadding_negotiate_get_version(const channelpadding_negotiate_t *inp); /** Set the value of the version field of the * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * return -1 and set the error code on 'inp' on failure. @@ -69,7 +69,7 @@ int channelpadding_negotiate_set_version(channelpadding_negotiate_t *inp, uint8_ /** Return the value of the command field of the * channelpadding_negotiate_t in 'inp' */ -uint8_t channelpadding_negotiate_get_command(channelpadding_negotiate_t *inp); +uint8_t channelpadding_negotiate_get_command(const channelpadding_negotiate_t *inp); /** Set the value of the command field of the * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * return -1 and set the error code on 'inp' on failure. @@ -78,7 +78,7 @@ int channelpadding_negotiate_set_command(channelpadding_negotiate_t *inp, uint8_ /** Return the value of the ito_low_ms field of the * channelpadding_negotiate_t in 'inp' */ -uint16_t channelpadding_negotiate_get_ito_low_ms(channelpadding_negotiate_t *inp); +uint16_t channelpadding_negotiate_get_ito_low_ms(const channelpadding_negotiate_t *inp); /** Set the value of the ito_low_ms field of the * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * return -1 and set the error code on 'inp' on failure. @@ -87,7 +87,7 @@ int channelpadding_negotiate_set_ito_low_ms(channelpadding_negotiate_t *inp, uin /** Return the value of the ito_high_ms field of the * channelpadding_negotiate_t in 'inp' */ -uint16_t channelpadding_negotiate_get_ito_high_ms(channelpadding_negotiate_t *inp); +uint16_t channelpadding_negotiate_get_ito_high_ms(const channelpadding_negotiate_t *inp); /** Set the value of the ito_high_ms field of the * channelpadding_negotiate_t in 'inp' to 'val'. Return 0 on success; * return -1 and set the error code on 'inp' on failure. diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index 0aa953d17..782bd5958 100644 --- a/src/trunnel/ed25519_cert.h +++ b/src/trunnel/ed25519_cert.h @@ -59,10 +59,6 @@ struct link_specifier_st { }; #endif typedef struct link_specifier_st link_specifier_t; -/** XXX hs_link_specifier_dup() violates the opaqueness of link_specifier_t by - * taking its sizeof(). If we ever want to turn on TRUNNEL_OPAQUE we would - * need to refactor that function to do the coyp by encoding and decoding the - * object. */ #if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_ED25519_CERT) struct ed25519_cert_st { uint8_t version;

1 0

[tor/master] prop224: Always note down the use of internal circuit
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 400ba2f636edf5afb14fe3b57f23d80e433d893d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 4 12:06:34 2017 -0400 prop224: Always note down the use of internal circuit Also, this removes all the callsite of this rephist in the hs subsystem Fixes #23097 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/circuituse.c | 31 ++++++++++++++++++++++++++----- src/or/circuituse.h | 3 ++- src/or/hs_circuit.c | 12 +----------- src/or/hs_circuit.h | 2 +- src/or/hs_service.c | 6 +++--- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5292dc01d..66006542d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1114,11 +1114,32 @@ needs_exit_circuits(time_t now, int *needs_uptime, int *needs_capacity) /* Return true if we need any more hidden service server circuits. * HS servers only need an internal circuit. */ STATIC int -needs_hs_server_circuits(int num_uptime_internal) +needs_hs_server_circuits(time_t now, int num_uptime_internal) { - return ((rend_num_services() || hs_service_get_num_services()) && - num_uptime_internal < SUFFICIENT_UPTIME_INTERNAL_HS_SERVERS && - router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN); + if (!rend_num_services() && !hs_service_get_num_services()) { + /* No services, we don't need anything. */ + goto no_need; + } + + if (num_uptime_internal >= SUFFICIENT_UPTIME_INTERNAL_HS_SERVERS) { + /* We have sufficient amount of internal circuit. */ + goto no_need; + } + + if (router_have_consensus_path() == CONSENSUS_PATH_UNKNOWN) { + /* Consensus hasn't been checked or might be invalid so requesting + * internal circuits is not wise. */ + goto no_need; + } + + /* At this point, we need a certain amount of circuits and we will most + * likely use them for rendezvous so we note down the use of internal + * circuit for our prediction for circuit needing uptime and capacity. */ + rep_hist_note_used_internal(now, 1, 1); + + return 1; + no_need: + return 0; } /* We need at least this many internal circuits for hidden service clients */ @@ -1217,7 +1238,7 @@ circuit_predict_and_launch_new(void) return; } - if (needs_hs_server_circuits(num_uptime_internal)) { + if (needs_hs_server_circuits(now, num_uptime_internal)) { flags = (CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL); diff --git a/src/or/circuituse.h b/src/or/circuituse.h index ad4c214a3..e66679586 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -68,7 +68,8 @@ STATIC int circuit_is_available_for_use(const circuit_t *circ); STATIC int needs_exit_circuits(time_t now, int *port_needs_uptime, int *port_needs_capacity); -STATIC int needs_hs_server_circuits(int num_uptime_internal); +STATIC int needs_hs_server_circuits(time_t now, + int num_uptime_internal); STATIC int needs_hs_client_circuits(time_t now, int *needs_uptime, diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index f6594739b..d0265dc54 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -480,8 +480,6 @@ launch_rendezvous_point_circuit(const hs_service_t *service, tor_assert(data); circ_needs_uptime = hs_service_requires_uptime_circ(service->config.ports); - /* Help predict this next time */ - rep_hist_note_used_internal(now, circ_needs_uptime, 1); /* Get the extend info data structure for the chosen rendezvous point * specified by the given link specifiers. */ @@ -632,10 +630,6 @@ retry_service_rendezvous_point(const origin_circuit_t *circ) * has no anonymity (single onion), this change of behavior won't affect * security directly. */ - /* Help predict this next time */ - rep_hist_note_used_internal(time(NULL), bstate->need_uptime, - bstate->need_capacity); - new_circ = circuit_launch_by_extend_info(CIRCUIT_PURPOSE_S_CONNECT_REND, bstate->chosen_exit, flags); if (new_circ == NULL) { @@ -728,7 +722,7 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t *circ) int hs_circ_launch_intro_point(hs_service_t *service, const hs_service_intro_point_t *ip, - extend_info_t *ei, time_t now) + extend_info_t *ei) { /* Standard flags for introduction circuit. */ int ret = -1, circ_flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL; @@ -748,10 +742,6 @@ hs_circ_launch_intro_point(hs_service_t *service, safe_str_client(extend_info_describe(ei)), safe_str_client(service->onion_address)); - /* Note down that we are about to use an internal circuit. */ - rep_hist_note_used_internal(now, circ_flags & CIRCLAUNCH_NEED_UPTIME, - circ_flags & CIRCLAUNCH_NEED_CAPACITY); - /* Note down the launch for the retry period. Even if the circuit fails to * be launched, we still want to respect the retry period to avoid stress on * the circuit subsystem. */ diff --git a/src/or/hs_circuit.h b/src/or/hs_circuit.h index 8706e6b0e..9e359394e 100644 --- a/src/or/hs_circuit.h +++ b/src/or/hs_circuit.h @@ -24,7 +24,7 @@ void hs_circ_service_rp_has_opened(const hs_service_t *service, origin_circuit_t *circ); int hs_circ_launch_intro_point(hs_service_t *service, const hs_service_intro_point_t *ip, - extend_info_t *ei, time_t now); + extend_info_t *ei); int hs_circ_launch_rendezvous_point(const hs_service_t *service, const curve25519_public_key_t *onion_key, const uint8_t *rendezvous_cookie); diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 4c0ec628c..5f3696454 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1749,7 +1749,7 @@ run_build_descriptor_event(time_t now) /* For the given service, launch any intro point circuits that could be * needed. This considers every descriptor of the service. */ static void -launch_intro_point_circuits(hs_service_t *service, time_t now) +launch_intro_point_circuits(hs_service_t *service) { tor_assert(service); @@ -1785,7 +1785,7 @@ launch_intro_point_circuits(hs_service_t *service, time_t now) /* Launch a circuit to the intro point. */ ip->circuit_retries++; - if (hs_circ_launch_intro_point(service, ip, ei, now) < 0) { + if (hs_circ_launch_intro_point(service, ip, ei) < 0) { log_warn(LD_REND, "Unable to launch intro circuit to node %s " "for service %s.", safe_str_client(extend_info_describe(ei)), @@ -1910,7 +1910,7 @@ run_build_circuit_event(time_t now) * circuit creation so make sure this service is respecting that limit. */ if (can_service_launch_intro_circuit(service, now)) { /* Launch intro point circuits if needed. */ - launch_intro_point_circuits(service, now); + launch_intro_point_circuits(service); /* Once the circuits have opened, we'll make sure to update the * descriptor intro point list and cleanup any extraneous. */ }

1 0

[tor/master] prop224: Function to inc/decrement num rendezvous stream
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 5c4f4acedb8600769889cdff0940806c27b679bd Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 31 17:59:12 2017 +0300 prop224: Function to inc/decrement num rendezvous stream Add a common function for both legacy and prop224 hidden service to increment and decrement the rendezvous stream counter on an origin circuit. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/circuituse.c | 3 +-- src/or/connection_edge.c | 10 +--------- src/or/hs_common.c | 34 ++++++++++++++++++++++++++++++++++ src/or/hs_common.h | 3 +++ 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 66006542d..21cc9c540 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1383,8 +1383,7 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) * number of streams on the circuit associated with the rend service. */ if (circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) { - tor_assert(origin_circ->rend_data); - origin_circ->rend_data->nr_streams--; + hs_dec_rdv_stream_counter(origin_circ); } return; } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9f0cc061e..12ddc7e82 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3139,15 +3139,7 @@ handle_hs_exit_conn(circuit_t *circ, edge_connection_t *conn) conn->on_circuit = circ; assert_circuit_ok(circ); - if (origin_circ->rend_data) { - origin_circ->rend_data->nr_streams++; - } else if (origin_circ->hs_ident) { - origin_circ->hs_ident->num_rdv_streams++; - } else { - /* The previous if/else at the start of the function guarantee that we'll - * never end up in a else situation unless it's freed in between. */ - tor_assert(0); - } + hs_inc_rdv_stream_counter(origin_circ); /* Connect tor to the hidden service destination. */ connection_exit_connect(conn); diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 2b637eb78..0d3d41b7c 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1333,3 +1333,37 @@ hs_free_all(void) hs_cache_free_all(); } +/* For the given origin circuit circ, decrement the number of rendezvous + * stream counter. This handles every hidden service version. */ +void +hs_dec_rdv_stream_counter(origin_circuit_t *circ) +{ + tor_assert(circ); + + if (circ->rend_data) { + circ->rend_data->nr_streams--; + } else if (circ->hs_ident) { + circ->hs_ident->num_rdv_streams--; + } else { + /* Should not be called if this circuit is not for hidden service. */ + tor_assert_nonfatal_unreached(); + } +} + +/* For the given origin circuit circ, increment the number of rendezvous + * stream counter. This handles every hidden service version. */ +void +hs_inc_rdv_stream_counter(origin_circuit_t *circ) +{ + tor_assert(circ); + + if (circ->rend_data) { + circ->rend_data->nr_streams++; + } else if (circ->hs_ident) { + circ->hs_ident->num_rdv_streams++; + } else { + /* Should not be called if this circuit is not for hidden service. */ + tor_assert_nonfatal_unreached(); + } +} + diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 5004e0208..fd2a1f4e3 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -222,6 +222,9 @@ void hs_get_responsible_hsdirs(const ed25519_public_key_t *blinded_pk, int hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn); +void hs_inc_rdv_stream_counter(origin_circuit_t *circ); +void hs_dec_rdv_stream_counter(origin_circuit_t *circ); + #ifdef HS_COMMON_PRIVATE STATIC void get_disaster_srv(uint64_t time_period_num, uint8_t *srv_out);

1 0

[tor/master] Put comment in the trunnel file, so it wont go away.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 2f17743d6f7222cf96250890dd91d6689b2d55c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 20:31:47 2017 -0400 Put comment in the trunnel file, so it wont go away. --- src/trunnel/ed25519_cert.trunnel | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/trunnel/ed25519_cert.trunnel b/src/trunnel/ed25519_cert.trunnel index e424ce546..8d6483d55 100644 --- a/src/trunnel/ed25519_cert.trunnel +++ b/src/trunnel/ed25519_cert.trunnel @@ -28,6 +28,12 @@ const LS_IPV6 = 0x01; const LS_LEGACY_ID = 0x02; const LS_ED25519_ID = 0x03; +// XXX hs_link_specifier_dup() violates the opaqueness of link_specifier_t by +// taking its sizeof(). If we ever want to turn on TRUNNEL_OPAQUE, or +// if we ever make link_specifier contain other types, we will +// need to refactor that function to do the copy by encoding and decoding the +// object. + // amended from tor.trunnel struct link_specifier { u8 ls_type;

1 0

[tor/master] Merge branch 'ticket20657_nickm_bugfixes_squashed'
by nickm＠torproject.org 09 Aug '17

09 Aug '17

1 0

[tor/master] Add note about handling INTRODUCE2 cells.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 0a0bbfe96fe425f27641f86fabd19f65a551ac6c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 8 11:51:16 2017 +0300 Add note about handling INTRODUCE2 cells. Also fix a check-spaces instance. --- src/or/hs_cell.c | 5 +++++ src/test/test_hs_service.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 064e26334..a0e907460 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -210,6 +210,11 @@ build_legacy_establish_intro(const char *circ_nonce, crypto_pk_t *enc_key, * service and circuit which are used only for logging purposes. The resulting * parsed cell is put in cell_ptr_out. * + * This function only parses prop224 INTRODUCE2 cells even when the intro point + * is a legacy intro point. That's because intro points don't actually care + * about the contents of the introduce cell. Legacy INTRODUCE cells are only + * used by the legacy system now. + * * Return 0 on success else a negative value and cell_ptr_out is untouched. */ static int parse_introduce2_cell(const hs_service_t *service, diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 6a7b9b527..aea2c8fbf 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1114,7 +1114,8 @@ test_build_update_descriptors(void *arg) ed25519_keypair_generate(&kp1, 0); ri.cache_info.signing_key_cert = tor_malloc_zero(sizeof(tor_cert_t)); tt_assert(ri.cache_info.signing_key_cert); - ed25519_pubkey_copy(&ri.cache_info.signing_key_cert->signing_key, &kp1.pubkey); + ed25519_pubkey_copy(&ri.cache_info.signing_key_cert->signing_key, + &kp1.pubkey); nodelist_set_routerinfo(&ri, NULL); node = node_get_mutable_by_id(ri.cache_info.identity_digest); tt_assert(node);

1 0

[tor/master] prop224: Use state file to save/load revision counters
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 6f046b2191ed1a10e9058fcc49491b8db5a96280 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 21 15:53:17 2017 +0300 prop224: Use state file to save/load revision counters Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/or.h | 3 + src/or/statefile.c | 3 + 3 files changed, 208 insertions(+), 7 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index f656592d5..6519cb1b6 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -23,6 +23,7 @@ #include "router.h" #include "routerkeys.h" #include "routerlist.h" +#include "statefile.h" #include "hs_circuit.h" #include "hs_common.h" @@ -71,6 +72,8 @@ static const char *address_tld = "onion"; * loading keys requires that we are an actual running tor process. */ static smartlist_t *hs_service_staging_list; +static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc); + /* Helper: Function to compare two objects in the service map. Return 1 if the * two service have the same master public identity key. */ static inline int @@ -1283,6 +1286,9 @@ build_service_descriptor(hs_service_t *service, time_t now, goto err; } + /* Set the revision counter for this descriptor */ + set_descriptor_revision_counter(desc->desc); + /* Let's make sure that we've created a descriptor that can actually be * encoded properly. This function also checks if the encoded output is * decodable after. */ @@ -1936,6 +1942,200 @@ upload_descriptor_to_hsdir(const hs_service_t *service, return; } +/** Return a newly-allocated string for our state file which contains revision + * counter information for desc. The format is: + * + * HidServRevCounter <blinded_pubkey> <rev_counter> + */ +static char * +encode_desc_rev_counter_for_state(const hs_service_descriptor_t *desc) +{ + char *state_str = NULL; + char blinded_pubkey_b64[ED25519_BASE64_LEN+1]; + uint64_t rev_counter = desc->desc->plaintext_data.revision_counter; + const ed25519_public_key_t *blinded_pubkey = &desc->blinded_kp.pubkey; + + /* Turn the blinded key into b64 so that we save it on state */ + tor_assert(blinded_pubkey); + if (ed25519_public_to_base64(blinded_pubkey_b64, blinded_pubkey) < 0) { + goto done; + } + + /* Format is: <blinded key> <rev counter> */ + tor_asprintf(&state_str, "%s %" PRIu64, blinded_pubkey_b64, rev_counter); + + log_info(LD_GENERAL, "[!] Adding rev counter %" PRIu64 " for %s!", + rev_counter, blinded_pubkey_b64); + + done: + return state_str; +} + +/** Update HS descriptor revision counters in our state by removing the old + * ones and writing down the ones that are currently active. */ +static void +update_revision_counters_in_state(void) +{ + config_line_t *lines = NULL; + config_line_t **nextline = &lines; + or_state_t *state = get_or_state(); + + /* Prepare our state structure with the rev counters */ + FOR_EACH_SERVICE_BEGIN(service) { + FOR_EACH_DESCRIPTOR_BEGIN(service, desc) { + /* We don't want to save zero counters */ + if (desc->desc->plaintext_data.revision_counter == 0) { + continue; + } + + *nextline = tor_malloc_zero(sizeof(config_line_t)); + (*nextline)->key = tor_strdup("HidServRevCounter"); + (*nextline)->value = encode_desc_rev_counter_for_state(desc); + nextline = &(*nextline)->next; + } FOR_EACH_DESCRIPTOR_END; + } FOR_EACH_SERVICE_END; + + /* Remove the old rev counters, and replace them with the new ones */ + config_free_lines(state->HidServRevCounters); + state->HidServRevCounters = lines; + + /* Set the state as dirty since we just edited it */ + if (!get_options()->AvoidDiskWrites) { + or_state_mark_dirty(state, 0); + } +} + +/** Scan the string state_line for the revision counter of the service + * with blinded_pubkey. Set service_found_out to True if the + * line is relevant to this service, and return the cached revision + * counter. Else set service_found_out to False. */ +static uint64_t +check_state_line_for_service_rev_counter(const char *state_line, + ed25519_public_key_t *blinded_pubkey, + int *service_found_out) +{ + smartlist_t *items = NULL; + int ok; + ed25519_public_key_t pubkey_in_state; + uint64_t rev_counter = 0; + + tor_assert(service_found_out); + tor_assert(state_line); + tor_assert(blinded_pubkey); + + /* Assume that the line is not for this service */ + *service_found_out = 0; + + /* Start parsing the state line */ + items = smartlist_new(); + smartlist_split_string(items, state_line, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); + if (smartlist_len(items) < 2) { + log_warn(LD_GENERAL, "Incomplete rev counter line. Ignoring."); + goto done; + } + + char *b64_key_str = smartlist_get(items, 0); + char *saved_rev_counter_str = smartlist_get(items, 1); + + /* Parse blinded key to check if it's for this hidden service */ + if (ed25519_public_from_base64(&pubkey_in_state, b64_key_str) < 0) { + log_warn(LD_GENERAL, "Unable to base64 key in revcount line. Ignoring."); + goto done; + } + /* State line not for this hidden service */ + if (!ed25519_pubkey_eq(&pubkey_in_state, blinded_pubkey)) { + goto done; + } + + rev_counter = tor_parse_uint64(saved_rev_counter_str, + 10, 0, UINT64_MAX, &ok, NULL); + if (!ok) { + log_warn(LD_GENERAL, "Unable to parse rev counter. Ignoring."); + goto done; + } + + /* Since we got this far, the line was for this service */ + *service_found_out = 1; + + log_info(LD_GENERAL, "Found rev counter for %s: %" PRIu64, + b64_key_str, rev_counter); + + done: + if (items) { + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + } + + return rev_counter; +} + +/** Dig into our state file and find the current revision counter for the + * service with blinded key blinded_pubkey. If no revision counter is + * found, return 0. */ +static uint64_t +get_rev_counter_for_service(ed25519_public_key_t *blinded_pubkey) +{ + or_state_t *state = get_or_state(); + config_line_t *line; + + /* Set default value for rev counters (if not found) to 0 */ + uint64_t final_rev_counter = 0; + + for (line = state->HidServRevCounters ; line ; line = line->next) { + int service_found = 0; + uint64_t rev_counter = 0; + + tor_assert(!strcmp(line->key, "HidServRevCounter")); + + /* Scan all the HidServRevCounters lines till we find the line for this + service: */ + rev_counter = check_state_line_for_service_rev_counter(line->value, + blinded_pubkey, + &service_found); + if (service_found) { + final_rev_counter = rev_counter; + goto done; + } + } + + done: + return final_rev_counter; +} + +/** Update the value of the revision counter for hs_desc and save it on + our state file. */ +static void +update_descriptor_revision_counter(hs_descriptor_t *hs_desc) +{ + /* Find stored rev counter if it exists */ + uint64_t rev_counter = + get_rev_counter_for_service(&hs_desc->plaintext_data.blinded_pubkey); + + /* Increment the revision counter of hs_desc so the next update (which + * will trigger an upload) will have the right value. We do this at this + * stage to only do it once because a descriptor can have many updates before + * being uploaded. By doing it at upload, we are sure to only increment by 1 + * and thus avoid leaking how many operations we made on the descriptor from + * the previous one before uploading. */ + rev_counter++; + hs_desc->plaintext_data.revision_counter = rev_counter; + + update_revision_counters_in_state(); +} + +/** Set the revision counter in hs_desc, using the state file to find + * the current counter value if it exists. */ +static void +set_descriptor_revision_counter(hs_descriptor_t *hs_desc) +{ + /* Find stored rev counter if it exists */ + uint64_t rev_counter = + get_rev_counter_for_service(&hs_desc->plaintext_data.blinded_pubkey); + + hs_desc->plaintext_data.revision_counter = rev_counter; +} + /* Encode and sign the service descriptor desc and upload it to the * responsible hidden service directories. If for_next_period is true, the set * of directories are selected using the next hsdir_index. This does nothing @@ -1992,13 +2192,8 @@ upload_descriptor_to_all(const hs_service_t *service, safe_str_client(service->onion_address), fmt_next_time); } - /* Increment the revision counter so the next update (which will trigger an - * upload) will have the right value. We do this at this stage to only do it - * once because a descriptor can have many updates before being uploaded. By - * doing it at upload, we are sure to only increment by 1 and thus avoid - * leaking how many operations we made on the descriptor from the previous - * one before uploading. */ - desc->desc->plaintext_data.revision_counter += 1; + /* Update the revision counter of this descriptor */ + update_descriptor_revision_counter(desc->desc); smartlist_free(responsible_dirs); return; diff --git a/src/or/or.h b/src/or/or.h index 09e58b7b1..d8aea3827 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4626,6 +4626,9 @@ typedef struct { config_line_t *TransportProxies; + /** Cached revision counters for active hidden services on this host */ + config_line_t *HidServRevCounters; + /** These fields hold information on the history of bandwidth usage for * servers. The "Ends" fields hold the time when we last updated the * bandwidth usage. The "Interval" fields hold the granularity, in seconds, diff --git a/src/or/statefile.c b/src/or/statefile.c index d0606b301..6b759960c 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -85,6 +85,9 @@ static config_var_t state_vars_[] = { VAR("TransportProxy", LINELIST_S, TransportProxies, NULL), V(TransportProxies, LINELIST_V, NULL), + VAR("HidServRevCounter", LINELIST_S, HidServRevCounters, NULL), + V(HidServRevCounters, LINELIST_V, NULL), + V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, UINT, "900"), V(BWHistoryReadValues, CSV, ""),

1 0

[tor/master] SR: Calculate current SRV phase/run duration.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 0b22b7fce3f1ce97a85f4022533b206f847b7307 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 24 13:30:04 2017 +0300 SR: Calculate current SRV phase/run duration. This is also needed to make the HS desc overlap mode function independent of absolute hours. --- src/or/shared_random_state.c | 16 ++++++++++++++++ src/or/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 21 +++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 1fc1440d0..7f8094daf 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -176,6 +176,22 @@ sr_state_get_start_time_of_current_protocol_run(time_t now) return beginning_of_current_round - time_elapsed_since_start_of_run; } +/** Return the time (in seconds) it takes to complete a full SR protocol phase + * (e.g. the commit phase). */ +unsigned int +sr_state_get_phase_duration(void) +{ + return SHARED_RANDOM_N_ROUNDS * get_voting_interval(); +} + +/** Return the time (in seconds) it takes to complete a full SR protocol run */ +unsigned int +sr_state_get_protocol_run_duration(void) +{ + int total_protocol_rounds = SHARED_RANDOM_N_ROUNDS * SHARED_RANDOM_N_PHASES; + return total_protocol_rounds * get_voting_interval(); +} + /* Return the time we should expire the state file created at now. * We expire the state file in the beginning of the next protocol run. */ STATIC time_t diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index ae1c5ac21..03dd5eb37 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -122,6 +122,8 @@ void sr_state_save(void); void sr_state_free(void); time_t sr_state_get_start_time_of_current_protocol_run(time_t now); +unsigned int sr_state_get_phase_duration(void); +unsigned int sr_state_get_protocol_run_duration(void); #ifdef SHARED_RANDOM_STATE_PRIVATE diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 3eb47dfbc..ea037d417 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -260,6 +260,25 @@ test_get_start_time_of_current_run(void *arg) ; } +static void +test_get_sr_protocol_duration(void *arg) +{ + (void) arg; + + /* Check that by default an SR phase is 12 hours */ + tt_int_op(sr_state_get_phase_duration(), ==, 12*60*60); + tt_int_op(sr_state_get_protocol_run_duration(), ==, 24*60*60); + + /* Now alter the voting interval and check that the SR phase is 2 mins long + * if voting happens every 10 seconds (10*12 seconds = 2 mins) */ + or_options_t *options = get_options_mutable(); + options->V3AuthVotingInterval = 10; + tt_int_op(sr_state_get_phase_duration(), ==, 2*60); + tt_int_op(sr_state_get_protocol_run_duration(), ==, 4*60); + + done: ; +} + /* Mock function to immediately return our local 'mock_consensus'. */ static networkstatus_t * mock_networkstatus_get_live_consensus(time_t now) @@ -1345,6 +1364,8 @@ struct testcase_t sr_tests[] = { NULL, NULL }, { "get_start_time_of_current_run", test_get_start_time_of_current_run, TT_FORK, NULL, NULL }, + { "get_sr_protocol_duration", test_get_sr_protocol_duration, TT_FORK, + NULL, NULL }, { "get_state_valid_until_time", test_get_state_valid_until_time, TT_FORK, NULL, NULL }, { "vote", test_vote, TT_FORK,

1 0

[tor/master] prop224: Compute start time of next time period.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 2cd5f9a2fc2765539899b6e84ed4b1c9e02febad Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 18 16:44:03 2017 +0300 prop224: Compute start time of next time period. --- src/or/hs_common.c | 16 +++++++++++++ src/or/hs_common.h | 1 + src/test/test_hs_common.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 01bd204e1..0d81063cf 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -23,6 +23,7 @@ #include "rendservice.h" #include "router.h" #include "shared_random.h" +#include "shared_random_state.h" /* Ed25519 Basepoint value. Taken from section 5 of * https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-03 */ @@ -216,6 +217,21 @@ hs_get_next_time_period_num(time_t now) return hs_get_time_period_num(now) + 1; } +/* Return the start time of the upcoming time period based on now. */ +time_t +hs_get_start_time_of_next_time_period(time_t now) +{ + uint64_t time_period_length = get_time_period_length(); + + /* Get start time of next time period */ + uint64_t next_time_period_num = hs_get_next_time_period_num(now); + uint64_t start_of_next_tp_in_mins = next_time_period_num *time_period_length; + + /* Apply rotation offset as specified by prop224 section [TIME-PERIODS] */ + unsigned int time_period_rotation_offset = sr_state_get_phase_duration(); + return start_of_next_tp_in_mins * 60 + time_period_rotation_offset; +} + /* Create a new rend_data_t for a specific given version. * Return a pointer to the newly allocated data structure. */ static rend_data_t * diff --git a/src/or/hs_common.h b/src/or/hs_common.h index cbf1ac113..519485d57 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -195,6 +195,7 @@ void hs_get_subcredential(const ed25519_public_key_t *identity_pk, uint64_t hs_get_time_period_num(time_t now); uint64_t hs_get_next_time_period_num(time_t now); +time_t hs_get_start_time_of_next_time_period(time_t now); link_specifier_t *hs_link_specifier_dup(const link_specifier_t *lspec); diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 27bbab8d4..e41d68d42 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -14,6 +14,7 @@ #include "hs_test_helpers.h" #include "hs_common.h" +#include "config.h" static void test_validate_address(void *arg) @@ -132,6 +133,64 @@ test_time_period(void *arg) ; } +static void +test_start_time_of_next_time_period(void *arg) +{ + (void) arg; + int retval; + time_t fake_time; + char tbuf[ISO_TIME_LEN + 1]; + time_t next_tp_start_time; + + /* Do some basic tests */ + retval = parse_rfc1123_time("Wed, 13 Apr 2016 11:00:00 UTC", + &fake_time); + tt_int_op(retval, ==, 0); + next_tp_start_time = hs_get_start_time_of_next_time_period(fake_time); + /* Compare it with the correct result */ + format_iso_time(tbuf, next_tp_start_time); + tt_str_op("2016-04-13 12:00:00", OP_EQ, tbuf); + + /* Another test with an edge-case time (start of TP) */ + retval = parse_rfc1123_time("Wed, 13 Apr 2016 12:00:00 UTC", + &fake_time); + tt_int_op(retval, ==, 0); + next_tp_start_time = hs_get_start_time_of_next_time_period(fake_time); + format_iso_time(tbuf, next_tp_start_time); + tt_str_op("2016-04-14 12:00:00", OP_EQ, tbuf); + + { + /* Now pretend we are on a testing network and alter the voting schedule to + be every 10 seconds. This means that a time period has length 10*24 + seconds (4 minutes). It also means that we apply a rotational offset of + 120 seconds to the time period, so that it starts at 00:02:00 instead of + 00:00:00. */ + or_options_t *options = get_options_mutable(); + options->TestingTorNetwork = 1; + options->V3AuthVotingInterval = 10; + options->TestingV3AuthInitialVotingInterval = 10; + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:00:00 UTC", + &fake_time); + tt_int_op(retval, ==, 0); + next_tp_start_time = hs_get_start_time_of_next_time_period(fake_time); + /* Compare it with the correct result */ + format_iso_time(tbuf, next_tp_start_time); + tt_str_op("2016-04-13 00:02:00", OP_EQ, tbuf); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:02:00 UTC", + &fake_time); + tt_int_op(retval, ==, 0); + next_tp_start_time = hs_get_start_time_of_next_time_period(fake_time); + /* Compare it with the correct result */ + format_iso_time(tbuf, next_tp_start_time); + tt_str_op("2016-04-13 00:06:00", OP_EQ, tbuf); + } + + done: + ; +} + /** Test that our HS overlap period functions work properly. */ static void test_desc_overlap_period(void *arg) @@ -186,6 +245,8 @@ struct testcase_t hs_common_tests[] = { NULL, NULL }, { "time_period", test_time_period, TT_FORK, NULL, NULL }, + { "start_time_of_next_time_period", test_start_time_of_next_time_period, + TT_FORK, NULL, NULL }, { "desc_overlap_period", test_desc_overlap_period, TT_FORK, NULL, NULL },

1 0