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

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

05 Jun '19

commit 31c34f6524fecd6a104a8dac04d9330b5323e3c0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 11:38:01 2019 -0700 Revert "hs: Implement a helper to repurpose a circuit" This reverts commit 3789f22bcbfbc6de415a838e4c4bfb2555c7d6c3. --- 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 -- 5 files changed, 51 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index b3d5c6bb8..485c38905 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -3068,12 +3068,6 @@ 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 79377eb73..a6e86c5ab 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -25,7 +25,6 @@ #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" @@ -1193,33 +1192,3 @@ 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 0786f3ee4..b8d8b25ad 100644 --- a/src/feature/hs/hs_circuit.h +++ b/src/feature/hs/hs_circuit.h @@ -16,7 +16,6 @@ /* 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 265ee368f..777de2984 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -1046,14 +1046,3 @@ 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 c9a04846d..f136863c7 100644 --- a/src/feature/rend/rendcommon.h +++ b/src/feature/rend/rendcommon.h @@ -71,8 +71,6 @@ 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] Bug 29034: Cleanup hs circuitmap when purpose changes.
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit c525135dac354892a45ad3d2f6de9450d393f09f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 11:50:44 2019 -0700 Bug 29034: Cleanup hs circuitmap when purpose changes. Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking the circuit for close. The circuitmap is the important thing to clean up, since repurposed intropoints must be removed from this map to ensure validity. --- changes/bug29034 | 5 +++++ src/core/or/circuituse.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug29034 b/changes/bug29034 new file mode 100644 index 000000000..e7aa9af00 --- /dev/null +++ b/changes/bug29034 @@ -0,0 +1,5 @@ + o Major bugfixes (Onion service reachability): + - Properly clean up the introduction point map when circuits change purpose + from onion service circuits to pathbias, measurement, or other circuit types. + This should fix some service-side 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 485c38905..18b419e99 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -3082,6 +3082,12 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) circ->purpose, circuit_purpose_to_string(new_purpose), new_purpose); + + /* 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_cleanup(circ); + } } old_purpose = circ->purpose;

1 0

[tor/master] Add missing newline after decode_intro_points() closing bracket
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 27e067df4fd3148b59dd0377d1a7b111460a2b53 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jun 5 12:50:01 2019 -0400 Add missing newline after decode_intro_points() closing bracket --- src/feature/hs/hs_descriptor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 52dc8690c..a8796c002 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -1968,6 +1968,7 @@ decode_intro_points(const hs_descriptor_t *desc, SMARTLIST_FOREACH(intro_points, char *, a, tor_free(a)); smartlist_free(intro_points); } + /* Return 1 iff the given base64 encoded signature in b64_sig from the encoded * descriptor in encoded_desc validates the descriptor content. */ STATIC int

1 0

[tor/master] Don't access rend data after a circuit has been marked for close.
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 917e4e9eae8645e65ea93836cbd82890eb5d7872 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 5 18:19:23 2019 +0300 Don't access rend data after a circuit has been marked for close. This can cause issues if the circuit was repurposed into a padding circuit instead of closing, since in that case we will wipe off the rend_data. --- src/feature/rend/rendclient.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index f84d221b1..5bdd4d453 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -403,14 +403,23 @@ rend_client_introduction_acked(origin_circuit_t *circ, } else { log_info(LD_REND,"...Found no rend circ. Dropping on the floor."); } + /* Save the rend data digest to a temporary object so that we don't access + * it after we mark the circuit for close. */ + const uint8_t *rend_digest_tmp = NULL; + size_t digest_len; + uint8_t *cached_rend_digest = NULL; + rend_digest_tmp = rend_data_get_pk_digest(circ->rend_data, &digest_len); + cached_rend_digest = tor_malloc_zero(digest_len); + memcpy(cached_rend_digest, rend_digest_tmp, digest_len); + /* close the circuit: we won't need it anymore. */ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_INTRODUCE_ACKED); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); /* close any other intros launched in parallel */ - rend_client_close_other_intros(rend_data_get_pk_digest(circ->rend_data, - NULL)); + rend_client_close_other_intros(cached_rend_digest); + tor_free(cached_rend_digest); /* free the temporary digest */ } else { /* It's a NAK; the introduction point didn't relay our request. */ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_INTRODUCING);

1 0

[tpo/staging] update pronoun
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit a848be007bd0c28ea10be04cf27de61c610bb0e1 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Jun 3 21:22:02 2019 +0200 update pronoun --- content/about/people/catalyst/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index 85695d4..e8e2412 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -10,7 +10,7 @@ nickname: catalyst --- twitter_handle: argonblue --- -pronoun: https://pronoun.is/they +pronoun: https://pronoun.is/they?or=she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606… ---

1 0

[tpo/staging] Add new Tor Browser version: 8.5.1
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit 556542756217d9d60ff99baaf9ca5ae7eb5cd9d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 4 20:39:35 2019 +0200 Add new Tor Browser version: 8.5.1 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 5c86649..ebf1875 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "8.5-MacOS", "8.5-Linux", "8.5-Windows", +"8.5.1", +"8.5.1-MacOS", +"8.5.1-Linux", +"8.5.1-Windows", "9.0a1", "9.0a1-MacOS", "9.0a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 88dc298..091e26c 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,6 +1,6 @@ [torbrowser-stable] -version = 8.5 -release_date = 2019-05-21 +version = 8.5.1 +release_date = 2019-06-04 win32 = 0.3.5.8 [torbrowser-alpha]

1 0

[tpo/staging] translate sponsors overview page (ref: #30583)
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit 88404ecf90da8f42c772da11c63eca1450595f96 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jun 5 11:04:14 2019 +0200 translate sponsors overview page (ref: #30583) --- models/sponsors.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/models/sponsors.ini b/models/sponsors.ini index 9bb89db..b9a4fee 100644 --- a/models/sponsors.ini +++ b/models/sponsors.ini @@ -20,6 +20,7 @@ translate = False [fields.body] label = Body type = markdown +translate = True [fields.color] label = Color

1 0

[tpo/staging] update pronoun
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit dec5b24ae8f54c173298502c666f40d2305f9b0a Author: emma peel <emma.peel(a)riseup.net> Date: Mon Jun 3 21:22:02 2019 +0200 update pronoun --- content/about/people/catalyst/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index 85695d4..e8e2412 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -10,7 +10,7 @@ nickname: catalyst --- twitter_handle: argonblue --- -pronoun: https://pronoun.is/they +pronoun: https://pronoun.is/they?or=she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606… ---

1 0

[tpo/staging] Update website
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit f201e0b26c3d14d46df6dbf5d1137f2cc6370ff7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 4 20:52:47 2019 +0200 Update website

1 0

[tpo/staging] translate sponsors overview page (ref: #30583)
by emmapeel＠torproject.org 05 Jun '19

05 Jun '19

commit 2dfd5f76ead3b6613e7f9009634de4a1568462b4 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jun 5 13:13:36 2019 +0200 translate sponsors overview page (ref: #30583) --- content/menu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/menu/contents.lr b/content/menu/contents.lr index 105278d..42d2091 100644 --- a/content/menu/contents.lr +++ b/content/menu/contents.lr @@ -4,7 +4,7 @@ section: About --- color: primary --- -title: About +title: Sponsors --- body:

1 0