tor-commits August 2018

tor-commits@lists.torproject.org

17 participants
2581 discussions

[tor/master] Merge branch 'bug26367_035_01'
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit 48632455a5bd679d5f97c5137f24f91e564abad6 Merge: b1d32a922 8f13c3d3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 28 16:02:04 2018 -0400 Merge branch 'bug26367_035_01' changes/bug26367 | 5 +++ configure.ac | 7 --- doc/tor.1.txt | 28 +----------- src/app/config/config.c | 64 ++------------------------- src/app/config/or_options_st.h | 14 ++---- src/core/or/channel.c | 7 --- src/core/or/channelpadding.c | 16 ------- src/core/or/channelpadding.h | 2 - src/core/or/circuitbuild.c | 96 ++-------------------------------------- src/core/or/circuitbuild.h | 8 +--- src/core/or/circuitstats.c | 8 ++-- src/core/or/circuituse.c | 42 +++--------------- src/core/or/connection_edge.c | 12 ----- src/core/or/or.h | 4 -- src/feature/dircache/directory.c | 6 +-- src/feature/rend/rendclient.c | 37 ---------------- src/feature/rend/rendclient.h | 3 -- src/feature/rend/rendcommon.c | 22 +++------ src/feature/rend/rendmid.c | 2 +- src/test/test_channelpadding.c | 73 +----------------------------- src/test/test_hs.c | 75 ------------------------------- src/test/test_options.c | 52 +--------------------- 22 files changed, 41 insertions(+), 542 deletions(-)

1 0

[tor/master] hs: Remove rend_client_allow_non_anonymous_connection
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit f661d856fd83cb978320bf55ba5dfdee55a666b8 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 12 09:21:52 2018 -0400 hs: Remove rend_client_allow_non_anonymous_connection By removing Tor2Web, there is no way a client can be non anonymous so we remove that function and the callsites. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/circuituse.c | 5 ----- src/feature/rend/rendclient.c | 14 -------------- src/feature/rend/rendclient.h | 1 - src/feature/rend/rendcommon.c | 9 ++------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index a10791f3a..0f2b1ede3 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -888,11 +888,6 @@ circuit_log_ancient_one_hop_circuits(int age) (circ->purpose == CIRCUIT_PURPOSE_S_INTRO || circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED)) continue; - /* We only ignore active rend point connections, if we take a long time - * to rendezvous, that's worth logging. */ - if (rend_client_allow_non_anonymous_connection(options) && - circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) - continue; ocirc = CONST_TO_ORIGIN_CIRCUIT(circ); if (ocirc->build_state && ocirc->build_state->onehop_tunnel) { diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 0b7d602d9..485ffa8be 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -1219,20 +1219,6 @@ rend_parse_service_authorization(const or_options_t *options, return res; } -/* Can Tor client code make direct (non-anonymous) connections to introduction - * or rendezvous points? - * Returns true if tor was compiled with NON_ANONYMOUS_MODE_ENABLED. */ -int -rend_client_allow_non_anonymous_connection(const or_options_t *options) -{ -#ifdef NON_ANONYMOUS_MODE_ENABLED - return 1; -#else - (void)options; - return 0; -#endif /* defined(NON_ANONYMOUS_MODE_ENABLED) */ -} - /* At compile-time, was non-anonymous mode enabled via * NON_ANONYMOUS_MODE_ENABLED ? */ int diff --git a/src/feature/rend/rendclient.h b/src/feature/rend/rendclient.h index e41faa493..2e7d7aeca 100644 --- a/src/feature/rend/rendclient.h +++ b/src/feature/rend/rendclient.h @@ -47,7 +47,6 @@ rend_service_authorization_t *rend_client_lookup_service_authorization( const char *onion_address); void rend_service_authorization_free_all(void); -int rend_client_allow_non_anonymous_connection(const or_options_t *options); int rend_client_non_anonymous_mode_enabled(const or_options_t *options); #endif /* !defined(TOR_RENDCLIENT_H) */ diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 567cc5c1e..6e19d56b3 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -979,16 +979,11 @@ rend_auth_decode_cookie(const char *cookie_in, uint8_t *cookie_out, /* Is this a rend client or server that allows direct (non-anonymous) * connections? - * Clients must be specifically compiled and configured in this mode. - * Onion services can be configured to start in this mode. - * Prefer rend_client_allow_non_anonymous_connection() or - * rend_service_allow_non_anonymous_connection() whenever possible, so that - * checks are specific to Single Onion Services. */ + * Onion services can be configured to start in this mode for single onion. */ int rend_allow_non_anonymous_connection(const or_options_t* options) { - return (rend_client_allow_non_anonymous_connection(options) - || rend_service_allow_non_anonymous_connection(options)); + return rend_service_allow_non_anonymous_connection(options); } /* Is this a rend client or server in non-anonymous mode?

1 0

[tor/master] hs: Remove rend_client_non_anonymous_mode_enabled
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit 8f13c3d3ed842d8db13bcf9ca6393dbe8e5781e3 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 12 09:23:57 2018 -0400 hs: Remove rend_client_non_anonymous_mode_enabled The removal of Tor2Web made this function useless. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/rend/rendclient.c | 13 ------------- src/feature/rend/rendclient.h | 2 -- src/feature/rend/rendcommon.c | 9 ++------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 485ffa8be..2c4cec65b 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -1218,16 +1218,3 @@ rend_parse_service_authorization(const or_options_t *options, } return res; } - -/* At compile-time, was non-anonymous mode enabled via - * NON_ANONYMOUS_MODE_ENABLED ? */ -int -rend_client_non_anonymous_mode_enabled(const or_options_t *options) -{ - (void)options; -#ifdef NON_ANONYMOUS_MODE_ENABLED - return 1; -#else - return 0; -#endif /* defined(NON_ANONYMOUS_MODE_ENABLED) */ -} diff --git a/src/feature/rend/rendclient.h b/src/feature/rend/rendclient.h index 2e7d7aeca..0d27d63e6 100644 --- a/src/feature/rend/rendclient.h +++ b/src/feature/rend/rendclient.h @@ -47,7 +47,5 @@ rend_service_authorization_t *rend_client_lookup_service_authorization( const char *onion_address); void rend_service_authorization_free_all(void); -int rend_client_non_anonymous_mode_enabled(const or_options_t *options); - #endif /* !defined(TOR_RENDCLIENT_H) */ diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 6e19d56b3..8cb5fd91e 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -987,16 +987,11 @@ rend_allow_non_anonymous_connection(const or_options_t* options) } /* Is this a rend client or server in non-anonymous mode? - * Clients must be specifically compiled in this mode. - * Onion services can be configured to start in this mode. - * Prefer rend_client_non_anonymous_mode_enabled() or - * rend_service_non_anonymous_mode_enabled() whenever possible, so that checks - * are specific to Single Onion Services. */ + * Onion services can be configured to start in this mode for single onion. */ int rend_non_anonymous_mode_enabled(const or_options_t *options) { - return (rend_client_non_anonymous_mode_enabled(options) - || rend_service_non_anonymous_mode_enabled(options)); + return rend_service_non_anonymous_mode_enabled(options); } /* Make sure that tor only builds one-hop circuits when they would not

1 0

[tor/master] fixup! hs: Change default version from 2 to 3
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit 4e2dcda092f5c211b371a749e74fa4fcf2e05424 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 28 15:58:28 2018 -0400 fixup! hs: Change default version from 2 to 3 --- changes/ticket27215 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/ticket27215 b/changes/ticket27215 new file mode 100644 index 000000000..dcb67900e --- /dev/null +++ b/changes/ticket27215 @@ -0,0 +1,9 @@ + o Major feature (hidden service): + - For a newly created hidden service, the default version is now 3. Tor + still supports version 2 service but the operator now needs to + specifically set "HiddenServiceVersion 2" in order to create a new + service. + + For existing services, tor now learns the version by reading the key + file so the HiddenServiceVersion is not mandatory in that case. Closes + ticket 27215.

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket27215_035_01'
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit b1d32a92239ae1727e22b592ac1908b616ba869a Merge: 219f6ea51 4e2dcda09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 28 16:00:45 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket27215_035_01' changes/ticket27215 | 9 +++++++++ 1 file changed, 9 insertions(+)

1 0

[tor/master] key: Make ed_key_init_from_file() take an or_options_t
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit cb466ee7d6f7f475783847a7201eaa6a3e1c711b Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 22 11:32:57 2018 -0400 key: Make ed_key_init_from_file() take an or_options_t Part of #27215, we need to call the ed_key_init_from_file function during option_validate() which is before the global_options variable is set. This commit make ed_key_init_from_file() stop using get_options() and instead now has a or_options_t parameter. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_service.c | 4 ++-- src/feature/relay/routerkeys.c | 21 +++++++++++++-------- src/feature/relay/routerkeys.h | 3 ++- src/test/test_routerkeys.c | 36 +++++++++++++++++++----------------- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 8a9429271..a9364a751 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -1037,7 +1037,7 @@ load_service_keys(hs_service_t *service) /* Don't ask for key creation, we want to know if we were able to load it or * we had to generate it. Better logging! */ kp = ed_key_init_from_file(fname, INIT_ED_KEY_SPLIT, LOG_INFO, NULL, 0, 0, - 0, NULL); + 0, NULL, NULL); if (!kp) { log_info(LD_REND, "Unable to load keys from %s. Generating it...", fname); /* We'll now try to generate the keys and for it we want the strongest @@ -1045,7 +1045,7 @@ load_service_keys(hs_service_t *service) uint32_t key_flags = INIT_ED_KEY_CREATE | INIT_ED_KEY_EXTRA_STRONG | INIT_ED_KEY_SPLIT; kp = ed_key_init_from_file(fname, key_flags, LOG_WARN, NULL, 0, 0, 0, - NULL); + NULL, NULL); if (!kp) { log_warn(LD_REND, "Unable to generate keys and save in %s.", fname); goto end; diff --git a/src/feature/relay/routerkeys.c b/src/feature/relay/routerkeys.c index f12eb3d33..294d452e1 100644 --- a/src/feature/relay/routerkeys.c +++ b/src/feature/relay/routerkeys.c @@ -248,6 +248,9 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, * fname, with certificate type cert_type. On failure, return * NULL; on success return the keypair. * + * The options is used to look at the change_key_passphrase value when + * writing to disk a secret key. It is safe to be NULL even in that case. + * * If INIT_ED_KEY_CREATE is set in flags, then create the key (and * certificate if requested) if it doesn't exist, and save it to disk. * @@ -276,9 +279,6 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, * secret key unless no public key is found. Do not return a secret key. (but * create and save one if needed). * - * If INIT_ED_KEY_NO_LOAD_SECRET is set in flags, don't try to load - * a secret key, no matter what. - * * If INIT_ED_KEY_TRY_ENCRYPTED is set, we look for an encrypted secret key * and consider encrypting any new secret key. * @@ -291,6 +291,9 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, * * If INIT_ED_KEY_EXPLICIT_FNAME is set, use the provided file name for the * secret key file, encrypted or not. + * + * If INIT_ED_KEY_OFFLINE_SECRET is set, we won't try to load the master + * secret key and we log a message at severity that we've done so. */ ed25519_keypair_t * ed_key_init_from_file(const char *fname, uint32_t flags, @@ -299,7 +302,8 @@ ed_key_init_from_file(const char *fname, uint32_t flags, time_t now, time_t lifetime, uint8_t cert_type, - struct tor_cert_st **cert_out) + struct tor_cert_st **cert_out, + const or_options_t *options) { char *secret_fname = NULL; char *encrypted_secret_fname = NULL; @@ -503,7 +507,8 @@ ed_key_init_from_file(const char *fname, uint32_t flags, /* Write it to disk if we're supposed to do with a new passphrase, or if * we just created it. */ - if (created_sk || (have_secret && get_options()->change_key_passphrase)) { + if (created_sk || (have_secret && options != NULL && + options->change_key_passphrase)) { if (write_secret_key(&keypair->seckey, encrypt_key, secret_fname, tag, encrypted_secret_fname) < 0 @@ -734,7 +739,7 @@ load_ed_keys(const or_options_t *options, time_t now) INIT_ED_KEY_NEEDCERT| INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT, LOG_INFO, - NULL, 0, 0, CERT_TYPE_ID_SIGNING, &sign_cert); + NULL, 0, 0, CERT_TYPE_ID_SIGNING, &sign_cert, options); tor_free(fname); check_signing_cert = sign_cert; use_signing = sign; @@ -836,7 +841,7 @@ load_ed_keys(const or_options_t *options, time_t now) id = ed_key_init_from_file( fname, flags, - LOG_WARN, NULL, 0, 0, 0, NULL); + LOG_WARN, NULL, 0, 0, 0, NULL, options); tor_free(fname); if (!id) { if (need_new_signing_key) { @@ -904,7 +909,7 @@ load_ed_keys(const or_options_t *options, time_t now) flags, LOG_WARN, sign_signing_key_with_id, now, options->SigningKeyLifetime, - CERT_TYPE_ID_SIGNING, &sign_cert); + CERT_TYPE_ID_SIGNING, &sign_cert, options); tor_free(fname); if (!sign) FAIL("Missing signing key"); diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h index a6f06f6e2..f52ed0f30 100644 --- a/src/feature/relay/routerkeys.h +++ b/src/feature/relay/routerkeys.h @@ -27,7 +27,8 @@ ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags, time_t now, time_t lifetime, uint8_t cert_type, - struct tor_cert_st **cert_out); + struct tor_cert_st **cert_out, + const or_options_t *options); ed25519_keypair_t *ed_key_new(const ed25519_keypair_t *signing_key, uint32_t flags, time_t now, diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 1a1bf63ba..1a9664aa0 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -262,13 +262,14 @@ test_routerkeys_ed_key_init_basic(void *arg) unlink(fname2); /* Fail to load a key that isn't there. */ - kp1 = ed_key_init_from_file(fname1, 0, LOG_INFO, NULL, now, 0, 7, &cert); + kp1 = ed_key_init_from_file(fname1, 0, LOG_INFO, NULL, now, 0, 7, &cert, + NULL); tt_assert(kp1 == NULL); tt_assert(cert == NULL); /* Create the key if requested to do so. */ kp1 = ed_key_init_from_file(fname1, INIT_ED_KEY_CREATE, LOG_INFO, - NULL, now, 0, 7, &cert); + NULL, now, 0, 7, &cert, NULL); tt_assert(kp1 != NULL); tt_assert(cert == NULL); tt_int_op(stat(get_fname("test_ed_key_1_cert"), &st), OP_LT, 0); @@ -276,24 +277,24 @@ test_routerkeys_ed_key_init_basic(void *arg) /* Fail to load if we say we need a cert */ kp2 = ed_key_init_from_file(fname1, INIT_ED_KEY_NEEDCERT, LOG_INFO, - NULL, now, 0, 7, &cert); + NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 == NULL); /* Fail to load if we say the wrong key type */ kp2 = ed_key_init_from_file(fname1, 0, LOG_INFO, - NULL, now, 0, 6, &cert); + NULL, now, 0, 6, &cert, NULL); tt_assert(kp2 == NULL); /* Load successfully if we're not picky, whether we say "create" or not. */ kp2 = ed_key_init_from_file(fname1, INIT_ED_KEY_CREATE, LOG_INFO, - NULL, now, 0, 7, &cert); + NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert == NULL); tt_mem_op(kp1, OP_EQ, kp2, sizeof(*kp1)); ed25519_keypair_free(kp2); kp2 = NULL; kp2 = ed_key_init_from_file(fname1, 0, LOG_INFO, - NULL, now, 0, 7, &cert); + NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert == NULL); tt_mem_op(kp1, OP_EQ, kp2, sizeof(*kp1)); @@ -302,7 +303,7 @@ test_routerkeys_ed_key_init_basic(void *arg) /* Now create a key with a cert. */ kp2 = ed_key_init_from_file(fname2, (INIT_ED_KEY_CREATE| INIT_ED_KEY_NEEDCERT), - LOG_INFO, kp1, now, 7200, 7, &cert); + LOG_INFO, kp1, now, 7200, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert != NULL); tt_mem_op(kp1, OP_NE, kp2, sizeof(*kp1)); @@ -315,7 +316,7 @@ test_routerkeys_ed_key_init_basic(void *arg) /* Now verify we can load the cert... */ kp3 = ed_key_init_from_file(fname2, (INIT_ED_KEY_CREATE| INIT_ED_KEY_NEEDCERT), - LOG_INFO, kp1, now, 7200, 7, &cert2); + LOG_INFO, kp1, now, 7200, 7, &cert2, NULL); tt_mem_op(kp2, OP_EQ, kp3, sizeof(*kp2)); tt_mem_op(cert2->encoded, OP_EQ, cert->encoded, cert->encoded_len); ed25519_keypair_free(kp3); kp3 = NULL; @@ -323,7 +324,7 @@ test_routerkeys_ed_key_init_basic(void *arg) /* ... even without create... */ kp3 = ed_key_init_from_file(fname2, INIT_ED_KEY_NEEDCERT, - LOG_INFO, kp1, now, 7200, 7, &cert2); + LOG_INFO, kp1, now, 7200, 7, &cert2, NULL); tt_mem_op(kp2, OP_EQ, kp3, sizeof(*kp2)); tt_mem_op(cert2->encoded, OP_EQ, cert->encoded, cert->encoded_len); ed25519_keypair_free(kp3); kp3 = NULL; @@ -331,13 +332,13 @@ test_routerkeys_ed_key_init_basic(void *arg) /* ... but that we don't crash or anything if we say we don't want it. */ kp3 = ed_key_init_from_file(fname2, INIT_ED_KEY_NEEDCERT, - LOG_INFO, kp1, now, 7200, 7, NULL); + LOG_INFO, kp1, now, 7200, 7, NULL, NULL); tt_mem_op(kp2, OP_EQ, kp3, sizeof(*kp2)); ed25519_keypair_free(kp3); kp3 = NULL; /* Fail if we're told the wrong signing key */ kp3 = ed_key_init_from_file(fname2, INIT_ED_KEY_NEEDCERT, - LOG_INFO, kp2, now, 7200, 7, &cert2); + LOG_INFO, kp2, now, 7200, 7, &cert2, NULL); tt_assert(kp3 == NULL); tt_assert(cert2 == NULL); @@ -368,13 +369,14 @@ test_routerkeys_ed_key_init_split(void *arg) unlink(fname2); /* Can't load key that isn't there. */ - kp1 = ed_key_init_from_file(fname1, flags, LOG_INFO, NULL, now, 0, 7, &cert); + kp1 = ed_key_init_from_file(fname1, flags, LOG_INFO, NULL, now, 0, 7, &cert, + NULL); tt_assert(kp1 == NULL); tt_assert(cert == NULL); /* Create a split key */ kp1 = ed_key_init_from_file(fname1, flags|INIT_ED_KEY_CREATE, - LOG_INFO, NULL, now, 0, 7, &cert); + LOG_INFO, NULL, now, 0, 7, &cert, NULL); tt_assert(kp1 != NULL); tt_assert(cert == NULL); tt_int_op(stat(get_fname("test_ed_key_3_cert"), &st), OP_LT, 0); @@ -383,7 +385,7 @@ test_routerkeys_ed_key_init_split(void *arg) /* Load it. */ kp2 = ed_key_init_from_file(fname1, flags|INIT_ED_KEY_CREATE, - LOG_INFO, NULL, now, 0, 7, &cert); + LOG_INFO, NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert == NULL); tt_mem_op(kp1, OP_EQ, kp2, sizeof(*kp2)); @@ -392,7 +394,7 @@ test_routerkeys_ed_key_init_split(void *arg) /* Okay, try killing the secret key and loading it. */ unlink(get_fname("test_ed_key_3_secret_key")); kp2 = ed_key_init_from_file(fname1, flags, - LOG_INFO, NULL, now, 0, 7, &cert); + LOG_INFO, NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert == NULL); tt_mem_op(&kp1->pubkey, OP_EQ, &kp2->pubkey, sizeof(kp2->pubkey)); @@ -402,7 +404,7 @@ test_routerkeys_ed_key_init_split(void *arg) /* Even when we're told to "create", don't create if there's a public key */ kp2 = ed_key_init_from_file(fname1, flags|INIT_ED_KEY_CREATE, - LOG_INFO, NULL, now, 0, 7, &cert); + LOG_INFO, NULL, now, 0, 7, &cert, NULL); tt_assert(kp2 != NULL); tt_assert(cert == NULL); tt_mem_op(&kp1->pubkey, OP_EQ, &kp2->pubkey, sizeof(kp2->pubkey)); @@ -412,7 +414,7 @@ test_routerkeys_ed_key_init_split(void *arg) /* Make sure we fail on a tag mismatch, though */ kp2 = ed_key_init_from_file(fname1, flags, - LOG_INFO, NULL, now, 0, 99, &cert); + LOG_INFO, NULL, now, 0, 99, &cert, NULL); tt_assert(kp2 == NULL); done:

1 0

[tor/master] hs: Learn service version by trying to load the keys
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit 61ad81c36e46d7b05b66601520c7ff42469f24d7 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 22 11:38:28 2018 -0400 hs: Learn service version by trying to load the keys In order to switch the default HS version from 2 to 3, we need tor to be smart and be able to decide on the version by trying to load the service keys during configuration validation. Part of #27215 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_config.c | 24 +++++++++++++++++++ src/feature/hs/hs_service.c | 53 ++++++++++++++++++++++++++++++++++++++++++ src/feature/hs/hs_service.h | 1 + src/feature/rend/rendservice.c | 23 ++++++++++++++++++ src/feature/rend/rendservice.h | 1 + 5 files changed, 102 insertions(+) diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 2c25a168a..e97257648 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -143,6 +143,24 @@ helper_parse_uint64(const char *opt, const char *value, uint64_t min, return ret; } +/* Return the service version by trying to learn it from the key on disk if + * any. If nothing is found, the current service configured version is + * returned. */ +static int +config_learn_service_version(hs_service_t *service) +{ + int version; + + tor_assert(service); + + version = hs_service_get_version_from_key(service); + if (version < 0) { + version = service->config.version; + } + + return version; +} + /* Return true iff the given options starting at line_ for a hidden service * contains at least one invalid option. Each hidden service option don't * apply to all versions so this function can find out. The line_ MUST start @@ -490,6 +508,12 @@ config_service(const config_line_t *line, const or_options_t *options, 0) < 0) { goto err; } + /* We'll try to learn the service version here by loading the key(s) if + * present. Depending on the key format, we can figure out the service + * version. If we can't find a key, the configuration version will be used + * which has been set previously. */ + service->config.version = config_learn_service_version(service); + /* Different functions are in charge of specific options for a version. We * start just after the service directory line so once we hit another * directory line, the function knows that it has to stop parsing. */ diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index a9364a751..fd981f8e1 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2884,6 +2884,29 @@ service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list) smartlist_add(list, hs_path_from_filename(s_dir, fname)); } +/* Return true iff the given service identity key is present on disk. */ +static int +service_key_on_disk(const char *directory_path) +{ + int ret = 0; + char *fname; + ed25519_keypair_t *kp = NULL; + + tor_assert(directory_path); + + /* Build the v3 key path name and then try to load it. */ + fname = hs_path_from_filename(directory_path, fname_keyfile_prefix); + kp = ed_key_init_from_file(fname, INIT_ED_KEY_SPLIT, + LOG_DEBUG, NULL, 0, 0, 0, NULL, NULL); + if (kp) { + ret = 1; + } + + ed25519_keypair_free(kp); + tor_free(fname); + return ret; +} + /* ========== */ /* Public API */ /* ========== */ @@ -3375,6 +3398,36 @@ hs_service_circuit_has_opened(origin_circuit_t *circ) } } +/* Return the service version by looking at the key in the service directory. + * If the key is not found or unrecognized, -1 is returned. Else, the service + * version is returned. */ +int +hs_service_get_version_from_key(const hs_service_t *service) +{ + int version = -1; /* Unknown version. */ + const char *directory_path; + + tor_assert(service); + + /* We'll try to load the key for version 3. If not found, we'll try version + * 2 and if not found, we'll send back an unknown version (0). */ + directory_path = service->config.directory_path; + + /* Version 3 check. */ + if (service_key_on_disk(directory_path)) { + version = HS_VERSION_THREE; + goto end; + } + /* Version 2 check. */ + if (rend_service_key_on_disk(directory_path)) { + version = HS_VERSION_TWO; + goto end; + } + + end: + return version; +} + /* Load and/or generate keys for all onion services including the client * authorization if any. Return 0 on success, -1 on failure. */ int diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 5c5443a35..6ccd93551 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -262,6 +262,7 @@ void hs_service_free_(hs_service_t *service); unsigned int hs_service_get_num_services(void); void hs_service_stage_services(const smartlist_t *service_list); int hs_service_load_all_keys(void); +int hs_service_get_version_from_key(const hs_service_t *service); void hs_service_lists_fnames_for_sandbox(smartlist_t *file_list, smartlist_t *dir_list); int hs_service_set_conn_addr_port(const origin_circuit_t *circ, diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 1a99bd56e..1af9117aa 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -1341,6 +1341,29 @@ rend_service_poison_new_single_onion_dir(const rend_service_t *s, return 0; } +/* Return true iff the given service identity key is present on disk. This is + * used to try to learn the service version during configuration time. */ +int +rend_service_key_on_disk(const char *directory_path) +{ + int ret = 0; + char *fname; + crypto_pk_t *pk = NULL; + + tor_assert(directory_path); + + /* Load key */ + fname = hs_path_from_filename(directory_path, private_key_fname); + pk = init_key_from_file(fname, 0, LOG_DEBUG, 0); + if (pk) { + ret = 1; + } + + crypto_pk_free(pk); + tor_free(fname); + return ret; +} + /** Load and/or generate private keys for all hidden services, possibly * including keys for client authorization. * If a service_list is provided, treat it as the list of hidden diff --git a/src/feature/rend/rendservice.h b/src/feature/rend/rendservice.h index 709678962..7186289fc 100644 --- a/src/feature/rend/rendservice.h +++ b/src/feature/rend/rendservice.h @@ -145,6 +145,7 @@ int rend_config_service(const struct config_line_t *line_, void rend_service_prune_list(void); void rend_service_free_staging_list(void); int rend_service_load_all_keys(const smartlist_t *service_list); +int rend_service_key_on_disk(const char *directory_path); void rend_services_add_filenames_to_lists(smartlist_t *open_lst, smartlist_t *stat_lst); void rend_consider_services_intro_points(time_t now);

1 0

[tor/master] fixup! hs: Learn service version by trying to load the keys
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit d9bfc9e2e351ab7048a09f880d79cc696c8e2c91 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 28 08:36:28 2018 -0400 fixup! hs: Learn service version by trying to load the keys --- src/feature/hs/hs_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index fd981f8e1..30d01540f 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -3410,7 +3410,7 @@ hs_service_get_version_from_key(const hs_service_t *service) tor_assert(service); /* We'll try to load the key for version 3. If not found, we'll try version - * 2 and if not found, we'll send back an unknown version (0). */ + * 2 and if not found, we'll send back an unknown version (-1). */ directory_path = service->config.directory_path; /* Version 3 check. */

1 0

[tor/master] hs: Change default version from 2 to 3
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit e8557ba00ddbd1fa7882c937f50a8366d9d68746 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 22 11:42:23 2018 -0400 hs: Change default version from 2 to 3 Closes #27215 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/tor.1.txt | 2 +- src/feature/hs/hs_service.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0c010d94f..c40c27770 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2826,7 +2826,7 @@ The following options are used to configure a hidden service. [[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**:: A list of rendezvous service descriptor versions to publish for the hidden - service. Currently, versions 2 and 3 are supported. (Default: 2) + service. Currently, versions 2 and 3 are supported. (Default: 3) [[HiddenServiceAuthorizeClient]] **HiddenServiceAuthorizeClient** __auth-type__ __client-name__,__client-name__,__...__:: If configured, the hidden service is accessible for authorized clients diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 6ccd93551..17c654ecf 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -24,7 +24,7 @@ /* When loading and configuring a service, this is the default version it will * be configured for as it is possible that no HiddenServiceVersion is * present. */ -#define HS_SERVICE_DEFAULT_VERSION HS_VERSION_TWO +#define HS_SERVICE_DEFAULT_VERSION HS_VERSION_THREE /* As described in the specification, service publishes their next descriptor * at a random time between those two values (in seconds). */

1 0

[tor/master] Fix log.c comments about assert vs tor_assert vs raw_assert.
by nickm＠torproject.org 28 Aug '18

28 Aug '18

commit 219f6ea51640cca6abcca8d913188724212d107e Merge: 2bc4c55d7 d9bfc9e2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 28 15:58:16 2018 -0400 Fix log.c comments about assert vs tor_assert vs raw_assert. doc/tor.1.txt | 2 +- src/feature/hs/hs_config.c | 24 ++++++++++++++++++ src/feature/hs/hs_service.c | 57 ++++++++++++++++++++++++++++++++++++++++-- src/feature/hs/hs_service.h | 3 ++- src/feature/relay/routerkeys.c | 21 ++++++++++------ src/feature/relay/routerkeys.h | 3 ++- src/feature/rend/rendservice.c | 23 +++++++++++++++++ src/feature/rend/rendservice.h | 1 + src/lib/log/log.c | 9 ++++--- src/test/test_routerkeys.c | 36 +++++++++++++------------- 10 files changed, 145 insertions(+), 34 deletions(-) diff --cc src/lib/log/log.c index e2514a341,e2514a341..d60ce6308 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@@ -101,7 -101,7 +101,7 @@@ sev_to_string(int severity case LOG_NOTICE: return "notice"; case LOG_WARN: return "warn"; case LOG_ERR: return "err"; -- default: /* Call assert, not tor_assert, since tor_assert ++ default: /* Call raw_assert, not tor_assert, since tor_assert * calls log on failure. */ raw_assert_unreached(); return "UNKNOWN"; // LCOV_EXCL_LINE } @@@ -122,7 -122,7 +122,8 @@@ should_log_function_name(log_domain_mas /* We care about places where bugs occur. */ return (domain & (LD_BUG|LD_NOFUNCNAME)) == LD_BUG; default: -- /* Call assert, not tor_assert, since tor_assert calls log on failure. */ ++ /* Call raw_assert, not tor_assert, since tor_assert calls ++ * log on failure. */ raw_assert(0); return 0; // LCOV_EXCL_LINE } } @@@ -579,7 -579,7 +580,7 @@@ logv,(int severity, log_domain_mask_t d char *end_of_prefix=NULL; int callbacks_deferred = 0; -- /* Call assert, not raw_assert, since raw_assert calls log on failure. */ ++ /* Call raw_assert, not tor_assert, since tor_assert calls log on failure. */ raw_assert(format); /* check that severity is sane. Overrunning the masks array leads to * interesting and hard to diagnose effects */ @@@ -694,7 -694,7 +695,7 @@@ tor_log_update_sigsafe_err_fds(void if (!found_real_stderr && int_array_contains(fds, n_fds, STDOUT_FILENO)) { /* Don't use a virtual stderr when we're also logging to stdout. */ -- raw_assert(n_fds >= 2); /* Don't raw_assert inside log fns */ ++ raw_assert(n_fds >= 2); /* Don't tor_assert inside log fns */ fds[0] = fds[--n_fds]; }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2018