- tor-commits - lists.torproject.org

[tor/master] routerlist: Choose bridges for direct bridge connections
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 73ace125a972c421287503738e9599f411193e1a Author: teor <teor(a)riseup.net> Date: Wed May 13 13:47:52 2020 +1000 routerlist: Choose bridges for direct bridge connections When counting and choosing nodes on a client that uses bridges, only choose bridges for direct connections. Part of 34200. --- src/feature/nodelist/routerlist.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index f606e3c18..ece3379fa 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -516,11 +516,19 @@ routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2) * The following conditions are applied to all nodes: * - is running; * - is valid; - * - has a general-purpose routerinfo; * - supports EXTEND2 cells; * - has an ntor circuit crypto key; and * - does not allow single-hop exits. * + * If the node has a routerinfo, we're checking for a direct connection, and + * we're using bridges, the following condition is applied: + * - has a bridge-purpose routerinfo; + * and for all other nodes: + * - has a general-purpose routerinfo (or no routerinfo). + * + * Nodes that don't have a routerinfo must be general-purpose nodes, because + * routerstatuses and microdescriptors only come via consensuses. + * * The flags chech that node: * - CRN_NEED_UPTIME: has more than a minimum uptime; * - CRN_NEED_CAPACITY: has more than a minimum capacity; @@ -550,16 +558,21 @@ router_can_choose_node(const node_t *node, int flags) const bool rendezvous_v3 = (flags & CRN_RENDEZVOUS_V3) != 0; const bool initiate_ipv6_extend = (flags & CRN_INITIATE_IPV6_EXTEND) != 0; + const or_options_t *options = get_options(); const bool check_reach = - !router_or_conn_should_skip_reachable_address_check(get_options(), - pref_addr); + !router_or_conn_should_skip_reachable_address_check(options, pref_addr); + const bool direct_bridge = direct_conn && options->UseBridges; if (!node->is_running || !node->is_valid) return false; if (need_desc && !node_has_preferred_descriptor(node, direct_conn)) return false; - if (node->ri && node->ri->purpose != ROUTER_PURPOSE_GENERAL) - return false; + if (node->ri) { + if (direct_bridge && node->ri->purpose != ROUTER_PURPOSE_BRIDGE) + return false; + else if (node->ri->purpose != ROUTER_PURPOSE_GENERAL) + return false; + } if (node_is_unreliable(node, need_uptime, need_capacity, need_guard)) return false; /* Don't choose nodes if we are certain they can't do EXTEND2 cells */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1888/head'
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 354f085e5f14c2bb4918b015e36cdc72748e0ea6 Merge: eaae5625c 1df451aba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 15:44:58 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1888/head' changes/bug34248 | 4 + changes/bug34251 | 4 + changes/ticket33222 | 8 + changes/ticket34200 | 3 + doc/tor.1.txt | 6 +- scripts/maint/practracker/exceptions.txt | 14 +- src/core/or/circuitbuild.c | 190 +++++++++------- src/core/or/circuitbuild.h | 4 + src/core/or/circuitlist.c | 2 +- src/core/or/circuituse.c | 22 +- src/core/or/circuituse.h | 16 +- src/core/or/cpath_build_state_st.h | 2 + src/core/or/or.h | 21 +- src/core/or/protover.c | 11 +- src/core/or/protover.h | 24 +- src/core/or/versions.c | 55 ++++- src/feature/control/control_getinfo.c | 17 +- src/feature/nodelist/node_select.c | 152 ++++++------- src/feature/nodelist/node_select.h | 28 ++- src/feature/nodelist/node_st.h | 5 +- src/feature/nodelist/nodelist.c | 76 +++++-- src/feature/nodelist/nodelist.h | 16 +- src/feature/nodelist/routerinfo.c | 35 ++- src/feature/nodelist/routerinfo.h | 5 +- src/feature/nodelist/routerlist.c | 150 +++++++++--- src/feature/nodelist/routerlist.h | 14 +- src/feature/relay/relay_periodic.c | 4 +- src/feature/relay/router.c | 21 +- src/feature/relay/selftest.c | 231 +++++++++++++------ src/feature/relay/selftest.h | 10 +- src/feature/stats/predict_ports.c | 4 +- src/lib/net/address.c | 36 ++- src/lib/net/address.h | 2 + src/rust/protover/ffi.rs | 10 +- src/rust/protover/protover.rs | 8 +- src/test/test_circuitbuild.c | 377 ++++++++++++++++++++++++++++++- src/test/test_circuitstats.c | 95 ++++---- src/test/test_helpers.c | 62 ++++- src/test/test_helpers.h | 5 + src/test/test_protover.c | 331 ++++++++++++++++++++++++--- 40 files changed, 1595 insertions(+), 485 deletions(-) diff --cc src/feature/relay/relay_periodic.c index 08ad110cf,2b6be1ce1..6a92f49d2 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@@ -201,36 -201,31 +201,36 @@@ reachability_warnings_callback(time_t n have_completed_a_circuit()) { /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); - if (me && !check_whether_orport_reachable(options)) { + if (me && !router_should_skip_orport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " - "its ORPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->or_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED ORADDRESS=%s:%d", - address, me->or_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that " + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->or_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED ORADDRESS=%s:%d", + address, me->or_port); + tor_free(address); + } } - if (me && !check_whether_dirport_reachable(options)) { + if (me && !router_should_skip_dirport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG, - "Your server (%s:%d) has not managed to confirm that its " - "DirPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->dir_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED DIRADDRESS=%s:%d", - address, me->dir_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that its " + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->dir_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED DIRADDRESS=%s:%d", + address, me->dir_port); + tor_free(address); + } } } diff --cc src/feature/relay/selftest.c index 18fe25b98,ae5633bfb..2b0fc951b --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@@ -224,30 -303,40 +303,41 @@@ inform_testing_reachability(void const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; + - address = tor_dup_ip(me->addr); - if (!address) - return 0; - + /* IPv4 ORPort */ + strlcpy(ipv4_or_buf, fmt_addr32_port(me->addr, me->or_port), + sizeof(ipv4_or_buf)); control_event_server_status(LOG_NOTICE, - "CHECKING_REACHABILITY ORADDRESS=%s:%d", - address, me->or_port); + "CHECKING_REACHABILITY ORADDRESS=%s", + ipv4_or_buf); + /* IPv6 ORPort */ + const bool has_ipv6 = tor_addr_port_is_valid(&me->ipv6_addr, + me->ipv6_orport, 0); + if (has_ipv6) { + strlcpy(ipv6_or_buf, fmt_addrport(&me->ipv6_addr, me->ipv6_orport), + sizeof(ipv6_or_buf)); + /* We'll add an IPv6 control event in #34068. */ + } + /* IPv4 DirPort (there are no advertised IPv6 DirPorts) */ if (me->dir_port) { - tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", - address, me->dir_port); + strlcpy(ipv4_dir_buf, fmt_addr32_port(me->addr, me->dir_port), + sizeof(ipv4_dir_buf)); control_event_server_status(LOG_NOTICE, - "CHECKING_REACHABILITY DIRADDRESS=%s:%d", - address, me->dir_port); + "CHECKING_REACHABILITY DIRADDRESS=%s", + ipv4_dir_buf); } - log_notice(LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... " - "(this may take up to %d minutes -- look for log " - "messages indicating success)", - address, me->or_port, - me->dir_port ? dirbuf : "", - me->dir_port ? "are" : "is", - TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); - - tor_free(address); + log_notice(LD_OR, "Now checking whether ORPort%s %s%s%s%s%s %s reachable... " + "(this may take up to %d minutes -- look for log " + "messages indicating success)", + has_ipv6 ? "s" : "", + ipv4_or_buf, + has_ipv6 ? " and " : "", + has_ipv6 ? ipv6_or_buf : "", + me->dir_port ? " and DirPort " : "", + me->dir_port ? ipv4_dir_buf : "", + has_ipv6 || me->dir_port ? "are" : "is", + TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); + return 1; }

1 0

[tor/master] changes: file for 34200
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 1df451aba116f77a5a24e4e54cf343ec46d55f9a Author: teor <teor(a)riseup.net> Date: Mon May 18 22:12:26 2020 +1000 changes: file for 34200 --- changes/ticket34200 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket34200 b/changes/ticket34200 new file mode 100644 index 000000000..b984bd83b --- /dev/null +++ b/changes/ticket34200 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor some common node selection code into a single function. + Closes ticket 34200.

1 0

[tor/master] Merge branch 'ticket34375'
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit ca8b04f194e827162a5f054e33d108b4bbc1372d Merge: d2f136aab 811853c67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 14:16:21 2020 -0400 Merge branch 'ticket34375' scripts/git/git-list-tor-branches.sh | 3 --- 1 file changed, 3 deletions(-)

1 0

[tor/master] Remove 0.4.1 from list of tor branches used by git scripts.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 811853c67719bf2e8817d2e4256f715016a03345 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 3 14:54:21 2020 -0400 Remove 0.4.1 from list of tor branches used by git scripts. --- scripts/git/git-list-tor-branches.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index d6b30f064..b50365590 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -139,9 +139,6 @@ finish() { branch maint-0.3.5 branch release-0.3.5 -branch maint-0.4.1 -branch release-0.4.1 - branch maint-0.4.2 branch release-0.4.2

1 0

[tor/master] Add 0.4.4 to list of tor branches used by git scripts.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit eaae5625cb1c5fdd26c766157742725aa4b7ad9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 14:17:15 2020 -0400 Add 0.4.4 to list of tor branches used by git scripts. --- scripts/git/git-list-tor-branches.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index b50365590..b0c30d2e8 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -145,6 +145,9 @@ branch release-0.4.2 branch maint-0.4.3 branch release-0.4.3 +branch maint-0.4.4 +branch release-0.4.4 + branch master finish

1 0

[tor/master] Bump version to 0.4.5.0-alpha-dev
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit d2f136aab1f7d76a458e834bd791cbb887c96b51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 14:14:43 2020 -0400 Bump version to 0.4.5.0-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6942db159..dcd1ce7e7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.4.0-alpha-dev]) +AC_INIT([tor],[0.4.5.0-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-02-11"], # for 0.4.4.0-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-06-09"], # for 0.4.5.0-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index fb13a2eb3..8ca918b15 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.4.0-alpha-dev" +!define VERSION "0.4.5.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 3c8f91d53..3c7b2ab5f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.4.0-alpha-dev" +#define VERSION "0.4.5.0-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 09 Jun '20

09 Jun '20

commit d83e2f21ab7b96b1950776aa22da0579a4324756 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 9 17:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index af821347f2..10eb73a141 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -11,7 +11,7 @@ <!ENTITY aboutTor.ready.label "プライベートなブラウジングを開始"> <!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを行うための準備が完了しました。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> -<!ENTITY aboutTor.failure2.label "Tor は、このブラウザでは動作しません。"> +<!ENTITY aboutTor.failure2.label "Tor は、現在このブラウザで動作していません。"> <!ENTITY aboutTor.search.label "DuckDuckGo で検索"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">

1 0

[onionperf/master] Adds arbitrary traffic model documentation
by karsten＠torproject.org 09 Jun '20

09 Jun '20

commit 2c19e9475dd89771bc6f417f86676c350dd643c4 Author: Ana Custura <ana(a)netstat.org.uk> Date: Sat Jun 6 15:04:46 2020 +0100 Adds arbitrary traffic model documentation --- README.md | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/README.md b/README.md index a3905f4..eee945f 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,101 @@ specific log files from the `log_rotate` directories. You can also plot the meas results from the `json` files by running in `onionperf visualize` mode. See below for more details. +#### Measure Tor using arbitrary traffic models + +OnionPerf uses `tgen` to serve and fetch data through Tor. By default, the +traffic is generated using a bulk download model: each transfer performed is +5MB in size, and transfers are spaced 5 minutes apart. + +The class `TorPerfModel` defined in `onionperf/model.py` is used to generate +this traffic model at runtime: + +``` +class TorperfModel(GeneratableTGenModel): + + def __init__(self, tgen_port="8889", tgen_servers=["127.0.0.1:8888"], socksproxy=None): + self.tgen_port = tgen_port + self.tgen_servers = tgen_servers + self.socksproxy = socksproxy + self.graph = self.generate() + + def generate(self): + server_str = ','.join(self.tgen_servers) + g = DiGraph() + + if self.socksproxy is not None: + g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute", socksproxy=self.socksproxy) + else: + g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") + g.add_node("pause", time="5 minutes") + g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="270 seconds", stallout="0 seconds") + g.add_edge("start", "pause") + g.add_edge("pause", "pause") + g.add_edge("pause", "transfer5m") + + return g +``` + +Although OnionPerf does not currently support other TGen traffic models out of +the box, it is possible to modify the code shown above to change the +behaviour of the default model. + +All graph nodes and edges added after the "start" node can be redefined to model +any custom traffic behaviour. Refer to the [TGen +documentation](https://github.com/shadow/tgen/blob/master/doc/TGen-Overview.md) +and [list of traffic model graph +examples](https://github.com/shadow/tgen/blob/master/tools/scripts/generate_tgen_config.py). +For example, to model web traffic behaviour, the class can be modified as follows: + +``` +class TorperfModel(GeneratableTGenModel): + + def __init__(self, tgen_port="8889", tgen_servers=["127.0.0.1:8888"], socksproxy=None): + self.tgen_port = tgen_port + self.tgen_servers = tgen_servers + self.socksproxy = socksproxy + self.graph = self.generate() + + def generate(self): + server_str = ','.join(self.tgen_servers) + g = DiGraph() + + if self.socksproxy is not None: + g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute", socksproxy=self.socksproxy) + else: + g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") + + g.add_node("streamA", sendsize="1 kib", recvsize="1 mib") + g.add_node("streamB1", sendsize="10 kib", recvsize="1 mib") + g.add_node("streamB2", sendsize="100 kib", recvsize="10 mib") + g.add_node("streamB3", sendsize="1 mib", recvsize="100 mib") + + g.add_node("pause_sync") + g.add_node("pause", time="1,2,3,4,5,6,7,8,9,10") + g.add_node("end", time="1 minute", count="30", recvsize="1 GiB", sendsize="1 GiB") + + # a small first round request + g.add_edge("start", "streamA") + # second round requests in parallel + g.add_edge("streamA", "streamB1") + g.add_edge("streamA", "streamB2") + g.add_edge("streamA", "streamB3") + # wait for both second round streams to finish + g.add_edge("streamB1", "pause_sync") + g.add_edge("streamB2", "pause_sync") + g.add_edge("streamB3", "pause_sync") + # check if we should stop + g.add_edge("pause_sync", "end") + g.add_edge("end", "pause") + g.add_edge("pause", "start") + + return g +``` + +The new traffic model will only be used for measurements once OnionPerf is reinstalled. + +Note that custom code may be required to analyze the log files and visualize the data. + ### Analyze and Visualize Results OnionPerf runs the data it collects through `analyze` mode every night at midnight to

1 0

[community/master] Update pluggable transport link
by gus＠torproject.org 09 Jun '20

09 Jun '20

commit d3713f649c4e1dc18ef1fad2e43e2519b283b120 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sun Jun 7 20:57:29 2020 +0000 Update pluggable transport link --- content/relay-operations/types-of-relays/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr index c4ca5e8..dccab39 100644 --- a/content/relay-operations/types-of-relays/contents.lr +++ b/content/relay-operations/types-of-relays/contents.lr @@ -60,7 +60,7 @@ Tor bridges are nodes in the network that are not listed in the public Tor direc Bridges are useful for Tor users under oppressive regimes or for people who want an extra layer of security because they're worried somebody will recognize that they are contacting a public Tor relay IP address. Several countries, including China and Iran, have found ways to detect and block connections to Tor bridges. -[Pluggable transports](https://2019.www.torproject.org/docs/pluggable-transports.html.…, a special kind of bridge, address this by adding an additional layer of obfuscation. +[Pluggable transports](https://tb-manual.torproject.org/circumvention/), a special kind of bridge, address this by adding an additional layer of obfuscation. Bridges are relatively easy, low-risk and low bandwidth Tor nodes to operate, but they have a big impact on users. A bridge isn't likely to receive any abuse complaints, and since bridges are not listed in the public consensus, they are unlikely to be blocked by popular services.

1 0