November 2016 - tor-commits - lists.torproject.org

[tor/master] Test single onion service configs where the directory does not exist
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 01fe039b78e6115615ff2e3c3341bcb03100a7f0 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:17:52 2016 +1100 Test single onion service configs where the directory does not exist Runs a test for each combination of create/don't create directories. Tests #20484. --- src/test/test_hs.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 39a2c91..b42bc59 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -518,6 +518,11 @@ mock_get_options(void) return mock_options; } +/* arg can't be 0 (the test fails) or 2 (the test is skipped) */ +#define CREATE_HS_DIR_NONE ((intptr_t)0x04) +#define CREATE_HS_DIR1 ((intptr_t)0x08) +#define CREATE_HS_DIR2 ((intptr_t)0x10) + /* Test that single onion poisoning works. */ static void test_single_onion_poisoning(void *arg) @@ -528,15 +533,15 @@ test_single_onion_poisoning(void *arg) MOCK(get_options, mock_get_options); int ret = -1; - mock_options->DataDirectory = tor_strdup(get_fname("test_data_dir")); + intptr_t create_dir_mask = (intptr_t)arg; + /* Get directories with a random suffix so we can repeat the tests */ + mock_options->DataDirectory = tor_strdup(get_fname_rnd("test_data_dir")); rend_service_t *service_1 = tor_malloc_zero(sizeof(rend_service_t)); - char *dir1 = tor_strdup(get_fname("test_hs_dir1")); + char *dir1 = tor_strdup(get_fname_rnd("test_hs_dir1")); rend_service_t *service_2 = tor_malloc_zero(sizeof(rend_service_t)); - char *dir2 = tor_strdup(get_fname("test_hs_dir2")); + char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); - (void) arg; - /* No services, no problem! */ mock_options->HiddenServiceSingleHopMode = 0; mock_options->HiddenServiceNonAnonymousMode = 0; @@ -549,13 +554,20 @@ test_single_onion_poisoning(void *arg) ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); - /* Create directories for both services */ + /* Create the data directory, and, if the correct bit in arg is set, + * create a directory for that service. + * The data directory is required for the lockfile, which is used when + * loading keys. */ ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = check_private_dir(dir1, CPD_CREATE, NULL); - tt_assert(ret == 0); - ret = check_private_dir(dir2, CPD_CREATE, NULL); - tt_assert(ret == 0); + if (create_dir_mask & CREATE_HS_DIR1) { + ret = check_private_dir(dir1, CPD_CREATE, NULL); + tt_assert(ret == 0); + } + if (create_dir_mask & CREATE_HS_DIR2) { + ret = check_private_dir(dir2, CPD_CREATE, NULL); + tt_assert(ret == 0); + } service_1->directory = dir1; service_2->directory = dir2; @@ -707,8 +719,14 @@ struct testcase_t hs_tests[] = { NULL, NULL }, { "hs_auth_cookies", test_hs_auth_cookies, TT_FORK, NULL, NULL }, - { "single_onion_poisoning", test_single_onion_poisoning, TT_FORK, - NULL, NULL }, + { "single_onion_poisoning_create_dir_none", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR_NONE) }, + { "single_onion_poisoning_create_dir1", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1) }, + { "single_onion_poisoning_create_dir2", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR2) }, + { "single_onion_poisoning_create_dir_both", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1 | CREATE_HS_DIR2) }, END_OF_TESTCASES };

1 0

[tor/master] Use the latest options in rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 0ee9049e947ec44b3d228e4bb74bcbc28d32ca95 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:55:14 2016 +1100 Use the latest options in rend_service_check_private_dir Fixup on both: * Refactor, adding a create argument... and * Check every hidden service directory's permissions... --- src/or/rendservice.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c62673a..56dbacd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,7 +72,9 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); -static int rend_service_check_private_dir(const rend_service_t *s, int create); +static int rend_service_check_private_dir(const or_options_t *options, + const rend_service_t *s, + int create); /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. @@ -464,7 +466,7 @@ rend_config_services(const or_options_t *options, int validate_only) for (line = options->RendConfigLines; line; line = line->next) { if (!strcasecmp(line->key, "HiddenServiceDir")) { if (service) { /* register the one we just finished parsing */ - if (rend_service_check_private_dir(service, 0) < 0) { + if (rend_service_check_private_dir(options, service, 0) < 0) { rend_service_free(service); return -1; } @@ -679,7 +681,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - if (rend_service_check_private_dir(service, 0) < 0) { + if (rend_service_check_private_dir(options, service, 0) < 0) { rend_service_free(service); return -1; } @@ -1097,7 +1099,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) } /* Make sure the directory exists */ - if (rend_service_check_private_dir(service, 1) < 0) + if (rend_service_check_private_dir(get_options(), service, 1) < 0) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1255,7 +1257,8 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private. +/** Make sure that the directory for s is private, using the config in + * options. * If create is true: * - if the directory exists, change permissions if needed, * - if the directory does not exist, create it with the correct permissions. @@ -1264,7 +1267,9 @@ rend_service_derive_key_digests(struct rend_service_t *s) * - if the directory does not exist, check if we think we can create it. * Return 0 on success, -1 on failure. */ static int -rend_service_check_private_dir(const rend_service_t *s, int create) +rend_service_check_private_dir(const or_options_t *options, + const rend_service_t *s, + int create) { cpd_check_t check_opts = CPD_NONE; if (create) { @@ -1277,7 +1282,7 @@ rend_service_check_private_dir(const rend_service_t *s, int create) check_opts |= CPD_GROUP_READ; } /* Check/create directory */ - if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { + if (check_private_dir(s->directory, check_opts, options->User) < 0) { return -1; } return 0; @@ -1292,7 +1297,7 @@ rend_service_load_keys(rend_service_t *s) char *fname = NULL; char buf[128]; - if (rend_service_check_private_dir(s, 1) < 0) + if (rend_service_check_private_dir(get_options(), s, 1) < 0) goto err; /* Load key */

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 3e3040a5d911e6c4ae59114a0f98daf09ee299bc Merge: 7236e42 9994404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:31:40 2016 -0500 Merge branch 'maint-0.2.9' Conflicts: src/or/rendservice.c changes/20460 | 4 +-- changes/bug20484 | 5 +++ changes/bug20529 | 4 +++ changes/bug20587 | 1 - changes/bug20588 | 2 +- changes/geoip-november2016 | 2 +- doc/tor.1.txt | 4 +++ src/common/util.c | 12 +++++--- src/or/rendservice.c | 76 +++++++++++++++++++++++++++++++--------------- src/test/test.h | 1 + src/test/test_hs.c | 55 +++++++++++++++++++-------------- src/test/testing_common.c | 34 ++++++++++++++++++--- 12 files changed, 139 insertions(+), 61 deletions(-) diff --cc src/test/test.h index 15ccf5c,25336ac..49b4499 --- a/src/test/test.h +++ b/src/test/test.h @@@ -73,9 -73,8 +73,10 @@@ {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION) const char *get_fname(const char *name); + const char *get_fname_rnd(const char *name); struct crypto_pk_t *pk_generate(int idx); +void init_pregenerated_keys(void); +void free_pregenerated_keys(void); #define US2_CONCAT_2__(a, b) a ## __ ## b #define US_CONCAT_2__(a, b) a ## _ ## b

1 0

[tor/maint-0.2.9] Make new changes files pass lintchanges
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 9994404238e6b87907f811cab2a5126d030ff55d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:19:05 2016 -0500 Make new changes files pass lintchanges --- changes/20460 | 4 ++-- changes/bug20587 | 1 - changes/bug20588 | 2 +- changes/geoip-november2016 | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/20460 b/changes/20460 index d51ec3a..9fbb4a7 100644 --- a/changes/20460 +++ b/changes/20460 @@ -1,4 +1,4 @@ - o Minor bugfixes (testing) + o Minor bugfixes (testing): - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has removed the ECDH ciphers which caused the tests to fail on - platforms which use it. Closes ticket 20460. + platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20587 b/changes/bug20587 index a059334..341b001 100644 --- a/changes/bug20587 +++ b/changes/bug20587 @@ -1,4 +1,3 @@ - o Minor bugfixes (download timing): - When determining when to download a directory object, handle times after 2038 if the operating system supports that. (Someday this will be diff --git a/changes/bug20588 b/changes/bug20588 index be199b2..832ef81 100644 --- a/changes/bug20588 +++ b/changes/bug20588 @@ -1,3 +1,3 @@ - o Minor bugfixes (portability): + o Minor features (portability): - Fix compilation with OpenSSL 1.1 and less commonly-used CPU architectures. Closes ticket 20588. diff --git a/changes/geoip-november2016 b/changes/geoip-november2016 index 5190ed6..b3f9913 100644 --- a/changes/geoip-november2016 +++ b/changes/geoip-november2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (ge0oip): - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 Country database.

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 40718f2499d85f10f6a708ee0267b2fbd15998b6 Merge: 5639f3a 9994404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:19:13 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/20460 | 4 ++-- changes/bug20587 | 1 - changes/bug20588 | 2 +- changes/geoip-november2016 | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.9] Make new changes files pass lintchanges
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 9994404238e6b87907f811cab2a5126d030ff55d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:19:05 2016 -0500 Make new changes files pass lintchanges --- changes/20460 | 4 ++-- changes/bug20587 | 1 - changes/bug20588 | 2 +- changes/geoip-november2016 | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/20460 b/changes/20460 index d51ec3a..9fbb4a7 100644 --- a/changes/20460 +++ b/changes/20460 @@ -1,4 +1,4 @@ - o Minor bugfixes (testing) + o Minor bugfixes (testing): - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has removed the ECDH ciphers which caused the tests to fail on - platforms which use it. Closes ticket 20460. + platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20587 b/changes/bug20587 index a059334..341b001 100644 --- a/changes/bug20587 +++ b/changes/bug20587 @@ -1,4 +1,3 @@ - o Minor bugfixes (download timing): - When determining when to download a directory object, handle times after 2038 if the operating system supports that. (Someday this will be diff --git a/changes/bug20588 b/changes/bug20588 index be199b2..832ef81 100644 --- a/changes/bug20588 +++ b/changes/bug20588 @@ -1,3 +1,3 @@ - o Minor bugfixes (portability): + o Minor features (portability): - Fix compilation with OpenSSL 1.1 and less commonly-used CPU architectures. Closes ticket 20588. diff --git a/changes/geoip-november2016 b/changes/geoip-november2016 index 5190ed6..b3f9913 100644 --- a/changes/geoip-november2016 +++ b/changes/geoip-november2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (ge0oip): - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 Country database.

1 0

[tor/release-0.2.9] Fold new entries into changelog and edit lightly
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 0e383aff58c3385f2c9df34c294c3196d8da9f1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:26:09 2016 -0500 Fold new entries into changelog and edit lightly --- ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++++++++- changes/20460 | 4 ---- changes/bug20484 | 5 ----- changes/bug20529 | 4 ---- changes/bug20533 | 7 ------ changes/bug20534 | 8 ------- changes/bug20536 | 6 ------ changes/bug20587 | 5 ----- changes/bug20588 | 3 --- changes/bug20591 | 3 --- changes/bug20593 | 6 ------ changes/geoip-november2016 | 4 ---- 12 files changed, 53 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f3e248..83cc6ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,38 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 potentially wait a very long time. Fixes part of bug 19969; bugfix on 0.2.8.1-alpha. + o Major bugfixes (download scheduling): + - When using an exponential backoff schedule, do not give up on + downloading just because we have failed a bunch of times. Since + each delay is longer than the last, retrying indefinitely won't + hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha. + - If a consensus expires while we are waiting for certificates to + download, stop waiting for certificates. + - If we stop waiting for certificates less than a minute after we + started downloading them, do not consider the certificate download + failure a separate failure. Fixes bug 20533; bugfix + on 0.2.0.9-alpha. + - Remove the maximum delay on exponential-backoff scheduling. Since + we now allow an infinite number of failures (see ticket 20536), we + must now allow the time to grow longer on each failure. Fixes part + of bug 20534; bugfix on 0.2.9.1-alpha. + - Make our initial download delays closer to those from 0.2.8. Fixes + another part of bug 20534; bugfix on 0.2.9.1-alpha. + - When determining when to download a directory object, handle times + after 2038 if the operating system supports them. (Someday this + will be important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha. + + o Minor features (geoip): + - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (client directory scheduling): + - Treat "relay too busy to answer request" as a failed request and a + reason to back off on our retry frequency. This is safe now that + exponential backups retry indefinitely, and avoids a bug where we + would reset our download schedule erroneously. Fixes bug 20593; + bugfix on 0.2.9.1-alpha. + o Minor bugfixes (client, logging): - Remove a BUG warning in circuit_pick_extend_handshake(). Instead, assume all nodes support EXTEND2. Use ntor whenever a key is @@ -22,10 +54,25 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 - On DNSPort, stop logging a BUG warning on a failed hostname lookup. Fixes bug 19869; bugfix on 0.2.9.1-alpha. - o Minor bugfixes (compilation): + o Minor bugfixes (hidden services): + - When configuring hidden services, check every hidden service + directory's permissions. Previously, we only checked the last + hidden service. Fixes bug 20529; bugfix on 13942 commit 85bfad1 + in 0.2.6.2-alpha. + + o Minor bugfixes (portability): + - Fix compilation with OpenSSL 1.1 and less commonly-used CPU + architectures. Closes ticket 20588. + - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has + removed the ECDH ciphers which caused the tests to fail on + platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. - Fix implicit conversion warnings under OpenSSL 1.1. Fixes bug 20551; bugfix on 0.2.1.1-alpha. + o Minor bugfixes (relay bootstrap): + - Ensure relays don't make multiple connections during bootstrap. + Fixes bug 20591; bugfix on 0.2.8.1-alpha. + o Minor bugfixes (relay): - Work around a memory leak in OpenSSL 1.1 when encoding public keys. Fixes bug 20553; bugfix on 0.0.2pre8. @@ -35,6 +82,11 @@ Changes in version 0.2.9.5-alpha - 2016-11-07 explicitly configuring us to do so, even if we do detect more than 16 CPU cores. Fixes bug 19968; bugfix on 0.2.3.1-alpha. + o Minor bugfixes (single onion services): + - Start correctly when creating a single onion service in a + directory that did not previously exist. Fixes bug 20484; bugfix + on 0.2.9.3-alpha. + o Minor bugfixes (testing): - Avoid a unit test failure on systems with over 16 detectable CPU cores. Fixes bug 19968; bugfix on 0.2.3.1-alpha. diff --git a/changes/20460 b/changes/20460 deleted file mode 100644 index 9fbb4a7..0000000 --- a/changes/20460 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has - removed the ECDH ciphers which caused the tests to fail on - platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20484 b/changes/bug20484 deleted file mode 100644 index 9a0b95c..0000000 --- a/changes/bug20484 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (single onion services): - - Start correctly when creating a single onion service in a - directory that did not previously exist. Fixes bug 20484; bugfix on - 0.2.9.3-alpha. - diff --git a/changes/bug20529 b/changes/bug20529 deleted file mode 100644 index 276be5b..0000000 --- a/changes/bug20529 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden services): - - When configuring hidden services, check every hidden service directory's - permissions. Previously, we only checked the last hidden service. - Fixes bug 20529; bugfix on 13942 commit 85bfad1 in 0.2.6.2-alpha. diff --git a/changes/bug20533 b/changes/bug20533 deleted file mode 100644 index 7d1a456..0000000 --- a/changes/bug20533 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (consensus downloads): - - If a consensus expires while we are waiting for certificates to download, - stop waiting for certificates. - - If we stop waiting for certificates less than a minute after we started - downloading them, do not consider the certificate download failure a - separate failure. - Fixes bug 20533; bugfix on commit e0204f21 in 0.2.0.9-alpha. diff --git a/changes/bug20534 b/changes/bug20534 deleted file mode 100644 index 49db433..0000000 --- a/changes/bug20534 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (directory download scheduling): - - Remove the maximum delay on exponential-backoff scheduling. - Since we now allow an infinite number of failures (see ticket - 20536), we must now allow the time to grow longer on each failure. - Fixes part of bug 20534; bugfix on 0.2.9.1-alpha. - - Use initial delays and decrements in download scheduling closer to - those from 0.2.8. Fixes another part of bug 20534; bugfix on - 0.2.9.1-alpha. diff --git a/changes/bug20536 b/changes/bug20536 deleted file mode 100644 index 9e0dd16..0000000 --- a/changes/bug20536 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (download scheduling): - - When using an exponential backoff schedule, do not give up on - dowloading just because we have failed a bunch of times. Since - each delay is longer than the last, retrying indefinitely won't - hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha. - diff --git a/changes/bug20587 b/changes/bug20587 deleted file mode 100644 index 341b001..0000000 --- a/changes/bug20587 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (download timing): - - When determining when to download a directory object, handle times - after 2038 if the operating system supports that. (Someday this will be - important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha. - diff --git a/changes/bug20588 b/changes/bug20588 deleted file mode 100644 index 832ef81..0000000 --- a/changes/bug20588 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (portability): - - Fix compilation with OpenSSL 1.1 and less commonly-used - CPU architectures. Closes ticket 20588. diff --git a/changes/bug20591 b/changes/bug20591 deleted file mode 100644 index deaa738..0000000 --- a/changes/bug20591 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (relay bootstrap): - - Ensure relays don't make multiple connections during bootstrap. - Fixes bug 20591; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug20593 b/changes/bug20593 deleted file mode 100644 index e9f54d3..0000000 --- a/changes/bug20593 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (client directory scheduling): - - Treat "relay too busy to answer request" as a failed request and a - reason to back off on our retry frequency. This is safe now that - exponential backups retry indefinitely, and avoids a bug where we would - reset our download schedule erroneously. - Fixes bug 20593; bugfix on 0.2.9.1-alpha. diff --git a/changes/geoip-november2016 b/changes/geoip-november2016 deleted file mode 100644 index b3f9913..0000000 --- a/changes/geoip-november2016 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (ge0oip): - - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2 - Country database. -

1 0

[tor/maint-0.2.9] Add get_fname_rnd for unit tests that want a unique path every time
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 77e1d660ee5b8e2beae12f3de543d19009aaa8ac Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:14:19 2016 +1100 Add get_fname_rnd for unit tests that want a unique path every time --- src/test/test.h | 1 + src/test/testing_common.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/test/test.h b/src/test/test.h index 770f403..25336ac 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -73,6 +73,7 @@ {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION) const char *get_fname(const char *name); +const char *get_fname_rnd(const char *name); struct crypto_pk_t *pk_generate(int idx); #define US2_CONCAT_2__(a, b) a ## __ ## b diff --git a/src/test/testing_common.c b/src/test/testing_common.c index e28e3dd..1eae07e 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -125,6 +125,18 @@ get_fname(const char *name) return get_fname_suffix(name, NULL); } +/** Return a filename with a random suffix, relative to our testing temporary + * directory. If name is NULL, return the name of the testing temporary + * directory, without any suffix. */ +const char * +get_fname_rnd(const char *name) +{ + char rnd[256], rnd32[256]; + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + return get_fname_suffix(name, rnd32); +} + /* Remove a directory and all of its subdirectories */ static void rm_rf(const char *dir)

1 0

[tor/maint-0.2.9] Test single onion service configs where the directory does not exist
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 01fe039b78e6115615ff2e3c3341bcb03100a7f0 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:17:52 2016 +1100 Test single onion service configs where the directory does not exist Runs a test for each combination of create/don't create directories. Tests #20484. --- src/test/test_hs.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 39a2c91..b42bc59 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -518,6 +518,11 @@ mock_get_options(void) return mock_options; } +/* arg can't be 0 (the test fails) or 2 (the test is skipped) */ +#define CREATE_HS_DIR_NONE ((intptr_t)0x04) +#define CREATE_HS_DIR1 ((intptr_t)0x08) +#define CREATE_HS_DIR2 ((intptr_t)0x10) + /* Test that single onion poisoning works. */ static void test_single_onion_poisoning(void *arg) @@ -528,15 +533,15 @@ test_single_onion_poisoning(void *arg) MOCK(get_options, mock_get_options); int ret = -1; - mock_options->DataDirectory = tor_strdup(get_fname("test_data_dir")); + intptr_t create_dir_mask = (intptr_t)arg; + /* Get directories with a random suffix so we can repeat the tests */ + mock_options->DataDirectory = tor_strdup(get_fname_rnd("test_data_dir")); rend_service_t *service_1 = tor_malloc_zero(sizeof(rend_service_t)); - char *dir1 = tor_strdup(get_fname("test_hs_dir1")); + char *dir1 = tor_strdup(get_fname_rnd("test_hs_dir1")); rend_service_t *service_2 = tor_malloc_zero(sizeof(rend_service_t)); - char *dir2 = tor_strdup(get_fname("test_hs_dir2")); + char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); - (void) arg; - /* No services, no problem! */ mock_options->HiddenServiceSingleHopMode = 0; mock_options->HiddenServiceNonAnonymousMode = 0; @@ -549,13 +554,20 @@ test_single_onion_poisoning(void *arg) ret = rend_service_list_verify_single_onion_poison(services, mock_options); tt_assert(ret == 0); - /* Create directories for both services */ + /* Create the data directory, and, if the correct bit in arg is set, + * create a directory for that service. + * The data directory is required for the lockfile, which is used when + * loading keys. */ ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = check_private_dir(dir1, CPD_CREATE, NULL); - tt_assert(ret == 0); - ret = check_private_dir(dir2, CPD_CREATE, NULL); - tt_assert(ret == 0); + if (create_dir_mask & CREATE_HS_DIR1) { + ret = check_private_dir(dir1, CPD_CREATE, NULL); + tt_assert(ret == 0); + } + if (create_dir_mask & CREATE_HS_DIR2) { + ret = check_private_dir(dir2, CPD_CREATE, NULL); + tt_assert(ret == 0); + } service_1->directory = dir1; service_2->directory = dir2; @@ -707,8 +719,14 @@ struct testcase_t hs_tests[] = { NULL, NULL }, { "hs_auth_cookies", test_hs_auth_cookies, TT_FORK, NULL, NULL }, - { "single_onion_poisoning", test_single_onion_poisoning, TT_FORK, - NULL, NULL }, + { "single_onion_poisoning_create_dir_none", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR_NONE) }, + { "single_onion_poisoning_create_dir1", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1) }, + { "single_onion_poisoning_create_dir2", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR2) }, + { "single_onion_poisoning_create_dir_both", test_single_onion_poisoning, + TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1 | CREATE_HS_DIR2) }, END_OF_TESTCASES };

1 0

[tor/maint-0.2.9] Add onion_service_non_anonymous file to man page
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit a77187a52c9594c0c168596eec856ee11c447fe0 Author: teor <teor2345(a)gmail.com> Date: Fri Nov 4 18:25:57 2016 +1100 Add onion_service_non_anonymous file to man page --- doc/tor.1.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9d8b631..f4d0616 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2896,6 +2896,10 @@ __HiddenServiceDirectory__**/client_keys**:: Authorization data for a hidden service that is only accessible by authorized clients. +__HiddenServiceDirectory__**/onion_service_non_anonymous**:: + This file is present if a hidden service key was created in + **HiddenServiceNonAnonymousMode**. + SEE ALSO -------- **torsocks**(1), **torify**(1) +

1 0