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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 May '16

11 May '16

commit 6aaa57f329cc64630cb950c275d71803eba8d99a Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 11 16:45:16 2016 +0000 Update translations for https_everywhere --- ca/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/ssl-observatory.dtd b/ca/ssl-observatory.dtd index afbccbe..a15fd13 100644 --- a/ca/ssl-observatory.dtd +++ b/ca/ssl-observatory.dtd @@ -79,7 +79,7 @@ ha vist. Passeu amb el cursor per sobre les opcions per a més informació. "> "Seguirem intentant mantenir les dades anònimes, però aquesta opció és menys segura"> <!ENTITY ssl-observatory.prefs.priv_dns -"Submet i comprova els certificats per a noms DNS no públics"> +"Envair i comprovar certificats per a noms DNS no públics"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "Mentre aquesta opció no estigui sel·leccionada, l'Observatory no emmagatzemarà certificats per a noms que no han estat resolts amb el sistema de DNS."> @@ -89,7 +89,7 @@ ha vist. Passeu amb el cursor per sobre les opcions per a més informació. "> <!ENTITY ssl-observatory.prefs.title "Preferències de SSL Observatory"> <!ENTITY ssl-observatory.prefs.use "Utilitzar l'Observatori?"> -<!ENTITY ssl-observatory.warning.title "Avís del SSL del EFF Observatori"> +<!ENTITY ssl-observatory.warning.title "Avís de l'Observatori SSL EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostra la cadena de certificats"> <!ENTITY ssl-observatory.warning.okay "Ho entenc"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory ha emès una advertència sobre cerficats(s) HTTPS per a aquest lloc: ">

1 0

[tor/master] Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.
by nickm＠torproject.org 11 May '16

11 May '16

commit b59d79134e1089d310278a70788401835c1e5c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:46:44 2016 -0400 Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN. Closes ticket 18761. Also fix a whitespace issue. --- changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changes/bug18761 b/changes/bug18761 new file mode 100644 index 0000000..78500a8 --- /dev/null +++ b/changes/bug18761 @@ -0,0 +1,3 @@ + o Minor feature (logging): + - When rejecting a misformed INTRODUCE2 cell, only log at PROTOCOL_WARN + severity. Closes ticket 18761. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 39e5831..6f41f3b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1445,6 +1445,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, int status = 0, result; const or_options_t *options = get_options(); char *err_msg = NULL; + int err_msg_severity = LOG_WARN; const char *stage_descr = NULL; int reason = END_CIRC_REASON_TORPROTOCOL; /* Service/circuit/key stuff we can learn before parsing */ @@ -1596,8 +1597,10 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /* Find the rendezvous point */ rp = find_rp_for_intro(parsed_req, &err_msg); - if (!rp) + if (!rp) { + err_msg_severity = LOG_PROTOCOL_WARN; goto log_error; + } /* Check if we'd refuse to talk to this router */ if (options->StrictNodes && @@ -1735,7 +1738,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, } } - log_warn(LD_REND, "%s on circ %u", err_msg, + log_fn(err_msg_severity, LD_REND, "%s on circ %u", err_msg, (unsigned)circuit->base_.n_circ_id); err: status = -1; @@ -1797,7 +1800,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro, if (!rp) { if (err_msg_out) { tor_asprintf(&err_msg, - "Could build extend_info_t for router %s named " + "Couldn't build extend_info_t for router %s named " "in INTRODUCE2 cell", escaped_safe_str_client(rp_nickname)); } @@ -1833,8 +1836,10 @@ find_rp_for_intro(const rend_intro_cell_t *intro, goto done; err: - if (err_msg_out) *err_msg_out = err_msg; - else tor_free(err_msg); + if (err_msg_out) + *err_msg_out = err_msg; + else + tor_free(err_msg); done: return rp;

1 0

[tor/master] Merge branch 'bug18761_028_squashed' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 May '16

commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 11 May '16

11 May '16

commit 71267bef4c64b791346f8cdd54f3be4cc3fc38ca Merge: 79f9e63 28e1aa1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:36:55 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.8] Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN.
by nickm＠torproject.org 11 May '16

11 May '16

commit b59d79134e1089d310278a70788401835c1e5c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:46:44 2016 -0400 Log find_rp_for_intro_() failures at LOG_PROTOCOL_WARN. Closes ticket 18761. Also fix a whitespace issue. --- changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changes/bug18761 b/changes/bug18761 new file mode 100644 index 0000000..78500a8 --- /dev/null +++ b/changes/bug18761 @@ -0,0 +1,3 @@ + o Minor feature (logging): + - When rejecting a misformed INTRODUCE2 cell, only log at PROTOCOL_WARN + severity. Closes ticket 18761. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 39e5831..6f41f3b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1445,6 +1445,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, int status = 0, result; const or_options_t *options = get_options(); char *err_msg = NULL; + int err_msg_severity = LOG_WARN; const char *stage_descr = NULL; int reason = END_CIRC_REASON_TORPROTOCOL; /* Service/circuit/key stuff we can learn before parsing */ @@ -1596,8 +1597,10 @@ rend_service_receive_introduction(origin_circuit_t *circuit, /* Find the rendezvous point */ rp = find_rp_for_intro(parsed_req, &err_msg); - if (!rp) + if (!rp) { + err_msg_severity = LOG_PROTOCOL_WARN; goto log_error; + } /* Check if we'd refuse to talk to this router */ if (options->StrictNodes && @@ -1735,7 +1738,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, } } - log_warn(LD_REND, "%s on circ %u", err_msg, + log_fn(err_msg_severity, LD_REND, "%s on circ %u", err_msg, (unsigned)circuit->base_.n_circ_id); err: status = -1; @@ -1797,7 +1800,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro, if (!rp) { if (err_msg_out) { tor_asprintf(&err_msg, - "Could build extend_info_t for router %s named " + "Couldn't build extend_info_t for router %s named " "in INTRODUCE2 cell", escaped_safe_str_client(rp_nickname)); } @@ -1833,8 +1836,10 @@ find_rp_for_intro(const rend_intro_cell_t *intro, goto done; err: - if (err_msg_out) *err_msg_out = err_msg; - else tor_free(err_msg); + if (err_msg_out) + *err_msg_out = err_msg; + else + tor_free(err_msg); done: return rp;

1 0

[tor/maint-0.2.8] Merge branch 'bug18761_028_squashed' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 May '16

commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc Merge: e71dfb6 b59d791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:36:27 2016 -0400 Merge branch 'bug18761_028_squashed' into maint-0.2.8 changes/bug18761 | 3 +++ src/or/rendservice.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor/master] Use the consensus download schedule for authority certificates
by nickm＠torproject.org 11 May '16

11 May '16

commit 64b948f5fa0099ddabcf0c63e437cc8e7373ef38 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 4 13:05:18 2016 +1000 Use the consensus download schedule for authority certificates Previously, we were using the generic schedule for some downloads, and the consensus schedule for others. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. --- changes/bug18816 | 4 ++++ src/or/routerlist.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 new file mode 100644 index 0000000..7265f5a --- /dev/null +++ b/changes/bug18816 @@ -0,0 +1,4 @@ + o Minor bugfix (bootstrap): + - Consistently use the consensus download schedule for + authority certificates. + Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1c275a6..85e9e7d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -148,6 +148,22 @@ get_n_authorities(dirinfo_type_t type) return n; } +/** Initialise schedule, want_authority, and increment on in the download + * status dlstatus, then call download_status_reset() on it. + * It is safe to call this function or download_status_reset() multiple times + * on a new dlstatus. But it should *not* be called after a dlstatus has been + * used to count download attempts or failures. */ +static void +download_status_cert_init(download_status_t *dlstatus) +{ + dlstatus->schedule = DL_SCHED_CONSENSUS; + dlstatus->want_authority = DL_WANT_ANY_DIRSERVER; + dlstatus->increment_on = DL_SCHED_INCREMENT_FAILURE; + + /* Use the new schedule to set next_attempt_at */ + download_status_reset(dlstatus); +} + /** Reset the download status of a specified element in a dsmap */ static void download_status_reset_by_sk_in_cl(cert_list_t *cl, const char *digest) @@ -168,6 +184,7 @@ download_status_reset_by_sk_in_cl(cert_list_t *cl, const char *digest) /* Insert before we reset */ dlstatus = tor_malloc_zero(sizeof(*dlstatus)); dsmap_set(cl->dl_status_map, digest, dlstatus); + download_status_cert_init(dlstatus); } tor_assert(dlstatus); /* Go ahead and reset it */ @@ -206,7 +223,7 @@ download_status_is_ready_by_sk_in_cl(cert_list_t *cl, * too. */ dlstatus = tor_malloc_zero(sizeof(*dlstatus)); - download_status_reset(dlstatus); + download_status_cert_init(dlstatus); dsmap_set(cl->dl_status_map, digest, dlstatus); rv = 1; } @@ -225,7 +242,7 @@ get_cert_list(const char *id_digest) cl = digestmap_get(trusted_dir_certs, id_digest); if (!cl) { cl = tor_malloc_zero(sizeof(cert_list_t)); - cl->dl_status_by_id.schedule = DL_SCHED_CONSENSUS; + download_status_cert_init(&cl->dl_status_by_id); cl->certs = smartlist_new(); cl->dl_status_map = dsmap_new(); digestmap_set(trusted_dir_certs, id_digest, cl);

1 0

[tor/master] Switch between fallback and authority when auth cert fetch fails
by nickm＠torproject.org 11 May '16

11 May '16

commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 4 15:41:37 2016 +1000 Switch between fallback and authority when auth cert fetch fails --- changes/bug18816 | 2 ++ src/or/routerlist.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug18816 b/changes/bug18816 index 7265f5a..0545512 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,4 +1,6 @@ o Minor bugfix (bootstrap): - Consistently use the consensus download schedule for authority certificates. + - When downloading authority certificates fails, switch from + using a fallback to using an authority. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 85e9e7d..3169343 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,11 +912,14 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fps) > 1) { + static int want_auth = 0; resource = smartlist_join_strings(fps, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -958,11 +961,14 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fp_pairs) > 1) { + static int want_auth = 0; resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); + want_auth ? DL_WANT_AUTHORITY + : DL_WANT_ANY_DIRSERVER); + /* on failure, swap between using fallbacks and authorities */ + want_auth = !want_auth; tor_free(resource); } /* else they were all pending */

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8
by nickm＠torproject.org 11 May '16

11 May '16

commit e71dfb6344c0480523a1fef0a77bd3d270d62e26 Merge: 50249c7 92d7ee0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:28:37 2016 -0400 Merge remote-tracking branch 'teor/bug18816-squashed' into maint-0.2.8 changes/bug18816 | 6 ++++++ src/or/routerlist.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 11 May '16

11 May '16

commit 79f9e63ebf2bbe855af381cb49d5fbeb47ec0880 Merge: e31980f e71dfb6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:30:18 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18816 | 6 ++++++ src/or/routerlist.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-)

1 0