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

[tor/master] 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

[tor/master] Create get_fname_suffix, and refactor get_fname to use it
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit d7634dc5196801c5a3e6be9eb2167c2c96f48ab4 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:13:34 2016 +1100 Create get_fname_suffix, and refactor get_fname to use it --- src/test/testing_common.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index fd7c4e7..e28e3dd 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -102,18 +102,29 @@ setup_directory(void) temp_dir_setup_in_pid = getpid(); } -/** Return a filename relative to our testing temporary directory */ -const char * -get_fname(const char *name) +/** Return a filename relative to our testing temporary directory, based on + * name and suffix. If name is NULL, return the name of the testing temporary + * directory. */ +static const char * +get_fname_suffix(const char *name, const char *suffix) { static char buf[1024]; setup_directory(); if (!name) return temp_dir; - tor_snprintf(buf,sizeof(buf),"%s/%s",temp_dir,name); + tor_snprintf(buf,sizeof(buf),"%s/%s%s%s",temp_dir,name,suffix ? "_" : "", + suffix ? suffix : ""); return buf; } +/** Return a filename relative to our testing temporary directory. If name is + * NULL, return the name of the testing temporary directory. */ +const char * +get_fname(const char *name) +{ + return get_fname_suffix(name, NULL); +} + /* Remove a directory and all of its subdirectories */ static void rm_rf(const char *dir)

1 0

[tor/master] Remove redundant group permission code from rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 6c541815592b76ecb7dc639123bce894bf47b67f Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:20:49 2016 +1100 Remove redundant group permission code from rend_service_check_private_dir check_private_dir already does this for existing directories. --- src/or/rendservice.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 610ed75..dca775e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1265,15 +1265,6 @@ rend_service_check_private_dir(const rend_service_t *s, int create) if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { return -1; } -#ifndef _WIN32 - if (s->dir_group_readable && create) { - /* Only new dirs created get new opts, also enforce group read. */ - if (chmod(s->directory, 0750)) { - log_warn(LD_FS,"Unable to make %s group-readable.", s->directory); - } - } -#endif - return 0; }

1 0

[tor/master] Use check_private_dir in test_single_onion_poisoning
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit fedafe7c0eb9eda0d11dd1b5ba37b7faff625c88 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:37:05 2016 +1100 Use check_private_dir in test_single_onion_poisoning This avoids Win32 conditionals for mkdir. --- src/test/test_hs.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index fd5ab15..39a2c91 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -550,20 +550,11 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); /* Create directories for both services */ - -#ifdef _WIN32 - ret = mkdir(mock_options->DataDirectory); - tt_assert(ret == 0); - ret = mkdir(dir1); - tt_assert(ret == 0); - ret = mkdir(dir2); -#else - ret = mkdir(mock_options->DataDirectory, 0700); + ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir1, 0700); + ret = check_private_dir(dir1, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir2, 0700); -#endif + ret = check_private_dir(dir2, CPD_CREATE, NULL); tt_assert(ret == 0); service_1->directory = dir1; @@ -694,7 +685,7 @@ test_single_onion_poisoning(void *arg) tt_assert(ret < 0); done: - /* TODO: should we delete the directories here? */ + /* The test harness deletes the directories at exit */ rend_service_free(service_1); rend_service_free(service_2); smartlist_free(services);

1 0

[tor/master] 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/master] Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit c2fc0941a53884c63c477f68c74a26627bb35db8 Merge: e482541 a77187a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 16:12:13 2016 -0500 Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9 changes/bug20484 | 5 ++++ changes/bug20529 | 4 +++ doc/tor.1.txt | 4 +++ src/common/util.c | 12 ++++---- src/or/rendservice.c | 75 ++++++++++++++++++++++++++++++++--------------- src/test/test.h | 1 + src/test/test_hs.c | 55 +++++++++++++++++++--------------- src/test/testing_common.c | 34 ++++++++++++++++++--- 8 files changed, 135 insertions(+), 55 deletions(-)

1 0

[tor/master] Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit c9db775243dc83c3300e7a88e0ad6afc74671825 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:16:00 2016 +1100 Refactor, adding a create argument to rend_service_check_private_dir It used to be rend_service_check_and_create_private_dir, which always created the directory. No behaviour change. --- src/or/rendservice.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1bf6ae9..610ed75 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,7 +72,7 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); -static int rend_service_check_and_create_private_dir(const rend_service_t *s); +static int rend_service_check_private_dir(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. @@ -674,12 +674,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - cpd_check_t check_opts = CPD_CHECK_MODE_ONLY|CPD_CHECK; - if (service->dir_group_readable) { - check_opts |= CPD_GROUP_READ; - } - - if (check_private_dir(service->directory, check_opts, options->User) < 0) { + if (rend_service_check_private_dir(service, 0) < 0) { rend_service_free(service); return -1; } @@ -1093,7 +1088,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) } /* Make sure the directory exists */ - if (rend_service_check_and_create_private_dir(service) < 0) + if (rend_service_check_private_dir(service, 1) < 0) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1251,12 +1246,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private, creating it - * if needed. Return 0 on success, -1 on failure. */ +/** Make sure that the directory for s is private. If create is + * true, if it exists, change permissions if needed, otherwise, create it with + * the correct permissions. Otherwise, if create is false and 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_and_create_private_dir(const rend_service_t *s) +rend_service_check_private_dir(const rend_service_t *s, int create) { cpd_check_t check_opts = CPD_CREATE; + if (!create) { + check_opts |= CPD_CHECK_MODE_ONLY; + } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } @@ -1265,7 +1266,7 @@ rend_service_check_and_create_private_dir(const rend_service_t *s) return -1; } #ifndef _WIN32 - if (s->dir_group_readable) { + if (s->dir_group_readable && create) { /* Only new dirs created get new opts, also enforce group read. */ if (chmod(s->directory, 0750)) { log_warn(LD_FS,"Unable to make %s group-readable.", s->directory); @@ -1285,7 +1286,7 @@ rend_service_load_keys(rend_service_t *s) char *fname = NULL; char buf[128]; - if (rend_service_check_and_create_private_dir(s) < 0) + if (rend_service_check_private_dir(s, 1) < 0) goto err; /* Load key */

1 0

[tor/master] Make sure passthrough_test_setup doesn't inadvertently fail or skip tests
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 13fbbe9cced6df027d2354f3c94f5312dfe60bf2 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:16:14 2016 +1100 Make sure passthrough_test_setup doesn't inadvertently fail or skip tests passthrough_test_setup doesn't pass through arguments if the argument is equal to 0 or TT_SKIP. Instead, it fails or skips the test. Assert on this, so we don't accidentally fail or skip tests. --- src/test/testing_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 1eae07e..9c6580f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -240,6 +240,9 @@ free_pregenerated_keys(void) static void * passthrough_test_setup(const struct testcase_t *testcase) { + /* Make sure the passthrough doesn't unintentionally fail or skip tests */ + tor_assert(testcase->setup_data); + tor_assert(testcase->setup_data != (void*)TT_SKIP); return testcase->setup_data; } static int

1 0

[tor/master] Check every hidden service directory's permissions when configuring
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 1747f28861e1f5ce8fc5c8cb3eaad0c7f2297dc9 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:32:04 2016 +1100 Check every hidden service directory's permissions when configuring Previously, we would only check the last hidden service directory. Fixes #20529, bugfix on ticket 13942 commit 85bfad1 in 0.2.6.2-alpha. --- changes/bug20529 | 4 ++++ src/or/rendservice.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/changes/bug20529 b/changes/bug20529 new file mode 100644 index 0000000..276be5b --- /dev/null +++ b/changes/bug20529 @@ -0,0 +1,4 @@ + 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/src/or/rendservice.c b/src/or/rendservice.c index 7dbcf71..c62673a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -464,6 +464,11 @@ 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) { + rend_service_free(service); + return -1; + } + if (validate_only) rend_service_free(service); else

1 0

[tor/master] Improve comments in check_private_dir and onion poisoning
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 2f48693663c3703e1015fd438fc585cd2857ba71 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:11:26 2016 +1100 Improve comments in check_private_dir and onion poisoning Comment changes only --- src/common/util.c | 12 +++++++----- src/or/rendservice.c | 8 ++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 9162967..a7bce2e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2191,11 +2191,13 @@ file_status(const char *fname) } } -/** Check whether dirname exists and is private. If yes return 0. If - * it does not exist, and check&CPD_CREATE is set, try to create it - * and return 0 on success. If it does not exist, and - * check&CPD_CHECK, and we think we can create it, return 0. Else - * return -1. If CPD_GROUP_OK is set, then it's okay if the directory +/** Check whether dirname exists and is private. If yes return 0. + * If dirname does not exist: + * - if check&CPD_CREATE, try to create it and return 0 on success. + * - if check&CPD_CHECK, and we think we can create it, return 0. + * - if check&CPD_CHECK is false, and the directory exists, return 0. + * - otherwise, return -1. + * If CPD_GROUP_OK is set, then it's okay if the directory * is group-readable, but in all cases we create the directory mode 0700. * If CPD_GROUP_READ is set, existing directory behaves as CPD_GROUP_OK and * if the directory is created it will use mode 0750 with group read diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6743d82..7dbcf71 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -998,7 +998,9 @@ service_is_single_onion_poisoned(const rend_service_t *service) fstatus = file_status(poison_fname); tor_free(poison_fname); - /* If this fname is occupied, the hidden service has been poisoned. */ + /* If this fname is occupied, the hidden service has been poisoned. + * fstatus can be FN_ERROR if the service directory does not exist, in that + * case, there is obviously no private key. */ if (fstatus == FN_FILE || fstatus == FN_EMPTY) { return 1; } @@ -1014,7 +1016,9 @@ rend_service_private_key_exists(const rend_service_t *service) char *private_key_path = rend_service_path(service, private_key_fname); const file_status_t private_key_status = file_status(private_key_path); tor_free(private_key_path); - /* Only non-empty regular private key files could have been used before. */ + /* Only non-empty regular private key files could have been used before. + * fstatus can be FN_ERROR if the service directory does not exist, in that + * case, there is obviously no private key. */ return private_key_status == FN_FILE; }

1 0