June 2019 - tor-commits - lists.torproject.org

[community/staging] Move images to section subfolder
by pili＠torproject.org 05 Jun '19

05 Jun '19

commit 5e52e407332e411bc44bfc349c1cff6dd8aa620e Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu May 30 13:34:01 2019 +0200 Move images to section subfolder --- .../images/onion-services/tor-onion-services-1.png | Bin 17222 -> 0 bytes .../images/onion-services/tor-onion-services-2.png | Bin 19207 -> 0 bytes .../images/onion-services/tor-onion-services-3.png | Bin 22213 -> 0 bytes .../images/onion-services/tor-onion-services-4.png | Bin 21419 -> 0 bytes .../images/onion-services/tor-onion-services-5.png | Bin 22165 -> 0 bytes .../images/onion-services/tor-onion-services-6.png | Bin 18018 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/onion-services/tor-onion-services-1.png b/assets/static/images/onion-services/tor-onion-services-1.png deleted file mode 100644 index 75de366..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-1.png and /dev/null differ diff --git a/assets/static/images/onion-services/tor-onion-services-2.png b/assets/static/images/onion-services/tor-onion-services-2.png deleted file mode 100644 index 4081cdb..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-2.png and /dev/null differ diff --git a/assets/static/images/onion-services/tor-onion-services-3.png b/assets/static/images/onion-services/tor-onion-services-3.png deleted file mode 100644 index 3a948ac..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-3.png and /dev/null differ diff --git a/assets/static/images/onion-services/tor-onion-services-4.png b/assets/static/images/onion-services/tor-onion-services-4.png deleted file mode 100644 index 88db970..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-4.png and /dev/null differ diff --git a/assets/static/images/onion-services/tor-onion-services-5.png b/assets/static/images/onion-services/tor-onion-services-5.png deleted file mode 100644 index c171d71..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-5.png and /dev/null differ diff --git a/assets/static/images/onion-services/tor-onion-services-6.png b/assets/static/images/onion-services/tor-onion-services-6.png deleted file mode 100644 index 23f9f71..0000000 Binary files a/assets/static/images/onion-services/tor-onion-services-6.png and /dev/null differ

1 0

[community/staging] Add links and Calls to Action
by pili＠torproject.org 05 Jun '19

05 Jun '19

commit 0410032427414d4073b5f0773aef80cb95265b0d Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu May 30 13:35:11 2019 +0200 Add links and Calls to Action --- content/onion-services/setup/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 0ff0556..c15a110 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -12,7 +12,9 @@ title: Set up your .onion Service --- subtitle: Learn how to set up a .onion of your very own. --- -key: 2 +key: 1 +--- +cta: Get Started --- cta: Get Started ---

1 0

[community/staging] Onion services
by pili＠torproject.org 05 Jun '19

05 Jun '19

commit 2680fbaf327de82adec7e106baeae0d50e8710ed Author: Pili Guerra <pili(a)torproject.org> Date: Thu May 30 13:53:53 2019 +0000 Onion services --- content/onion-services/setup/contents.lr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index c15a110..54dd91d 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -16,8 +16,11 @@ key: 1 --- cta: Get Started --- +<<<<<<< HEAD cta: Get Started --- +======= +>>>>>>> 456701b... Onion services html: onion-services.html --- body:

1 0

[tor/master] practracker update
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit ae490189f8fc5291152ce9a49b5b8a5b0e1ddf1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 09:06:43 2019 -0400 practracker update --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 1445475f5..c59648250 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -92,7 +92,7 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 124 -problem file-size /src/core/or/circuituse.c 3156 +problem file-size /src/core/or/circuituse.c 3162 problem function-size /src/core/or/circuituse.c:circuit_is_acceptable() 133 problem function-size /src/core/or/circuituse.c:circuit_expire_building() 394 problem function-size /src/core/or/circuituse.c:circuit_log_ancient_one_hop_circuits() 126

1 0

[tor/master] test: Add test_hs_circ.c for HS circuit testing
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 41b94722e5c93ec06911f9c63296a65ce295c1ea Author: David Goulet <dgoulet(a)torproject.org> Date: Fri May 31 10:43:01 2019 -0400 test: Add test_hs_circ.c for HS circuit testing For now, only tests HS circuit repurpose function. Part of #29034 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_hs_circ.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index ecb768957..955016bee 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -132,6 +132,7 @@ src_test_test_SOURCES += \ src/test/test_hs_common.c \ src/test/test_hs_config.c \ src/test/test_hs_cell.c \ + src/test/test_hs_circ.c \ src/test/test_hs_ntor.c \ src/test/test_hs_service.c \ src/test/test_hs_client.c \ diff --git a/src/test/test.c b/src/test/test.c index 58b468775..70c555815 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -877,6 +877,7 @@ struct testgroup_t testgroups[] = { { "legacy_hs/", hs_tests }, { "hs_cache/", hs_cache }, { "hs_cell/", hs_cell_tests }, + { "hs_circ/", hs_circ_tests }, { "hs_common/", hs_common_tests }, { "hs_config/", hs_config_tests }, { "hs_control/", hs_control_tests }, diff --git a/src/test/test.h b/src/test/test.h index aacc9dba8..8a5c675bc 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -216,6 +216,7 @@ extern struct testcase_t geoip_tests[]; extern struct testcase_t hs_tests[]; extern struct testcase_t hs_cache[]; extern struct testcase_t hs_cell_tests[]; +extern struct testcase_t hs_circ_tests[]; extern struct testcase_t hs_common_tests[]; extern struct testcase_t hs_config_tests[]; extern struct testcase_t hs_control_tests[]; diff --git a/src/test/test_hs_circ.c b/src/test/test_hs_circ.c new file mode 100644 index 000000000..af28af257 --- /dev/null +++ b/src/test/test_hs_circ.c @@ -0,0 +1,70 @@ +/* Copyright (c) 2017-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_hs_circ.c + * \brief Test hidden service circuit functionality. + */ + +#define CIRCUITLIST_PRIVATE + +#include "test/test.h" +#include "test/test_helpers.h" +#include "test/log_test_helpers.h" + +#include "core/or/circuitbuild.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "core/or/origin_circuit_st.h" + +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" + +static void +test_circuit_repurpose(void *arg) +{ + origin_circuit_t *intro_circ = NULL; + const origin_circuit_t *search; + ed25519_keypair_t kp; + + (void) arg; + + hs_init(); + + intro_circ = origin_circuit_init(CIRCUIT_PURPOSE_S_ESTABLISH_INTRO, 0); + tt_assert(intro_circ); + ed25519_keypair_generate(&kp, 0); + + /* Register circuit in global map and make sure it is actually there. */ + hs_circuitmap_register_intro_circ_v3_service_side(intro_circ, + &kp.pubkey); + tt_assert(TO_CIRCUIT(intro_circ)->hs_token); + search = hs_circuitmap_get_intro_circ_v3_service_side(&kp.pubkey); + tt_mem_op(search, OP_EQ, intro_circ, sizeof(origin_circuit_t)); + + /* Setup circuit HS ident. We don't care about the service pubkey. */ + intro_circ->hs_ident = hs_ident_circuit_new(&kp.pubkey, + HS_IDENT_CIRCUIT_INTRO); + tt_assert(intro_circ->hs_ident); + + /* Trigger a repurpose. State should be cleaned up. */ + hs_circ_repurpose(TO_CIRCUIT(intro_circ)); + + /* Removed from map. */ + search = hs_circuitmap_get_intro_circ_v3_service_side(&kp.pubkey); + tt_assert(!search); + /* HS identifier has been removed. */ + tt_assert(!intro_circ->hs_ident); + + done: + circuit_free_(TO_CIRCUIT(intro_circ)); + hs_free_all(); +} + +struct testcase_t hs_circ_tests[] = { + { "repurpose", test_circuit_repurpose, TT_FORK, + NULL, NULL }, + + END_OF_TESTCASES +}; +

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1053'
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit b39a8d315dcbfae002c6ced7434b6afd5a5670d1 Merge: 0c16ec4c0 41b94722e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 09:04:09 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1053' changes/bug29034 | 5 ++++ src/core/or/circuituse.c | 6 ++++ src/feature/hs/hs_circuit.c | 31 +++++++++++++++++++ src/feature/hs/hs_circuit.h | 1 + src/feature/rend/rendcommon.c | 11 +++++++ src/feature/rend/rendcommon.h | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_hs_circ.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 129 insertions(+) diff --cc src/test/test.c index cac98dd83,70c555815..d7682b661 --- a/src/test/test.c +++ b/src/test/test.c @@@ -866,12 -871,13 +866,13 @@@ struct testgroup_t testgroups[] = { "dos/", dos_tests }, { "entryconn/", entryconn_tests }, { "entrynodes/", entrynodes_tests }, - { "guardfraction/", guardfraction_tests }, { "extorport/", extorport_tests }, { "geoip/", geoip_tests }, - { "legacy_hs/", hs_tests }, + { "guardfraction/", guardfraction_tests }, { "hs_cache/", hs_cache }, { "hs_cell/", hs_cell_tests }, + { "hs_circ/", hs_circ_tests }, + { "hs_client/", hs_client_tests }, { "hs_common/", hs_common_tests }, { "hs_config/", hs_config_tests }, { "hs_control/", hs_control_tests }, diff --cc src/test/test.h index 167fd090a,8a5c675bc..b108d795e --- a/src/test/test.h +++ b/src/test/test.h @@@ -215,13 -210,13 +215,14 @@@ extern struct testcase_t dns_tests[] extern struct testcase_t dos_tests[]; extern struct testcase_t entryconn_tests[]; extern struct testcase_t entrynodes_tests[]; -extern struct testcase_t guardfraction_tests[]; extern struct testcase_t extorport_tests[]; extern struct testcase_t geoip_tests[]; -extern struct testcase_t hs_tests[]; +extern struct testcase_t guardfraction_tests[]; +extern struct testcase_t handle_tests[]; extern struct testcase_t hs_cache[]; extern struct testcase_t hs_cell_tests[]; + extern struct testcase_t hs_circ_tests[]; +extern struct testcase_t hs_client_tests[]; extern struct testcase_t hs_common_tests[]; extern struct testcase_t hs_config_tests[]; extern struct testcase_t hs_control_tests[];

1 0

[tor/master] hs: Implement a helper to repurpose a circuit
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 3789f22bcbfbc6de415a838e4c4bfb2555c7d6c3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue May 28 09:44:06 2019 -0400 hs: Implement a helper to repurpose a circuit When we repurpose a hidden service circuit, we need to clean up from the HS circuit map and any HS related data structured contained in the circuit. This commit adds an helper function that does it when repurposing a hidden service circuit. Fixes #29034 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug29034 | 5 +++++ src/core/or/circuituse.c | 6 ++++++ src/feature/hs/hs_circuit.c | 31 +++++++++++++++++++++++++++++++ src/feature/hs/hs_circuit.h | 1 + src/feature/rend/rendcommon.c | 11 +++++++++++ src/feature/rend/rendcommon.h | 2 ++ 6 files changed, 56 insertions(+) diff --git a/changes/bug29034 b/changes/bug29034 new file mode 100644 index 000000000..816b61500 --- /dev/null +++ b/changes/bug29034 @@ -0,0 +1,5 @@ + o Major bugfixes (Onion service reachability): + - Properly clean up the introduction point map and associated state when + circuits change purpose from onion service circuits to pathbias, + measurement, or other circuit types. This should fix some instances of + introduction point failure. Fixes bug 29034; bugfix on 0.3.2.1-alpha. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 02bfa15fb..465d64215 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -3052,6 +3052,12 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) if (circ->purpose == new_purpose) return; + /* Take specific actions if we are repurposing a hidden service circuit. */ + if (circuit_purpose_is_hidden_service(circ->purpose) && + !circuit_purpose_is_hidden_service(new_purpose)) { + hs_circ_repurpose(circ); + } + if (CIRCUIT_IS_ORIGIN(circ)) { char old_purpose_desc[80] = ""; diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index e3873d2f1..2e59a357b 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -24,6 +24,7 @@ #include "feature/nodelist/describe.h" #include "feature/nodelist/nodelist.h" #include "feature/rend/rendservice.h" +#include "feature/rend/rendcommon.h" #include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_rand.h" @@ -1269,3 +1270,33 @@ hs_circ_cleanup(circuit_t *circ) hs_circuitmap_remove_circuit(circ); } } + +/* The given circuit will be repurposed so take the appropriate actions. A + * cleanup from the HS maps and of all HS related structures is done. + * + * Once this function returns, the circuit can be safely repurposed. */ +void +hs_circ_repurpose(circuit_t *circ) +{ + origin_circuit_t *origin_circ; + + tor_assert(circ); + + /* Only repurposing an origin circuit is possible for HS. */ + if (!CIRCUIT_IS_ORIGIN(circ)) { + return; + } + origin_circ = TO_ORIGIN_CIRCUIT(circ); + + /* First, cleanup the circuit from the HS maps. */ + hs_circ_cleanup(circ); + + /* Depending on the version, different cleanup is done. */ + if (origin_circ->rend_data) { + /* v2. */ + rend_circ_cleanup(origin_circ); + } else if (origin_circ->hs_ident) { + /* v3. */ + hs_ident_circuit_free(origin_circ->hs_ident); + } +} diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h index b8d8b25ad..0786f3ee4 100644 --- a/src/feature/hs/hs_circuit.h +++ b/src/feature/hs/hs_circuit.h @@ -16,6 +16,7 @@ /* Cleanup function when the circuit is closed or/and freed. */ void hs_circ_cleanup(circuit_t *circ); +void hs_circ_repurpose(circuit_t *circ); /* Circuit API. */ int hs_circ_service_intro_has_opened(hs_service_t *service, diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index de48af795..b10a5863b 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -1045,3 +1045,14 @@ rend_circuit_pk_digest_eq(const origin_circuit_t *ocirc, match: return 1; } + +/* Cleanup the given circuit of all HS v2 data structure. */ +void +rend_circ_cleanup(origin_circuit_t *circ) +{ + tor_assert(circ); + + /* Both fields are set to NULL with these. */ + crypto_pk_free(circ->intro_key); + rend_data_free(circ->rend_data); +} diff --git a/src/feature/rend/rendcommon.h b/src/feature/rend/rendcommon.h index f136863c7..c9a04846d 100644 --- a/src/feature/rend/rendcommon.h +++ b/src/feature/rend/rendcommon.h @@ -71,6 +71,8 @@ int rend_non_anonymous_mode_enabled(const or_options_t *options); void assert_circ_anonymity_ok(const origin_circuit_t *circ, const or_options_t *options); +void rend_circ_cleanup(origin_circuit_t *circ); + #ifdef RENDCOMMON_PRIVATE STATIC int

1 0

[tor/master] Merge branch 'bug30286_2_squashed'
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 0c16ec4c0775db4a91a99cb935d2528233deafb2 Merge: 8cb6b2b9a e8aab46a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 08:32:39 2019 -0400 Merge branch 'bug30286_2_squashed' changes/bug30286 | 4 ++++ scripts/git/pre-push.git-hook | 33 +++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-)

1 0

[tor/master] pre-push.git-hook: Check remote name to see if it's upstream
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 6f1527f88871d16c4edf83f56ed5cdde1f6d2b82 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat May 11 18:58:14 2019 +0300 pre-push.git-hook: Check remote name to see if it's upstream --- scripts/git/pre-push.git-hook | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 238541d9f..00e048029 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -16,6 +16,7 @@ echo "Running pre-push hook" z40=0000000000000000000000000000000000000000 +upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} workdir=$(git rev-parse --show-toplevel) if [ -x "$workdir/.git/hooks/pre-commit" ]; then @@ -33,8 +34,9 @@ fi remote="$1" remote_loc="$2" -if [[ "$remote_loc" != *github.com/torproject/tor.git ]] && - [[ "$remote_loc" != *torproject.org/tor.git ]]; then +remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1) + +if [[ "$remote_name" != "$upstream_name" ]]; then echo "Not pushing to upstream - refraining from further checks" exit 0 fi

1 0

[tor/master] pre-push.git-hook: Allow fixup and squash commits when pushing to non-upstream branches
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit d91deeee45c3433cc7dcaf1e67a84692420db870 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed May 1 12:41:49 2019 +0300 pre-push.git-hook: Allow fixup and squash commits when pushing to non-upstream branches --- scripts/git/pre-push.git-hook | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 740180d6f..238541d9f 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -16,16 +16,6 @@ echo "Running pre-push hook" z40=0000000000000000000000000000000000000000 -remote="$1" - -ref_is_upstream_branch() { - if [ "$1" == "refs/heads/master" ] || - [[ "$1" == refs/heads/release-* ]] || - [[ "$1" == refs/heads/maint-* ]] - then - return 1 - fi -} workdir=$(git rev-parse --show-toplevel) if [ -x "$workdir/.git/hooks/pre-commit" ]; then @@ -40,6 +30,24 @@ if [ -e scripts/maint/practracker/practracker.py ]; then fi fi +remote="$1" +remote_loc="$2" + +if [[ "$remote_loc" != *github.com/torproject/tor.git ]] && + [[ "$remote_loc" != *torproject.org/tor.git ]]; then + echo "Not pushing to upstream - refraining from further checks" + exit 0 +fi + +ref_is_upstream_branch() { + if [ "$1" == "refs/heads/master" ] || + [[ "$1" == refs/heads/release-* ]] || + [[ "$1" == refs/heads/maint-* ]] + then + return 1 + fi +} + # shellcheck disable=SC2034 while read -r local_ref local_sha remote_ref remote_sha do

1 0