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

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 12 Jan '19

12 Jan '19

commit df74a6b44ee0657cbdbbbb25610569cba2cc6b73 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 12 06:48:27 2019 +0000 Update translations for torbutton-abouttbupdatedtd --- ta/abouttbupdate.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ta/abouttbupdate.dtd b/ta/abouttbupdate.dtd index 2dd39425f..b3cfc1bef 100644 --- a/ta/abouttbupdate.dtd +++ b/ta/abouttbupdate.dtd @@ -1,10 +1,10 @@ -<!ENTITY aboutTBUpdate.title "Tor உலாவி மேம்பாடு"> -<!ENTITY aboutTBUpdate.updated "Tor உலாவி மேம்படுத்தபட்டுவிட்டது."> +<!ENTITY aboutTBUpdate.title "Tor உலாவி புதுப்பிப்பு"> +<!ENTITY aboutTBUpdate.updated "Tor உலாவி புதுப்பிக்கப்பட்டது."> <!ENTITY aboutTBUpdate.linkPrefix "இந்த வெளியீடு பற்றிய தற்சமய தகவல்களுக்கு,"> <!ENTITY aboutTBUpdate.linkLabel "எங்கள் வலைதளத்தை வருகை தருக"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "மாற்றம் விவரம்:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "புதிய, மறுவடிவமைக்கப்பட்ட சுற்றுக்காட்சி"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor சுற்றுக்காட்சி இடமாற்றப்பட்டு மேம்படுத்தப்பட்டுள்ளது! புதிய சுற்றுக்காட்சியைப் பார்க்க தளத்தின் அடையாள பொத்தானை (URL பட்டையின் இடப்பக்கம் உள்ளது) கிளிக் செய்யுங்கள்."> +<!ENTITY aboutTBUpdate.learnMore "மேலும் அறிய">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 12 Jan '19

12 Jan '19

commit 9c7d321b247154c98effdbc6b0328531ed98c4e3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 12 06:45:05 2019 +0000 Update translations for abouttor-homepage --- ta/aboutTor.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ta/aboutTor.dtd b/ta/aboutTor.dtd index c1d82fc5d..ca8ecc5c7 100644 --- a/ta/aboutTor.dtd +++ b/ta/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Tor ஐ பற்றி"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "உலாவுக. தனியுரிமையுடன்."> +<!ENTITY aboutTor.ready2.label "நீங்கள் உலகின் மிகவும் தனிப்பட்ட உலாவல் அனுபவத்திற்கு தயாராக உள்ளீர்கள்."> <!ENTITY aboutTor.failure.label "ஏதோ தவறு ஏற்பட்டது!"> <!ENTITY aboutTor.failure2.label "Tor இந்த உலாவியில் வேலை செய்யவில்லை."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "டக் டக் கோவுடன் தேடுங்கள்"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "கேள்விகள்?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "எங்களின் Tor உலாவி கையேட்டைப் பாருங்கள் »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor உலாவி கையேடு"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> <!ENTITY aboutTor.getInvolved.label "Get Involved »">

1 0

[tor/master] Fix a typo
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit b69d28ae830ee0fea642395f0e7c2e89cc8a68d0 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jan 5 11:02:18 2019 +0200 Fix a typo --- src/test/test_hs_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 3357ca2c5..ccb4d93fe 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -267,7 +267,7 @@ helper_clone_authorized_client(const hs_service_authorized_client_t *client) /* Helper: Return a newly allocated service object with the identity keypair * sets and the current descriptor. Then register it to the global map. - * Caller should us hs_free_all() to free this service or remove it from the + * Caller should use hs_free_all() to free this service or remove it from the * global map before freeing. */ static hs_service_t * helper_create_service(void)

1 0

[tor/master] Fix CID 1442277
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit 1bcececdd8e2ff4d6e921270984ba7800c914f64 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jan 5 11:01:07 2019 +0200 Fix CID 1442277 --- changes/bug28989 | 5 +++++ src/test/test_hs_service.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/changes/bug28989 b/changes/bug28989 new file mode 100644 index 000000000..3e3ccccaf --- /dev/null +++ b/changes/bug28989 @@ -0,0 +1,5 @@ + o Minor bugfixes (unit tests): + - Instead of relying on hs_free_all() to clean up all onion service + objects we created in test_build_descriptors(), deallocate + them one by one. This lets Coverity know that we are not leaking memory + here and fixes CID 1442277. Fixes bug 28989; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index b2aafc1cd..3357ca2c5 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -289,6 +289,20 @@ helper_create_service(void) return service; } +/* Helper: Deallocate a given service object, its child objects and + * remove it from onion service map. + * */ +static void +helper_destroy_service(hs_service_t *service) +{ + if (!service) + return; + + remove_service(get_hs_service_map(), service); + + hs_service_free(service); +} + /* Helper: Return a newly allocated service object with clients. */ static hs_service_t * helper_create_service_with_clients(int num_clients) @@ -1626,6 +1640,7 @@ test_build_descriptors(void *arg) { int ret; time_t now = time(NULL); + hs_service_t *last_service = NULL; (void) arg; @@ -1650,6 +1665,7 @@ test_build_descriptors(void *arg) * is disabled. */ { hs_service_t *service = helper_create_service(); + last_service = service; service_descriptor_free(service->desc_current); service->desc_current = NULL; @@ -1660,12 +1676,16 @@ test_build_descriptors(void *arg) hs_desc_superencrypted_data_t *superencrypted; superencrypted = &service->desc_current->desc->superencrypted_data; tt_int_op(smartlist_len(superencrypted->clients), OP_EQ, 16); + + helper_destroy_service(service); + last_service = NULL; } /* Generate a valid number of fake auth clients when the number of * clients is zero. */ { hs_service_t *service = helper_create_service_with_clients(0); + last_service = service; service_descriptor_free(service->desc_current); service->desc_current = NULL; @@ -1673,12 +1693,16 @@ test_build_descriptors(void *arg) hs_desc_superencrypted_data_t *superencrypted; superencrypted = &service->desc_current->desc->superencrypted_data; tt_int_op(smartlist_len(superencrypted->clients), OP_EQ, 16); + + helper_destroy_service(service); + last_service = NULL; } /* Generate a valid number of fake auth clients when the number of * clients is not a multiple of 16. */ { hs_service_t *service = helper_create_service_with_clients(20); + last_service = service; service_descriptor_free(service->desc_current); service->desc_current = NULL; @@ -1686,12 +1710,16 @@ test_build_descriptors(void *arg) hs_desc_superencrypted_data_t *superencrypted; superencrypted = &service->desc_current->desc->superencrypted_data; tt_int_op(smartlist_len(superencrypted->clients), OP_EQ, 32); + + helper_destroy_service(service); + last_service = NULL; } /* Do not generate any fake desc client when the number of clients is * a multiple of 16 but not zero. */ { hs_service_t *service = helper_create_service_with_clients(32); + last_service = service; service_descriptor_free(service->desc_current); service->desc_current = NULL; @@ -1699,9 +1727,13 @@ test_build_descriptors(void *arg) hs_desc_superencrypted_data_t *superencrypted; superencrypted = &service->desc_current->desc->superencrypted_data; tt_int_op(smartlist_len(superencrypted->clients), OP_EQ, 32); + + helper_destroy_service(service); + last_service = NULL; } done: + helper_destroy_service(last_service); hs_free_all(); }

1 0

[tor/master] Merge branch 'bug28989_squashed'
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit cef910642efb1f9a2db16146eb8a191327b51310 Merge: df1a8a657 b69d28ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 11 18:56:57 2019 -0500 Merge branch 'bug28989_squashed' changes/bug28989 | 5 +++++ src/test/test_hs_service.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-)

1 0

[tor/master] Actually close the stdout pipe on error in process_unix_exec
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit df1a8a657eadcc156032aa558ae0395cde878ee8 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Fri Jan 4 13:48:08 2019 -0600 Actually close the stdout pipe on error in process_unix_exec When cleaning up after an error in process_unix_exec, the stdin pipe was being double closed instead of closing both the stdin and stdout pipes. This occurred in two places. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- src/lib/process/process_unix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/process/process_unix.c b/src/lib/process/process_unix.c index 57ca69a76..dd4ccbf60 100644 --- a/src/lib/process/process_unix.c +++ b/src/lib/process/process_unix.c @@ -183,8 +183,8 @@ process_unix_exec(process_t *process) close(stdin_pipe[1]); /** Cleanup standard out pipe. */ - close(stdin_pipe[0]); - close(stdin_pipe[1]); + close(stdout_pipe[0]); + close(stdout_pipe[1]); return PROCESS_STATUS_ERROR; } @@ -281,8 +281,8 @@ process_unix_exec(process_t *process) close(stdin_pipe[1]); /** Cleanup standard out pipe. */ - close(stdin_pipe[0]); - close(stdin_pipe[1]); + close(stdout_pipe[0]); + close(stdout_pipe[1]); /** Cleanup standard error pipe. */ close(stderr_pipe[0]);

1 0

[tor/maint-0.3.5] hs-v3: Don't BUG() if descriptor is found on SOCKS connection retry
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit cec616a0c8ff060cb722e54342fd30aeab3ad285 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 4 14:27:46 2018 -0500 hs-v3: Don't BUG() if descriptor is found on SOCKS connection retry When retrying all SOCKS connection because new directory information just arrived, do not BUG() if a connection in state AP_CONN_STATE_RENDDESC_WAIT is found to have a usable descriptor. There is a rare case when this can happen as detailed in #28669 so the right thing to do is put that connection back in circuit wait state so the descriptor can be retried. Fixes #28669 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket28669 | 6 ++++++ src/feature/hs/hs_client.c | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/changes/ticket28669 b/changes/ticket28669 new file mode 100644 index 000000000..32c6114ff --- /dev/null +++ b/changes/ticket28669 @@ -0,0 +1,6 @@ + o Minor bugfix (hidden service v3, client): + - Avoid a BUG() stacktrace in case a SOCKS connection is found waiting for + the descriptor while we do have it in the cache. There is a rare case + when this can happen. Now, tor will recover and retry the descriptor. + Fixes bug 28669; bugfix on 0.3.2.4-alpha. + diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 22aacdfe9..5fded92fe 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -296,12 +296,19 @@ retry_all_socks_conn_waiting_for_desc(void) /* Order a refetch in case it works this time. */ status = hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk); - if (BUG(status == HS_CLIENT_FETCH_HAVE_DESC)) { - /* This case is unique because it can NOT happen in theory. Once we get - * a new descriptor, the HS client subsystem is notified immediately and - * the connections waiting for it are handled which means the state will - * change from renddesc wait state. Log this and continue to next - * connection. */ + if (status == HS_CLIENT_FETCH_HAVE_DESC) { + /* This is a rare case where a SOCKS connection is in state waiting for + * a descriptor but we do have it in the cache. + * + * This can happen is tor comes back from suspend where it previously + * had the descriptor but the intro points were not usuable. Once it + * came back to life, the intro point failure cache was cleaned up and + * thus the descriptor became usable again leaving us in this code path. + * + * We'll mark the connection as waiting for a circuit so the descriptor + * can be retried. This is safe because a connection in state waiting + * for a descriptor can not be in the entry connection pending list. */ + mark_conn_as_waiting_for_circuit(base_conn, approx_time()); continue; } /* In the case of an error, either all SOCKS connections have been

1 0

[tor/maint-0.3.5] conn: Use connection_ap_mark_as_waiting_for_renddesc()
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit 00b59d92817f34c60fe9bc1f8b72b6e81ae1c431 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 4 14:09:15 2018 -0500 conn: Use connection_ap_mark_as_waiting_for_renddesc() Use the helper function connection_ap_mark_as_waiting_for_renddesc() introduced in previous commit everywhere in the code where an AP connection state is transitionned to AP_CONN_STATE_RENDDESC_WAIT. Part of #28669 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/circuituse.c | 3 +-- src/feature/hs/hs_client.c | 3 +-- src/feature/rend/rendclient.c | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 088358a4d..7ea37fb3b 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2377,8 +2377,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, } else { hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk); } - connection_ap_mark_as_non_pending_circuit(conn); - ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_RENDDESC_WAIT; + connection_ap_mark_as_waiting_for_renddesc(conn); return 0; } log_info(LD_REND,"Chose %s as intro point for '%s'.", diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index dfad216ab..43e5b80e5 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -142,8 +142,7 @@ flag_all_conn_wait_desc(const ed25519_public_key_t *service_identity_pk) if (edge_conn->hs_ident && ed25519_pubkey_eq(&edge_conn->hs_ident->identity_pk, service_identity_pk)) { - connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn)); - conn->state = AP_CONN_STATE_RENDDESC_WAIT; + connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn)); } } SMARTLIST_FOREACH_END(conn); diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 10b67ceda..6ecb3eb3c 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -150,8 +150,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT, onion_address))) { - connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn)); - conn->state = AP_CONN_STATE_RENDDESC_WAIT; + connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn)); } } @@ -864,8 +863,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT, onion_address))) { - connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn)); - conn->state = AP_CONN_STATE_RENDDESC_WAIT; + connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn)); } return 0;

1 0

[tor/maint-0.3.5] conn: Add an helper to mark a connection as waiting for an HS descriptor
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit d0682fe0f190ce55973d86ec92978aa6b3f61f1f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 4 14:00:08 2018 -0500 conn: Add an helper to mark a connection as waiting for an HS descriptor The transition for a connection to either become or go back in AP_CONN_STATE_RENDDESC_WAIT state must make sure that the entry connection is _not_ in the waiting for circuit list. This commit implements the helper function connection_ap_mark_as_waiting_for_renddesc() that removes the entry connection from the pending list and then change its state. This code pattern is used in many places in the code where next commit will remove this code duplication to use this new helper function. Part of #28669 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/connection_edge.c | 15 +++++++++++++++ src/core/or/connection_edge.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 58aefcf8f..96149bbb1 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1354,6 +1354,21 @@ connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn) smartlist_remove(pending_entry_connections, entry_conn); } +/** Mark <b>entry_conn</b> as waiting for a rendezvous descriptor. This + * function will remove the entry connection from the waiting for a circuit + * list (pending_entry_connections). + * + * This pattern is used across the code base because a connection in state + * AP_CONN_STATE_RENDDESC_WAIT must not be in the pending list. */ +void +connection_ap_mark_as_waiting_for_renddesc(entry_connection_t *entry_conn) +{ + tor_assert(entry_conn); + + connection_ap_mark_as_non_pending_circuit(entry_conn); + ENTRY_TO_CONN(entry_conn)->state = AP_CONN_STATE_RENDDESC_WAIT; +} + /* DOCDOC */ void connection_ap_warn_and_unmark_if_pending_circ(entry_connection_t *entry_conn, diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 55b90d3ea..b8a7365a0 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -126,6 +126,9 @@ void connection_ap_mark_as_pending_circuit_(entry_connection_t *entry_conn, #define connection_ap_mark_as_pending_circuit(c) \ connection_ap_mark_as_pending_circuit_((c), __FILE__, __LINE__) void connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn); +void connection_ap_mark_as_waiting_for_renddesc( + entry_connection_t *entry_conn); + #define CONNECTION_AP_EXPECT_NONPENDING(c) do { \ if (ENTRY_TO_CONN(c)->state == AP_CONN_STATE_CIRCUIT_WAIT) { \ log_warn(LD_BUG, "At %s:%d: %p was unexpectedly in circuit_wait.", \

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
by nickm＠torproject.org 11 Jan '19

11 Jan '19

commit efd765a94816bb216e81a4962c94bac385947719 Merge: 694e3c57f cec616a0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 11 18:53:18 2019 -0500 Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5 changes/ticket28669 | 6 +++++ src/core/or/circuituse.c | 3 +-- src/core/or/connection_edge.c | 15 ++++++++++++ src/core/or/connection_edge.h | 3 +++ src/feature/hs/hs_client.c | 56 ++++++++++++++++++++++++++++--------------- src/feature/rend/rendclient.c | 6 ++--- 6 files changed, 64 insertions(+), 25 deletions(-)

1 0