April 2018 - tor-commits - lists.torproject.org

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 7fd6ca558926e89d53a0005c311a2282bed99a3c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 17:50:27 2018 +0000 Update translations for support-miscellaneous --- pl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl.json b/pl.json index c29993d09..ae975bc50 100644 --- a/pl.json +++ b/pl.json @@ -14,7 +14,7 @@ "misc-3": { "id": "#misc-3", "control": "misc-3", - "title": "Who funds Tor?", + "title": "Kto wynalazł Tor?", "description": "Tor is funded by a number of different sponsors including US federal agencies, private foundations, and individual donors. Check out a list of all <a href=\"https://www.torproject.org/about/sponsors.html.en\">our sponsors</a> and a series of <a href=\"https://blog.torproject.org/category/tags/form-990\">blog posts</a> on our financial reports.We feel that talking openly about our funders and funding model is the best way to maintain trust with our community. We are always seeking more diversity in our funding sources, especially from foundations and individuals." }, "misc-4": { @@ -44,7 +44,7 @@ "misc-8": { "id": "#misc-8", "control": "misc-8", - "title": "Can I use the Tor logo in my product?", + "title": "Czy mogę użyć logo Tor w moim produkcie?", "description": "You can read all about that on our <a href=\"https://www.torproject.org/docs/trademark-faq.html\">Trademark faq page</a>." }, "misc-9": {

1 0

[tor/master] Stop initialising rust submodules, travis does this for us
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit b116710e313c6debf9bc172e462837782def57bd Author: teor <teor2345(a)gmail.com> Date: Fri Dec 15 12:55:02 2017 +1100 Stop initialising rust submodules, travis does this for us Fixes #24630. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18c5b5bdd..46317ee06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,8 +144,6 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule init ; fi - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule update; fi - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi script:

1 0

[tor/maint-0.3.3] Stop initialising rust submodules, travis does this for us
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit b116710e313c6debf9bc172e462837782def57bd Author: teor <teor2345(a)gmail.com> Date: Fri Dec 15 12:55:02 2017 +1100 Stop initialising rust submodules, travis does this for us Fixes #24630. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18c5b5bdd..46317ee06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,8 +144,6 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule init ; fi - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule update; fi - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi script:

1 0

[tor/release-0.3.3] Stop initialising rust submodules, travis does this for us
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit b116710e313c6debf9bc172e462837782def57bd Author: teor <teor2345(a)gmail.com> Date: Fri Dec 15 12:55:02 2017 +1100 Stop initialising rust submodules, travis does this for us Fixes #24630. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18c5b5bdd..46317ee06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -144,8 +144,6 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi ## If we're testing rust builds in offline-mode, then set up our vendored dependencies - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule init ; fi - - if [[ "$RUST_OPTIONS" == "--enable-rust" ]]; then git submodule update; fi - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi script:

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 78eb0192dae890c473d1920e23635db6d3624b2f Merge: 346c2eb4e b116710e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 13:26:17 2018 -0400 Merge branch 'maint-0.3.3' .travis.yml | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 3a53b0c9a2eda2f5c7ca57675051f6d8bdefe5d0 Merge: 19bed6f93 b116710e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 13:26:17 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] Introduce torrc option NumPrimaryGuards
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit d00ed406e08942d6539281eb28e875939ee214e5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 25 15:10:24 2018 +0300 Introduce torrc option NumPrimaryGuards --- changes/bug25843 | 3 +++ doc/tor.1.txt | 7 +++++++ src/or/config.c | 6 ++++++ src/or/entrynodes.c | 16 ++++++++++------ src/or/or.h | 2 ++ src/test/test_entrynodes.c | 19 +++++++++++++++++++ 6 files changed, 47 insertions(+), 6 deletions(-) diff --git a/changes/bug25843 b/changes/bug25843 new file mode 100644 index 000000000..ddbbbef78 --- /dev/null +++ b/changes/bug25843 @@ -0,0 +1,3 @@ + o Minor feature (entry guards): + - Introduce torrc option NumPrimaryGuards for controlling the number of + primary guards. Closes ticket 25843. \ No newline at end of file diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 95620a334..ce9967d8a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1344,6 +1344,13 @@ The following options are useful only for clients (that is, if number from the guard-n-primary-guards-to-use consensus parameter, and default to 1 if the consensus parameter isn't set. (Default: 0) +[[NumPrimaryGuards]] **NumPrimaryGuards** __NUM__:: + If UseEntryGuards is set to 1, we will try to pick NUM routers for our + primary guard list, which is the set of routers we strongly prefer when + connecting to the Tor network. If NUM is 0, we try to learn the number from + the guard-n-primary-guards consensus parameter, and default to 3 if the + consensus parameter isn't set. (Default: 0) + [[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__:: If UseEntryGuards is set to 1, we try to make sure we have at least NUM routers to use as directory guards. If this option is set to 0, use the diff --git a/src/or/config.c b/src/or/config.c index 9c0b321b5..04e10e956 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -457,6 +457,7 @@ static config_var_t option_vars_[] = { V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"), V(NumEntryGuards, UINT, "0"), + V(NumPrimaryGuards, UINT, "0"), V(OfflineMasterKey, BOOL, "0"), OBSOLETE("ORListenAddress"), VPORT(ORPort), @@ -3763,6 +3764,11 @@ options_validate(or_options_t *old_options, or_options_t *options, "http://freehaven.net/anonbib/#hs-attack06 for details."); } + if (options->NumPrimaryGuards && options->NumEntryGuards && + options->NumEntryGuards > options->NumPrimaryGuards) { + REJECT("NumEntryGuards must not be greater than NumPrimaryGuards."); + } + if (options->EntryNodes && routerset_is_list(options->EntryNodes) && (routerset_len(options->EntryNodes) == 1) && diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 88d1b94de..061aa6f58 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -432,14 +432,15 @@ get_guard_confirmed_min_lifetime(void) STATIC int get_n_primary_guards(void) { - const int n = get_options()->NumEntryGuards; - const int n_dir = get_options()->NumDirectoryGuards; - if (n > 5) { - return MAX(n_dir, n + n / 2); - } else if (n >= 1) { - return MAX(n_dir, n * 2); + /* If the user has explicitly configured the number of primary guards, do + * what the user wishes to do */ + const int configured_primaries = get_options()->NumPrimaryGuards; + if (configured_primaries) { + return configured_primaries; } + /* otherwise check for consensus parameter and if that's not set either, just + * use the default value. */ return networkstatus_get_param(NULL, "guard-n-primary-guards", DFLT_N_PRIMARY_GUARDS, 1, INT32_MAX); @@ -454,6 +455,9 @@ get_n_primary_guards_to_use(guard_usage_t usage) int configured; const char *param_name; int param_default; + + /* If the user has explicitly configured the amount of guards, use + that. Otherwise, fall back to the default value. */ if (usage == GUARD_USAGE_DIRGUARD) { configured = get_options()->NumDirectoryGuards; param_name = "guard-n-primary-dir-guards-to-use"; diff --git a/src/or/or.h b/src/or/or.h index c5a039e93..475274340 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4148,6 +4148,8 @@ typedef struct { int NumDirectoryGuards; /**< How many dir guards do we try to establish? * If 0, use value from NumEntryGuards. */ + int NumPrimaryGuards; /**< How many primary guards do we want? */ + int RephistTrackTime; /**< How many seconds do we keep rephist info? */ /** Should we always fetch our dir info on the mirror schedule (which * means directly from the authorities) no matter our other config? */ diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 92a860360..f55e9f017 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -2679,6 +2679,23 @@ test_enty_guard_should_expire_waiting(void *arg) tor_free(fake_state); } +/** Test that the number of primary guards can be controlled using torrc */ +static void +test_entry_guard_number_of_primaries(void *arg) +{ + (void) arg; + + /* Get default value */ + tt_int_op(get_n_primary_guards(), OP_EQ, DFLT_N_PRIMARY_GUARDS); + + /* Set number of primaries using torrc */ + get_options_mutable()->NumPrimaryGuards = 42; + tt_int_op(get_n_primary_guards(), OP_EQ, 42); + + done: + ; +} + static void mock_directory_initiate_request(directory_request_t *req) { @@ -2826,6 +2843,8 @@ struct testcase_t entrynodes_tests[] = { test_entry_guard_parse_from_state_broken, TT_FORK, NULL, NULL }, { "get_guard_selection_by_name", test_entry_guard_get_guard_selection_by_name, TT_FORK, NULL, NULL }, + { "number_of_primaries", + test_entry_guard_number_of_primaries, TT_FORK, NULL, NULL }, BFN_TEST(choose_selection_initial), BFN_TEST(add_single_guard), BFN_TEST(node_filter),

1 0

[tor/master] Merge branch 'bug25843_v2_squashed'
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 346c2eb4e60299f69327b5e63e1e25aaf678f964 Merge: 8b58e1e32 d00ed406e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 12:45:07 2018 -0400 Merge branch 'bug25843_v2_squashed' changes/bug25843 | 3 +++ doc/tor.1.txt | 7 +++++++ src/or/config.c | 6 ++++++ src/or/entrynodes.c | 16 ++++++++++------ src/or/or.h | 2 ++ src/test/test_entrynodes.c | 19 +++++++++++++++++++ 6 files changed, 47 insertions(+), 6 deletions(-)

1 0

[tor/master] hs: Rescan the main loop event list if the service map changes
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit f7633c1fcaefe72bf97c001bab9062132c919996 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 27 11:14:12 2018 -0400 hs: Rescan the main loop event list if the service map changes Because ADD_ONION/DEL_ONION can modify the global service map (both for v2 and v3), we need to rescan the event list so we either enable or disable the HS service main loop event. Fixees #25939 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 28 ++++++++++++++++++++++++++++ src/or/hs_service.h | 1 + src/or/rendservice.c | 11 +++++++++++ src/test/test_periodic_event.c | 12 +++++++++--- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index f6c7e3cd8..7af14373d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -80,6 +80,7 @@ static smartlist_t *hs_service_staging_list; * reupload if needed */ static int consider_republishing_hs_descriptors = 0; +/* Static declaration. */ static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc); static void move_descriptors(hs_service_t *src, hs_service_t *dst); @@ -152,6 +153,12 @@ register_service(hs_service_ht *map, hs_service_t *service) } /* Taking ownership of the object at this point. */ HT_INSERT(hs_service_ht, map, service); + + /* If we just modified the global map, we notify. */ + if (map == hs_service_map) { + hs_service_map_has_changed(); + } + return 0; } @@ -178,6 +185,11 @@ remove_service(hs_service_ht *map, hs_service_t *service) "while removing service %s", escaped(service->config.directory_path)); } + + /* If we just modified the global map, we notify. */ + if (map == hs_service_map) { + hs_service_map_has_changed(); + } } /* Set the default values for a service configuration object c. */ @@ -916,6 +928,11 @@ register_all_services(void) smartlist_clear(hs_service_staging_list); service_free_all(); hs_service_map = new_service_map; + /* We've just register services into the new map and now we've replaced the + * global map with it so we have to notify that the change happened. When + * registering a service, the notify is only triggered if the destination + * map is the global map for which in here it was not. */ + hs_service_map_has_changed(); } /* Write the onion address of a given service to the given filename fname_ in @@ -2936,6 +2953,17 @@ service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list) /* Public API */ /* ========== */ +/* This is called everytime the service map (v2 or v3) changes that is if an + * element is added or removed. */ +void +hs_service_map_has_changed(void) +{ + /* If we now have services where previously we had not, we need to enable + * the HS service main loop event. If we changed to having no services, we + * need to disable the event. */ + rescan_periodic_events(get_options()); +} + /* Upload an encoded descriptor in encoded_desc of the given version. This * descriptor is for the service identity_pk and blinded_pk used to setup the * directory connection identifier. It is uploaded to the directory hsdir_rs diff --git a/src/or/hs_service.h b/src/or/hs_service.h index d163eeef2..2e27d8a89 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -260,6 +260,7 @@ void hs_service_lists_fnames_for_sandbox(smartlist_t *file_list, int hs_service_set_conn_addr_port(const origin_circuit_t *circ, edge_connection_t *conn); +void hs_service_map_has_changed(void); void hs_service_dir_info_changed(void); void hs_service_run_scheduled_events(time_t now); void hs_service_circuit_has_opened(origin_circuit_t *circ); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1a93c3643..afaeabe5d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -348,6 +348,13 @@ rend_add_service(smartlist_t *service_list, rend_service_t *service) /* The service passed all the checks */ tor_assert(s_list); smartlist_add(s_list, service); + + /* Notify that our global service list has changed only if this new service + * went into our global list. If not, when we move service from the staging + * list to the new list, a notify is triggered. */ + if (s_list == rend_service_list) { + hs_service_map_has_changed(); + } return 0; } @@ -609,6 +616,8 @@ rend_service_prune_list_impl_(void) circuit_mark_for_close(TO_CIRCUIT(ocirc), END_CIRC_REASON_FINISHED); } smartlist_free(surviving_services); + /* Notify that our global service list has changed. */ + hs_service_map_has_changed(); } /* Try to prune our main service list using the temporary one that we just @@ -958,6 +967,8 @@ rend_service_del_ephemeral(const char *service_id) } } SMARTLIST_FOREACH_END(circ); smartlist_remove(rend_service_list, s); + /* Notify that we just removed a service from our global list. */ + hs_service_map_has_changed(); rend_service_free(s); log_debug(LD_CONFIG, "Removed ephemeral Onion Service: %s", service_id); diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index bebbb5e58..9f62cd680 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -69,7 +69,7 @@ test_pe_initialize(void *arg) static void test_pe_launch(void *arg) { - hs_service_t service; + hs_service_t service, *to_remove = NULL; or_options_t *options; (void) arg; @@ -152,8 +152,11 @@ test_pe_launch(void *arg) options->V3AuthoritativeDir = 1; options->BridgeAuthoritativeDir = 1; register_dummy_hidden_service(&service); periodic_events_on_new_options(options); - /* Remove it now so the hs_free_all() doesn't try to free stack memory. */ - remove_service(get_hs_service_map(), &service); + /* Note down the reference because we need to remove this service from the + * global list before the hs_free_all() call so it doesn't try to free + * memory on the stack. Furthermore, we can't remove it now else it will + * trigger a rescan of the event disabling the HS service event. */ + to_remove = &service; for (int i = 0; periodic_events[i].name; ++i) { periodic_event_item_t *item = &periodic_events[i]; @@ -161,6 +164,9 @@ test_pe_launch(void *arg) } done: + if (to_remove) { + remove_service(get_hs_service_map(), to_remove); + } hs_free_all(); }

1 0

[tor/master] main: Don't rescan main loop events if not initialized
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 3ab017b10c64e090a5a3f197315ddcdbc6de698c Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 27 11:14:33 2018 -0400 main: Don't rescan main loop events if not initialized This is done because it makes our life easier with unit tests. Also, a rescan on an uninitialized event list will result in a stacktrace. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index c1103edb3..10f26c954 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1553,6 +1553,13 @@ rescan_periodic_events(const or_options_t *options) { tor_assert(options); + /* Avoid scanning the event list if we haven't initialized it yet. This is + * particularly useful for unit tests in order to avoid initializing main + * loop events everytime. */ + if (!periodic_events_initialized) { + return; + } + int roles = get_my_roles(options); for (int i = 0; periodic_events[i].name; ++i) {

1 0