August 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Treat all extorport connections with un-set addresses as remote
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit ceb6585a4bc2beadde2fb194395711e72ee8559d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 15:20:41 2020 -0400 Treat all extorport connections with un-set addresses as remote Without this fix, if an PT forgets to send a USERADDR command, that results in a connection getting treated as local for the purposes of rate-limiting. If the PT _does_ use USERADDR, we still believe it. Closes ticket 33747. --- changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 5 ++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/changes/ticket33747 b/changes/ticket33747 new file mode 100644 index 0000000000..57c72e9d0a --- /dev/null +++ b/changes/ticket33747 @@ -0,0 +1,7 @@ + o Minor bugfixes (rate limiting, bridges, pluggable transports): + - On a bridge, treat all connections from an ExtORPort as remote + by default for the purposes of rate-limiting. Previously, + bridges would treat the connection as local unless they explicitly + received a "USERADDR" command. ExtORPort connections still + count as local if there is a USERADDR command with an explicit local + address. Fixes bug 33747; bugfix on 0.2.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3595bba85c..e895f8a73d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -379,8 +379,12 @@ or_connection_new(int type, int socket_family) connection_or_set_canonical(or_conn, 0); - if (type == CONN_TYPE_EXT_OR) + if (type == CONN_TYPE_EXT_OR) { + /* If we aren't told an address for this connection, we should + * presume it isn't local, and should be rate-limited. */ + TO_CONN(or_conn)->always_rate_limit_as_remote = 1; connection_or_set_ext_or_identifier(or_conn); + } return or_conn; } @@ -3025,6 +3029,7 @@ connection_is_rate_limited(connection_t *conn) if (conn->linked) return 0; /* Internal connection */ else if (! options->CountPrivateBandwidth && + ! conn->always_rate_limit_as_remote && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_family(&conn->addr) == AF_UNIX || /* no address */ tor_addr_is_internal(&conn->addr, 0))) diff --git a/src/core/or/connection_st.h b/src/core/or/connection_st.h index d1430eda14..c197a81340 100644 --- a/src/core/or/connection_st.h +++ b/src/core/or/connection_st.h @@ -64,6 +64,9 @@ struct connection_t { /** True if connection_handle_write is currently running on this connection. */ unsigned int in_connection_handle_write:1; + /** If true, then we treat this connection as remote for the purpose of + * rate-limiting, no matter what its address is. */ + unsigned int always_rate_limit_as_remote:1; /* For linked connections: */ diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 56c5bb96f5..136aee3084 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -494,6 +494,10 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, } conn->address = tor_addr_to_str_dup(&addr); + /* Now that we know the address, we don't have to manually override rate + * limiting. */ + conn->always_rate_limit_as_remote = 0; + return 0; } @@ -659,4 +663,3 @@ ext_orport_free_all(void) if (ext_or_auth_cookie) /* Free the auth cookie */ tor_free(ext_or_auth_cookie); } -

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 Merge: 4c22050de1 ceb6585a4b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 3 16:48:52 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4 changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-)

1 0

[tor/master] Treat all extorport connections with un-set addresses as remote
by asn＠torproject.org 03 Aug '20

03 Aug '20

commit ceb6585a4bc2beadde2fb194395711e72ee8559d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 15:20:41 2020 -0400 Treat all extorport connections with un-set addresses as remote Without this fix, if an PT forgets to send a USERADDR command, that results in a connection getting treated as local for the purposes of rate-limiting. If the PT _does_ use USERADDR, we still believe it. Closes ticket 33747. --- changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 5 ++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/changes/ticket33747 b/changes/ticket33747 new file mode 100644 index 0000000000..57c72e9d0a --- /dev/null +++ b/changes/ticket33747 @@ -0,0 +1,7 @@ + o Minor bugfixes (rate limiting, bridges, pluggable transports): + - On a bridge, treat all connections from an ExtORPort as remote + by default for the purposes of rate-limiting. Previously, + bridges would treat the connection as local unless they explicitly + received a "USERADDR" command. ExtORPort connections still + count as local if there is a USERADDR command with an explicit local + address. Fixes bug 33747; bugfix on 0.2.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3595bba85c..e895f8a73d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -379,8 +379,12 @@ or_connection_new(int type, int socket_family) connection_or_set_canonical(or_conn, 0); - if (type == CONN_TYPE_EXT_OR) + if (type == CONN_TYPE_EXT_OR) { + /* If we aren't told an address for this connection, we should + * presume it isn't local, and should be rate-limited. */ + TO_CONN(or_conn)->always_rate_limit_as_remote = 1; connection_or_set_ext_or_identifier(or_conn); + } return or_conn; } @@ -3025,6 +3029,7 @@ connection_is_rate_limited(connection_t *conn) if (conn->linked) return 0; /* Internal connection */ else if (! options->CountPrivateBandwidth && + ! conn->always_rate_limit_as_remote && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_family(&conn->addr) == AF_UNIX || /* no address */ tor_addr_is_internal(&conn->addr, 0))) diff --git a/src/core/or/connection_st.h b/src/core/or/connection_st.h index d1430eda14..c197a81340 100644 --- a/src/core/or/connection_st.h +++ b/src/core/or/connection_st.h @@ -64,6 +64,9 @@ struct connection_t { /** True if connection_handle_write is currently running on this connection. */ unsigned int in_connection_handle_write:1; + /** If true, then we treat this connection as remote for the purpose of + * rate-limiting, no matter what its address is. */ + unsigned int always_rate_limit_as_remote:1; /* For linked connections: */ diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 56c5bb96f5..136aee3084 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -494,6 +494,10 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, } conn->address = tor_addr_to_str_dup(&addr); + /* Now that we know the address, we don't have to manually override rate + * limiting. */ + conn->always_rate_limit_as_remote = 0; + return 0; } @@ -659,4 +663,3 @@ ext_orport_free_all(void) if (ext_or_auth_cookie) /* Free the auth cookie */ tor_free(ext_or_auth_cookie); } -

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 03 Aug '20

03 Aug '20

commit 2552b6fbc272e8ead75c86ec9028b0ef3da668b1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 3 13:46:59 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/contents+it.po b/contents+it.po index 4ba594007d..d2190d61c1 100644 --- a/contents+it.po +++ b/contents+it.po @@ -617,9 +617,8 @@ msgid "" "help solving the problem." msgstr "" "Se la tua connessione è relativamente veloce, ma questa barra sembra " -"bloccarsi ad un certo punto, vedi la pagina " -"[Troubleshooting](../troubleshooting) per assistenza con la risoluzione del " -"problema " +"bloccarsi ad un certo punto, visita la pagina [Troubleshooting " +"(it/troubleshooting) per trovare l'aiuto necessario. " #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -706,9 +705,9 @@ msgid "" "system." msgstr "" "La seconda casella di spunta chiede se la tua connessione utilizza un proxy." -" Nella maggior parte dei casi, questo non è necessario. Normalmente, saprai " -"se devi spuntare questa casella, perchè le impostazioni saranno le stesse " -"degli altri browser nel tuo sistema. " +" Nella maggior parte dei casi, questo non è necessario. Normalmente, " +"dovresti sapere se devi spuntare questa casella, perchè le impostazioni sono" +" le stesse degli altri browser nel tuo sistema. " #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -866,7 +865,7 @@ msgid "" "To use a pluggable transport, click \"Configure\" when starting Tor Browser " "for the first time." msgstr "" -"Per utilizzare un trasporto collegabile, clicca \"configura\" quando avvii " +"Per utilizzare un trasporto collegabile, clicca \"Configura\" quando avvii " "il browser Tor per la prima volta. " #: https//tb-manual.torproject.org/circumvention/ @@ -902,7 +901,7 @@ msgid "" "Or, if you have Tor Browser running, click on \"Preferences\" in the " "hamburger menu and then on \"Tor\" in the sidebar." msgstr "" -"Oppure, se stai usando Tor Browser, fai clic su \"Preferenze\" nel menù " +"Oppure, se stai usando Tor Browser, fai clic su \"Preferenze\" nel menu " "hamburger e poi su \"Tor\" nella barra laterale." #: https//tb-manual.torproject.org/circumvention/ @@ -912,8 +911,8 @@ msgid "" "the option \"Select a built-in bridge,\" choose whichever pluggable " "transport you'd like to use from the dropdown." msgstr "" -"Nella sezione \"Bridge\", seleziona la casella \"Usa un bridge\" e " -"dall'opzione \"Seleziona un bridge incorporato\", scegli il trasporto " +"Nella sezione \"Bridge\", seleziona la casella \"Usa un bridge\", poi " +"dall'opzione \"Seleziona un bridge incorporato\" scegli il trasporto " "collegabile che desideri utilizzare dal menu a discesa." #: https//tb-manual.torproject.org/circumvention/ @@ -954,7 +953,7 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "need to request a bridge or manually enter bridge addresses." msgstr "" -"Se provi tutte queste opzioni e nessuna di esse ti connette, dovrai " +"Se provi tutte queste opzioni e nessuna di esse ti fa connettere, dovrai " "richiedere un bridge o inserirne manualmente gli indirizzi." #: https//tb-manual.torproject.org/circumvention/ @@ -963,8 +962,8 @@ msgid "" "Read the [Bridges](../bridges/) section to learn what bridges are and how to" " obtain them." msgstr "" -"Leggi la sezione [Bridges](../bridges/) per imparare cosa sono i bridge e " -"come ottenerli." +"Leggi la sezione [Bridges](../bridges/) per capire cosa sono i bridge e come" +" ottenerli." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) @@ -2640,8 +2639,8 @@ msgid "" "Bridge relays are Tor relays that are not listed in the public Tor " "directory." msgstr "" -"I relay ponti sono dei relay che non sono indicati nell'elenco pubblico di " -"Tor." +"I bridge (o \"ponti\") sono dei relay che non sono presenti nell'elenco " +"pubblico di Tor." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2650,8 +2649,8 @@ msgid "" "who want an extra layer of security because they're worried somebody will " "recognize that they are contacting a public Tor relay IP address." msgstr "" -"I ponti sono utili per gli utenti Tor che si trovano in regimi oppressivi e " -"per le persone che desiderano avere un livello aggiuntivo di sicurezza " +"I bridge sono utili per gli utenti Tor che si trovano in regimi oppressivi, " +"e per le persone che desiderano avere un livello aggiuntivo di sicurezza, " "perché sono preoccupati che qualcuno possa accorgersi che si stanno " "connettendo ad un indirizzo IP di un relay pubblico di Tor." @@ -3215,7 +3214,7 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)." msgstr "" -"[Scopri di più riguardo l'Onion Browser](https://blog.torproject.org/tor-" +"[Scopri di più riguardo Onion Browser](https://blog.torproject.org/tor-" "heart-onion-browser-and-more-ios-tor)." #: https//tb-manual.torproject.org/mobile-tor/

1 0

[tor/master] rust/protover: remove redundant test
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 419ea2f813c83a2065396ac085c9525dd2e1f137 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Feb 9 01:01:25 2020 +0000 rust/protover: remove redundant test commit 15e59a1fedf47e7e689e06e5649849552d8b8c0d added a test for parsing an empty string twice. --- src/rust/protover/protover.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 2661d811c4..383a781fdc 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -874,11 +874,6 @@ mod test { assert_protoentry_is_unparseable!("Desc=1-4294967295"); } - #[test] - fn test_protoentry_from_str_() { - assert_protoentry_is_unparseable!(""); - } - #[test] fn test_protoentry_all_supported_single_protocol_single_version() { let protocol: UnvalidatedProtoEntry = "Cons=1".parse().unwrap();

1 0

[tor/master] dirparse: reject votes with malformed routerstatus entries
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 5d330997f690845fadbd71f71f26a2ea464cd1ab Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 20:10:40 2020 +0000 dirparse: reject votes with malformed routerstatus entries --- src/feature/dirparse/ns_parse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 109eebeb66..7cb92ebe59 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1432,6 +1432,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, smartlist_add(ns->routerstatus_list, rs); } else { vote_routerstatus_free(rs); + goto err; // Malformed routerstatus, reject this vote. } } else { routerstatus_t *rs; @@ -1441,6 +1442,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, flav))) { /* Use exponential-backoff scheduling when downloading microdescs */ smartlist_add(ns->routerstatus_list, rs); + } else { + goto err; // Malformed routerstatus, reject this vote. } } }

1 0

[tor/master] rust/protover: make test match test name
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 955a050bd20eedbcdc2b96aa257ba30b0cfd3888 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Feb 9 01:10:58 2020 +0000 rust/protover: make test match test name It was just a copypaste of the test above it. Fix on commit 15e59a1fedf47e7e689e06e5649849552d8b8c0d --- src/rust/protover/tests/protover.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rust/protover/tests/protover.rs b/src/rust/protover/tests/protover.rs index 942fe3c6ab..cf0fb5bd3a 100644 --- a/src/rust/protover/tests/protover.rs +++ b/src/rust/protover/tests/protover.rs @@ -78,7 +78,7 @@ fn parse_protocol_unvalidated_with_empty() { #[test] #[should_panic] fn parse_protocol_validated_with_empty() { - let _: UnvalidatedProtoEntry = "".parse().unwrap(); + let _: ProtoEntry = "".parse().unwrap(); } #[test]

1 0

[tor/master] rust/protover: parse empty string into empty *ProtoEntry
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 44facb83d5b8801ec53135fab8a1f610d468fcd1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sun Feb 9 01:15:18 2020 +0000 rust/protover: parse empty string into empty *ProtoEntry Contrary to what 15e59a1fedf47e7e689e06e5649849552d8b8c0d said, the C implementation has always accepted an empty string without complaint. Meanwhile the rust implementation has always given an error. Make the rust implementation match C. Also eliminate some more redundant tests. Fix on 0.3.3.1-alpha. --- src/rust/protover/protover.rs | 12 +++++++++++- src/rust/protover/tests/protover.rs | 13 ------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 383a781fdc..14a70cd42b 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -245,6 +245,11 @@ impl FromStr for ProtoEntry { /// Otherwise, the `Err` value of this `Result` is a `ProtoverError`. fn from_str(protocol_entry: &str) -> Result<ProtoEntry, ProtoverError> { let mut proto_entry: ProtoEntry = ProtoEntry::default(); + + if protocol_entry.is_empty() { + return Ok(proto_entry); + } + let entries = protocol_entry.split(' '); for entry in entries { @@ -493,6 +498,10 @@ impl UnvalidatedProtoEntry { ) -> Result<Vec<(&'a str, &'a str)>, ProtoverError> { let mut protovers: Vec<(&str, &str)> = Vec::new(); + if protocol_string.is_empty() { + return Ok(protovers); + } + for subproto in protocol_string.split(' ') { let mut parts = subproto.splitn(2, '='); @@ -851,7 +860,8 @@ mod test { #[test] fn test_protoentry_from_str_empty() { - assert_protoentry_is_unparseable!(""); + assert_protoentry_is_parseable!(""); + assert!(UnvalidatedProtoEntry::from_str("").is_ok()); } #[test] diff --git a/src/rust/protover/tests/protover.rs b/src/rust/protover/tests/protover.rs index cf0fb5bd3a..c97810a6f2 100644 --- a/src/rust/protover/tests/protover.rs +++ b/src/rust/protover/tests/protover.rs @@ -69,18 +69,6 @@ fn protocol_all_supported_with_one_value() { assert_eq!(true, unsupported.is_none()); } -#[test] -#[should_panic] -fn parse_protocol_unvalidated_with_empty() { - let _: UnvalidatedProtoEntry = "".parse().unwrap(); -} - -#[test] -#[should_panic] -fn parse_protocol_validated_with_empty() { - let _: ProtoEntry = "".parse().unwrap(); -} - #[test] fn protocol_all_supported_with_three_values() { let protocols: UnvalidatedProtoEntry = "LinkAuth=1 Microdesc=1-2 Relay=2".parse().unwrap(); @@ -156,7 +144,6 @@ fn parse_protocol_with_unexpected_characters() { } #[test] -#[should_panic] fn protover_compute_vote_returns_empty_for_empty_string() { let protocols: &[UnvalidatedProtoEntry] = &["".parse().unwrap()]; let listed = ProtoverVote::compute(protocols, &1);

1 0

[tor/master] dirparse: reject routerstatus entries with malformed protover
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit b3affc23ef263a978b89e783f55ad3e37c873b9a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 20:20:54 2020 +0000 dirparse: reject routerstatus entries with malformed protover Contrary to its name, protover_contains_long_protocol_names() detects all parse errors, not just long names. --- src/feature/dirparse/ns_parse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 7cb92ebe59..2354ebf440 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -13,6 +13,7 @@ #include "core/or/or.h" #include "app/config/config.h" +#include "core/or/protover.h" #include "core/or/versions.h" #include "feature/client/entrynodes.h" #include "feature/dirauth/dirvote.h" @@ -451,6 +452,10 @@ routerstatus_parse_entry_from_string(memarea_t *area, } } + // If the protover line is malformed, reject this routerstatus. + if (protocols && protover_contains_long_protocol_names(protocols)) { + goto err; + } summarize_protover_flags(&rs->pv, protocols, version); }

1 0

[tor/master] dirparse: reject votes with invalid recommended/required protocols
by nickm＠torproject.org 03 Aug '20

03 Aug '20

commit 8d89aa5eeaef2c009c7fc8250eacc0ed32ebde64 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Feb 8 21:11:44 2020 +0000 dirparse: reject votes with invalid recommended/required protocols --- src/feature/dirparse/ns_parse.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index ce548b221e..6172a57bbb 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1168,16 +1168,25 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } } + // Reject the vote if any of the protocols lines are malformed. if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->recommended_client_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->recommended_relay_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->required_client_protocols = tor_strdup(tok->args[0]); } if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) { + if (protover_contains_long_protocol_names(tok->args[0])) + goto err; ns->required_relay_protocols = tor_strdup(tok->args[0]); }

1 0