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

[tor/release-0.2.9] Create single-onion-service directory before poisoning it, if needed
by nickm＠torproject.org 08 Nov '16

08 Nov '16

commit 8841a9e396372771a170656ebfab4b4bf6b0c593 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 31 14:53:30 2016 -0400 Create single-onion-service directory before poisoning it, if needed (Also, refactor the code to create a hidden service directory into a separate funcion, so we don't have to duplicate it.) Fixes bug 20484; bugfix on 0.2.9.3-alpha. --- changes/bug20484 | 5 +++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/changes/bug20484 b/changes/bug20484 new file mode 100644 index 0000000..9a0b95c --- /dev/null +++ b/changes/bug20484 @@ -0,0 +1,5 @@ + 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/src/or/rendservice.c b/src/or/rendservice.c index 3afe880..1bf6ae9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,6 +72,8 @@ 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); + /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. */ @@ -1090,6 +1092,10 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) return -1; } + /* Make sure the directory exists */ + if (rend_service_check_and_create_private_dir(service) < 0) + return -1; + poison_fname = rend_service_sos_poison_path(service); switch (file_status(poison_fname)) { @@ -1245,22 +1251,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Load and/or generate private keys for the hidden service s, - * possibly including keys for client authorization. Return 0 on success, -1 - * on failure. */ +/** Make sure that the directory for s is private, creating it + * if needed. Return 0 on success, -1 on failure. */ static int -rend_service_load_keys(rend_service_t *s) +rend_service_check_and_create_private_dir(const rend_service_t *s) { - char *fname = NULL; - char buf[128]; cpd_check_t check_opts = CPD_CREATE; - if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } /* Check/create directory */ if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { - goto err; + return -1; } #ifndef _WIN32 if (s->dir_group_readable) { @@ -1271,6 +1273,21 @@ rend_service_load_keys(rend_service_t *s) } #endif + return 0; +} + +/** Load and/or generate private keys for the hidden service s, + * possibly including keys for client authorization. Return 0 on success, -1 + * on failure. */ +static int +rend_service_load_keys(rend_service_t *s) +{ + char *fname = NULL; + char buf[128]; + + if (rend_service_check_and_create_private_dir(s) < 0) + goto err; + /* Load key */ fname = rend_service_path(s, private_key_fname); s->private_key = init_key_from_file(fname, 1, LOG_ERR, 0);

1 0

[tor/release-0.2.9] fixup! Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 08 Nov '16

08 Nov '16

commit a906ff88a3660ff689a2bd630836b74d70a1ce6c Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:10:52 2016 +1100 fixup! Refactor, adding a create argument to rend_service_check_private_dir --- src/or/rendservice.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dca775e..6743d82 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1246,17 +1246,23 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** 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. +/** Make sure that the directory for s is private. + * If create is true: + * - if the directory exists, change permissions if needed, + * - if the directory does not exist, create it with the correct permissions. + * If create is false: + * - if the directory exists, check permissions, + * - 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) { - cpd_check_t check_opts = CPD_CREATE; - if (!create) { + cpd_check_t check_opts = CPD_NONE; + if (create) { + check_opts |= CPD_CREATE; + } else { check_opts |= CPD_CHECK_MODE_ONLY; + check_opts |= CPD_CHECK; } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ;

1 0

[tor/maint-0.2.9] Check every hidden service directory's permissions when configuring
by nickm＠torproject.org 08 Nov '16

08 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/maint-0.2.9] Remove redundant group permission code from rend_service_check_private_dir
by nickm＠torproject.org 08 Nov '16

08 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/maint-0.2.9] Make sure passthrough_test_setup doesn't inadvertently fail or skip tests
by nickm＠torproject.org 08 Nov '16

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

08 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/maint-0.2.9] Improve comments in check_private_dir and onion poisoning
by nickm＠torproject.org 08 Nov '16

08 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

[tor/release-0.2.9] Make sure passthrough_test_setup doesn't inadvertently fail or skip tests
by nickm＠torproject.org 08 Nov '16

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

08 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/release-0.2.9] Create get_fname_suffix, and refactor get_fname to use it
by nickm＠torproject.org 08 Nov '16

08 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