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

[tor-browser-build/master] Bug 23384: Add user boklm on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit 1f108e3d3ddcfeff88c613f99983afc2e41cc273 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 15:39:14 2017 +0200 Bug 23384: Add user boklm on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 3 +++ tools/ansible/roles/tbb-team/files/boklm.pub | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 15 +++++++++++++++ tools/ansible/tbb-build.yml | 1 + 4 files changed, 20 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml new file mode 100644 index 0000000..b76fc26 --- /dev/null +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -0,0 +1,3 @@ +--- +tbb_team_members: + - boklm diff --git a/tools/ansible/roles/tbb-team/files/boklm.pub b/tools/ansible/roles/tbb-team/files/boklm.pub new file mode 100644 index 0000000..471f271 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/boklm.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuY6Clt4tqljhnQAfIAq2RcuB3UgQ1odLtYc+AlnwcgWgYoqByGXT52YnYd44MQ0rPpXGh6M5MeXGF33OOLkBm8QeFHiev4njq/14A5qMIH+xV4T/ft1vEE3PTuarzyhv/Qp1s0dt4/XibzMPND5zFQJUFsTON6WYix0cwBOa80W46P56jPca56kTnL045N8MJNFA4ELby68QaMMK0lEzupgLtzRnqc123paZr3FAgCOxNlYC83ftAsDuVNCzbp0+i3W0ZWBbqVo+wWbty7WJK4TjuQszS2oP+d5xxktXUVyVXu2xm0BV0kXgh6lV4ixDPKQsZrlUYalFN5QIQWwzb q-wo diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml new file mode 100644 index 0000000..9beaf0b --- /dev/null +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -0,0 +1,15 @@ +--- +- name: Add tbb-team users + user: + name: "{{ item }}" + state: present + groups: tbb-build + shell: /bin/bash + with_items: tbb_team_members + +- name: Add ssh keys to authorized_keys + authorized_key: + user: "{{ item }}" + state: present + key: "{{ lookup('file', item + '.pub') }}" + with_items: tbb_team_members diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index dc5dfe5..e74e665 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -4,3 +4,4 @@ roles: - role: tbb-builder - role: useful-packages + - role: tbb-team

1 0

[webwml/master] Add new Tor Browser version: 7.0.5
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit 815a9f49bb1d855c4644cd976cc381669ba0c430 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 18:53:04 2017 +0200 Add new Tor Browser version: 7.0.5 --- include/versions.wmi | 20 ++++++++++---------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 5319a08e..6e11eba7 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,24 +5,24 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>7.0.4</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2017-08-08</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>7.0.5</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2017-09-04</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>7.5a4</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-08-08</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.4</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-08-08</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.4</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-08-08</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.5</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-09-04</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.5</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-09-04</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a4</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-08-08</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a4</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-08-08</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.4</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-08-08</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>7.0.4</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-08-08</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.5</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-09-04</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>7.0.5</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-09-04</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>7.5a4</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-08-08</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.12</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index fdf796fe..71006442 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "7.0.4-MacOS", "7.0.4-Windows", "7.0.4-Linux", +"7.0.5", +"7.0.5-MacOS", +"7.0.5-Windows", +"7.0.5-Linux", "7.5a4", "7.5a4-MacOS", "7.5a4-Windows",

1 0

[tor/master] config: Make parse_outbound_addresses() return failures
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 651629cbdf5ae1af6702d282516bebc124f8742a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 31 08:29:09 2017 -0400 config: Make parse_outbound_addresses() return failures The function was never returning an error code on failure to parse the OutboundAddress* options. In the process, it was making our test_options_validate__outbound_addresses() not test the right thing. Fixes #23366 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23366 | 4 ++++ src/or/config.c | 27 +++++++++++++++++++++------ src/test/test_options.c | 2 ++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/changes/bug23366 b/changes/bug23366 new file mode 100644 index 000000000..85e370f61 --- /dev/null +++ b/changes/bug23366 @@ -0,0 +1,4 @@ + o Minor bugfixes (test): + - Fix a broken OutboundAddress option unit test because the parsing + function was never returning an error on failure. Fixes bug #23366.; + bugfix on tor-0.3.0.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 30853724e..ff70a4465 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7921,13 +7921,28 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) memset(&options->OutboundBindAddresses, 0, sizeof(options->OutboundBindAddresses)); } - parse_outbound_address_lines(options->OutboundBindAddress, - OUTBOUND_ADDR_EXIT_AND_OR, options, validate_only, msg); - parse_outbound_address_lines(options->OutboundBindAddressOR, - OUTBOUND_ADDR_OR, options, validate_only, msg); - parse_outbound_address_lines(options->OutboundBindAddressExit, - OUTBOUND_ADDR_EXIT, options, validate_only, msg); + + if (parse_outbound_address_lines(options->OutboundBindAddress, + OUTBOUND_ADDR_EXIT_AND_OR, options, + validate_only, msg) < 0) { + goto err; + } + + if (parse_outbound_address_lines(options->OutboundBindAddressOR, + OUTBOUND_ADDR_OR, options, validate_only, + msg) < 0) { + goto err; + } + + if (parse_outbound_address_lines(options->OutboundBindAddressExit, + OUTBOUND_ADDR_EXIT, options, validate_only, + msg) < 0) { + goto err; + } + return 0; + err: + return -1; } /** Load one of the geoip files, <a>family</a> determining which diff --git a/src/test/test_options.c b/src/test/test_options.c index 5f35c47f7..92e698282 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -528,6 +528,8 @@ test_options_validate__outbound_addresses(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); + tt_str_op(msg, OP_EQ, "Multiple outbound bind addresses configured: " + "xxyy!!!sdfaf"); done: free_options_test_data(tdata);

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug23366_032_01'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 33989cd002c761c37d2ed551f8aae0955dde4cd4 Merge: 834e1f808 651629cbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 12:48:26 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23366_032_01' changes/bug23366 | 4 ++++ src/or/config.c | 27 +++++++++++++++++++++------ src/test/test_options.c | 2 ++ 3 files changed, 27 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug23327_032_01'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 109cfebca540c80d176cde54e672e72ab8908139 Merge: 85688dc33 0850ae504 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 12:24:05 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23327_032_01' src/or/hs_client.c | 8 ++++++++ src/or/hs_client.h | 2 ++ src/or/hs_common.c | 2 ++ 3 files changed, 12 insertions(+)

1 0

[tor/master] hs: Implement an HS client free all function
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 0850ae50490419b3d071a18462253148ea29e62c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 29 16:02:13 2017 -0400 hs: Implement an HS client free all function Called from main.c, the function for now purges the hidden service directory request cache. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_client.c | 8 ++++++++ src/or/hs_client.h | 2 ++ src/or/hs_common.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 99be058eb..19e20c0e8 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -1251,3 +1251,11 @@ hs_client_reextend_intro_circuit(origin_circuit_t *circ) return ret; } +/* Release all the storage held by the client subsystem. */ +void +hs_client_free_all(void) +{ + /* Purge the hidden service request cache. */ + hs_purge_last_hid_serv_requests(); +} + diff --git a/src/or/hs_client.h b/src/or/hs_client.h index 8ed0501c9..86784f52c 100644 --- a/src/or/hs_client.h +++ b/src/or/hs_client.h @@ -46,5 +46,7 @@ extend_info_t *hs_client_get_random_intro_from_edge( int hs_client_reextend_intro_circuit(origin_circuit_t *circ); +void hs_client_free_all(void); + #endif /* TOR_HS_CLIENT_H */ diff --git a/src/or/hs_common.c b/src/or/hs_common.c index d866ab6a8..0103c68f3 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -19,6 +19,7 @@ #include "nodelist.h" #include "hs_cache.h" #include "hs_common.h" +#include "hs_client.h" #include "hs_ident.h" #include "hs_service.h" #include "policies.h" @@ -1700,6 +1701,7 @@ hs_free_all(void) hs_circuitmap_free_all(); hs_service_free_all(); hs_cache_free_all(); + hs_client_free_all(); } /* For the given origin circuit circ, decrement the number of rendezvous

1 0

[tor/master] prop224 test: Improve desc_reupload_logic() test with more nodes.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit d3cefddfc5dd75fd0a8dbd27e7b846b26bb86c4d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Aug 30 15:14:34 2017 +0300 prop224 test: Improve desc_reupload_logic() test with more nodes. --- src/test/test_hs_common.c | 72 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index f8870ca7b..6bb03f39d 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -21,6 +21,7 @@ #include "networkstatus.h" #include "directory.h" #include "nodelist.h" +#include "routerlist.h" #include "statefile.h" /** Test the validation of HS v3 addresses */ @@ -378,8 +379,10 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, memcpy(rs->identity_digest, identity, DIGEST_LEN); rs->is_hs_dir = is_hsdir; rs->supports_v3_hsdir = 1; + strlcpy(rs->nickname, nickname, sizeof(rs->nickname)); tor_addr_parse(&ipv4_addr, "1.2.3.4"); ri->addr = tor_addr_to_ipv4h(&ipv4_addr); + rs->addr = tor_addr_to_ipv4h(&ipv4_addr); ri->nickname = tor_strdup(nickname); ri->protocol_list = tor_strdup("HSDir=1-2 LinkAuth=3"); memcpy(ri->cache_info.identity_digest, identity, DIGEST_LEN); @@ -392,7 +395,7 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, smartlist_add(ns->routerstatus_list, rs); done: - ; + routerinfo_free(ri); } static networkstatus_t *mock_ns = NULL; @@ -416,6 +419,7 @@ mock_networkstatus_get_latest_consensus(void) mock_ns->valid_until = now+2; /* Create routerstatus list */ mock_ns->routerstatus_list = smartlist_new(); + mock_ns->type = NS_TYPE_CONSENSUS; return mock_ns; } @@ -562,18 +566,19 @@ test_desc_reupload_logic(void *arg) tt_int_op(hs_service_get_num_services(), OP_EQ, 1); /* Now let's create our hash ring: */ - { /* First HSDir */ + { helper_add_hsdir_to_networkstatus(ns, 1, "dingus", 1); - } - - { /* Second HSDir */ helper_add_hsdir_to_networkstatus(ns, 2, "clive", 1); + helper_add_hsdir_to_networkstatus(ns, 3, "aaron", 1); + helper_add_hsdir_to_networkstatus(ns, 4, "lizzie", 1); + helper_add_hsdir_to_networkstatus(ns, 5, "daewon", 1); + helper_add_hsdir_to_networkstatus(ns, 6, "clarke", 1); } /* Now let's upload our desc to all hsdirs */ upload_descriptor_to_all(service, desc, 0); /* Check that previous hsdirs were populated */ - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 2); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); /* Poison next upload time so that we can see if it was changed by * router_dir_info_changed(). No changes in hash ring so far, so the upload @@ -582,10 +587,23 @@ test_desc_reupload_logic(void *arg) router_dir_info_changed(); tt_int_op(desc->next_upload_time, OP_EQ, 42); - /* Now change the HSDir hash ring by adding another node */ + /* Now change the HSDir hash ring by swapping nora for aaron. + * Start by clearing the hash ring */ + { + SMARTLIST_FOREACH(ns->routerstatus_list, + routerstatus_t *, rs, routerstatus_free(rs)); + smartlist_clear(ns->routerstatus_list); + nodelist_free_all(); + routerlist_free_all(); + } - { /* Third HSDir */ - helper_add_hsdir_to_networkstatus(ns, 3, "ringo", 1); + { /* Now add back all the nodes */ + helper_add_hsdir_to_networkstatus(ns, 1, "dingus", 1); + helper_add_hsdir_to_networkstatus(ns, 2, "clive", 1); + helper_add_hsdir_to_networkstatus(ns, 4, "lizzie", 1); + helper_add_hsdir_to_networkstatus(ns, 5, "daewon", 1); + helper_add_hsdir_to_networkstatus(ns, 6, "clarke", 1); + helper_add_hsdir_to_networkstatus(ns, 7, "nora", 1); } /* Now call service_desc_hsdirs_changed() and see that it detected the hash @@ -593,6 +611,35 @@ test_desc_reupload_logic(void *arg) time_t now = approx_time(); tt_assert(now); tt_int_op(service_desc_hsdirs_changed(service, desc), OP_EQ, 1); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); + + /* Now order another upload and see how we end up with 7 hsdirs */ + upload_descriptor_to_all(service, desc, 0); + /* Check that previous hsdirs were populated */ + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 7); + + /* Now restore the HSDir hash ring to its original state by swapping back + aaron for nora */ + /* First clear up the hash ring */ + { + SMARTLIST_FOREACH(ns->routerstatus_list, + routerstatus_t *, rs, routerstatus_free(rs)); + smartlist_clear(ns->routerstatus_list); + nodelist_free_all(); + routerlist_free_all(); + } + + { /* Now populate the hash ring again */ + helper_add_hsdir_to_networkstatus(ns, 1, "dingus", 1); + helper_add_hsdir_to_networkstatus(ns, 2, "clive", 1); + helper_add_hsdir_to_networkstatus(ns, 3, "aaron", 1); + helper_add_hsdir_to_networkstatus(ns, 4, "lizzie", 1); + helper_add_hsdir_to_networkstatus(ns, 5, "daewon", 1); + helper_add_hsdir_to_networkstatus(ns, 6, "clarke", 1); + } + + /* Check that our algorithm catches this change of hsdirs */ + tt_int_op(service_desc_hsdirs_changed(service, desc), OP_EQ, 1); /* Now pretend that the descriptor changed, and order a reupload to all HSDirs. Make sure that the set of previous HSDirs was cleared. */ @@ -601,9 +648,14 @@ test_desc_reupload_logic(void *arg) /* Now reupload again: see that the prev hsdir set got populated again. */ upload_descriptor_to_all(service, desc, 0); - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 3); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); done: + SMARTLIST_FOREACH(ns->routerstatus_list, + routerstatus_t *, rs, routerstatus_free(rs)); + smartlist_clear(ns->routerstatus_list); + networkstatus_vote_free(ns); + nodelist_free_all(); hs_free_all(); }

1 0

[tor/master] prop224 test: Simplify interface for adding nodes to hash ring.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit ac9066660e4780460ca6e96dc98c7dac7aadc722 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Aug 30 14:14:58 2017 +0300 prop224 test: Simplify interface for adding nodes to hash ring. We want to have tests with big hash rings so let's make it an one-liner to add nodes. --- src/test/test_hs_common.c | 64 ++++++++++------------------------------------- 1 file changed, 13 insertions(+), 51 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b9215ea18..f8870ca7b 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -362,15 +362,19 @@ test_desc_overlap_period_testnet(void *arg) static void helper_add_hsdir_to_networkstatus(networkstatus_t *ns, - const uint8_t *identity, - const uint8_t *curr_hsdir_index, + int identity_idx, const char *nickname, int is_hsdir) { routerstatus_t *rs = tor_malloc_zero(sizeof(routerstatus_t)); routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); - + uint8_t identity[DIGEST_LEN]; + uint8_t curr_hsdir_index[DIGEST256_LEN]; tor_addr_t ipv4_addr; + + memset(identity, identity_idx, sizeof(identity)); + memset(curr_hsdir_index, identity_idx, sizeof(curr_hsdir_index)); + memcpy(rs->identity_digest, identity, DIGEST_LEN); rs->is_hs_dir = is_hsdir; rs->supports_v3_hsdir = 1; @@ -435,36 +439,15 @@ test_responsible_hsdirs(void *arg) ns = networkstatus_get_latest_consensus(); { /* First router: HSdir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "let_me"; - memset(identity, 1, sizeof(identity)); - memset(curr_hsdir_index, 1, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 1); + helper_add_hsdir_to_networkstatus(ns, 1, "igor", 1); } { /* Second HSDir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "show_you"; - memset(identity, 2, sizeof(identity)); - memset(curr_hsdir_index, 2, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 1); + helper_add_hsdir_to_networkstatus(ns, 2, "victor", 1); } { /* Third relay but not HSDir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "how_to_dance"; - memset(identity, 3, sizeof(identity)); - memset(curr_hsdir_index, 3, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 0); + helper_add_hsdir_to_networkstatus(ns, 3, "spyro", 0); } ed25519_keypair_t kp; @@ -580,25 +563,11 @@ test_desc_reupload_logic(void *arg) /* Now let's create our hash ring: */ { /* First HSDir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "let_me"; - memset(identity, 1, sizeof(identity)); - memset(curr_hsdir_index, 1, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 1); + helper_add_hsdir_to_networkstatus(ns, 1, "dingus", 1); } { /* Second HSDir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "show_you"; - memset(identity, 2, sizeof(identity)); - memset(curr_hsdir_index, 2, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 1); + helper_add_hsdir_to_networkstatus(ns, 2, "clive", 1); } /* Now let's upload our desc to all hsdirs */ @@ -616,14 +585,7 @@ test_desc_reupload_logic(void *arg) /* Now change the HSDir hash ring by adding another node */ { /* Third HSDir */ - uint8_t identity[DIGEST_LEN]; - uint8_t curr_hsdir_index[DIGEST256_LEN]; - char nickname[] = "how_to_dance"; - memset(identity, 3, sizeof(identity)); - memset(curr_hsdir_index, 3, sizeof(curr_hsdir_index)); - - helper_add_hsdir_to_networkstatus(ns, identity, - curr_hsdir_index, nickname, 1); + helper_add_hsdir_to_networkstatus(ns, 3, "ringo", 1); } /* Now call service_desc_hsdirs_changed() and see that it detected the hash

1 0

[tor/master] prop224: Simplify HSDir set change algo.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 1dc21b87904b527140446674876076f29c78b89f Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Aug 30 15:29:41 2017 +0300 prop224: Simplify HSDir set change algo. Our logic for detecting hsdir set changes was needlessly compicated: we had to sort smartlists and compare them. Instead, we can simplify things by employing the following logic: "We should reupload our descriptor if the latest HSDir set contains nodes that were not previously there" --- src/or/hs_service.c | 32 +++++++++++--------------------- src/or/hs_service.h | 2 +- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 5ff118222..0fba0d7f9 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1546,7 +1546,6 @@ service_desc_note_upload(hs_service_descriptor_t *desc, const node_t *hsdir) if (!smartlist_contains_string(desc->previous_hsdirs, b64_digest)) { smartlist_add_strdup(desc->previous_hsdirs, b64_digest); - smartlist_sort_strings(desc->previous_hsdirs); } } @@ -2366,9 +2365,8 @@ STATIC int service_desc_hsdirs_changed(const hs_service_t *service, const hs_service_descriptor_t *desc) { - int retval = 0; + int should_reupload = 0; smartlist_t *responsible_dirs = smartlist_new(); - smartlist_t *b64_responsible_dirs = smartlist_new(); /* No desc upload has happened yet: it will happen eventually */ if (!desc->previous_hsdirs || !smartlist_len(desc->previous_hsdirs)) { @@ -2379,32 +2377,24 @@ service_desc_hsdirs_changed(const hs_service_t *service, hs_get_responsible_hsdirs(&desc->blinded_kp.pubkey, desc->time_period_num, service->desc_next == desc, 0, responsible_dirs); - /* Make a second list with their b64ed identity digests, so that we can - * compare it with out previous list of hsdirs */ + /* Check if any new hsdirs have been added to the responsible hsdirs set: + * Iterate over the list of new hsdirs, and reupload if any of them is not + * present in the list of previous hsdirs. + */ SMARTLIST_FOREACH_BEGIN(responsible_dirs, const routerstatus_t *, hsdir_rs) { char b64_digest[BASE64_DIGEST_LEN+1] = {0}; digest_to_base64(b64_digest, hsdir_rs->identity_digest); - smartlist_add_strdup(b64_responsible_dirs, b64_digest); - } SMARTLIST_FOREACH_END(hsdir_rs); - - /* Sort this new smartlist so that we can compare it with the other one */ - smartlist_sort_strings(b64_responsible_dirs); - /* Check whether the set of HSDirs changed */ - if (!smartlist_strings_eq(b64_responsible_dirs, desc->previous_hsdirs)) { - log_info(LD_GENERAL, "Received new dirinfo and set of hsdirs changed!"); - retval = 1; - } else { - log_debug(LD_GENERAL, "No change in hsdir set!"); - } + if (!smartlist_contains_string(desc->previous_hsdirs, b64_digest)) { + should_reupload = 1; + break; + } + } SMARTLIST_FOREACH_END(hsdir_rs); done: smartlist_free(responsible_dirs); - SMARTLIST_FOREACH(b64_responsible_dirs, char*, s, tor_free(s)); - smartlist_free(b64_responsible_dirs); - - return retval; + return should_reupload; } /* Return 1 if the given descriptor from the given service can be uploaded diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 57717fc92..26f0bc000 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -133,7 +133,7 @@ typedef struct hs_service_descriptor_t { /** List of the responsible HSDirs (their b64ed identity digest) last time we * uploaded this descriptor. If the set of responsible HSDirs is different * from this list, this means we received new dirinfo and we need to - * reupload our descriptor. This list is always sorted lexicographically. */ + * reupload our descriptor. */ smartlist_t *previous_hsdirs; } hs_service_descriptor_t;

1 0

[tor/master] prop224: Clear list of prev hsdirs before we upload all descs.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit b9f849bdee20f36264fe061498536e0d3a8616a6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 29 16:02:01 2017 +0300 prop224: Clear list of prev hsdirs before we upload all descs. This fixes a serious bug in our hsdir set change logic: We used to add nodes in the list of previous hsdirs everytime we uploaded to a new hsdir and we only cleared the list when we built a new descriptor. This means that our prev_hsdirs list could end up with 7 hsdirs, if for some reason we ended up uploading our desc to 7 hsdirs before rebuilding our descriptor (e.g. this can happen if the set of hsdirs changed). After our previous hdsir set had 7 nodes, then our old algorithm would always think that the set has changed since it was comparing a smartlist with 7 elements against a smartlist with 6 elements. This commit fixes this bug, by clearning the prev_hsdirs list before we upload to all hsdirs. This makes sure that our prev_hsdirs list always contains the latest hsdirs! --- src/or/hs_service.c | 4 ++++ src/test/test_hs_common.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 0fba0d7f9..218d49ace 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2316,6 +2316,10 @@ upload_descriptor_to_all(const hs_service_t *service, hs_get_responsible_hsdirs(&desc->blinded_kp.pubkey, desc->time_period_num, for_next_period, 0, responsible_dirs); + /** Clear list of previous hsdirs since we are about to upload to a new + * list. Let's keep it up to date. */ + service_desc_clear_previous_hsdirs(desc); + /* For each responsible HSDir we have, initiate an upload command. */ SMARTLIST_FOREACH_BEGIN(responsible_dirs, const routerstatus_t *, hsdir_rs) { diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 6bb03f39d..998089295 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -613,10 +613,10 @@ test_desc_reupload_logic(void *arg) tt_int_op(service_desc_hsdirs_changed(service, desc), OP_EQ, 1); tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); - /* Now order another upload and see how we end up with 7 hsdirs */ + /* Now order another upload and see that we keep having 6 prev hsdirs */ upload_descriptor_to_all(service, desc, 0); /* Check that previous hsdirs were populated */ - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 7); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); /* Now restore the HSDir hash ring to its original state by swapping back aaron for nora */

1 0