- tor-commits - lists.torproject.org

[torspec/master] Clarify GETINFO status/reachability-succeeded/dir with no DirPort
by nickm＠torproject.org 04 May '16

04 May '16

commit 56b3ef3d71168b76779d9b469955db5deb72e49e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 14:26:08 2016 +1000 Clarify GETINFO status/reachability-succeeded/dir with no DirPort It returns 1 when there's no need for a reachability check. --- control-spec.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index a3c1647..9ce418e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -773,6 +773,8 @@ 0 or 1, depending on whether we've found our ORPort reachable. "status/reachability-succeeded/dir" 0 or 1, depending on whether we've found our DirPort reachable. + 1 if there is no DirPort, and therefore no need for a reachability + check. "status/reachability-succeeded" "OR=" ("0"/"1") SP "DIR=" ("0"/"1") Combines status/reachability-succeeded/*; controllers MUST ignore

1 0

[torspec/master] Merge remote-tracking branch 'teor/bug18851'
by nickm＠torproject.org 04 May '16

04 May '16

commit 4e6f2abdcf82f3773eb6ce4035809b58f04edf50 Merge: 92ff8ba 56b3ef3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 16:24:04 2016 -0400 Merge remote-tracking branch 'teor/bug18851' control-spec.txt | 2 ++ 1 file changed, 2 insertions(+)

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 04 May '16

04 May '16

commit 408b1f7c703b6e92e126f3086d2656ab3c0402b7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 4 20:16:39 2016 +0000 Update translations for tor-messenger-privdtd --- ach/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ach/priv.dtd b/ach/priv.dtd new file mode 100644 index 0000000..7007979 --- /dev/null +++ b/ach/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Done"> \ No newline at end of file

1 0

[tor/maint-0.2.8] Choose the correct address for one-hop connections
by nickm＠torproject.org 04 May '16

04 May '16

commit 0cf90bac2a7136e0abb9fed160f70c543ad8b88a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 16:03:23 2016 +1000 Choose the correct address for one-hop connections After #17840 in 0.2.8.1-alpha, we incorrectly chose an IPv4 address for all DIRIND_ONEHOP directory connections, even if the routerstatus didn't have an IPv4 address. This likely affected bridge clients with IPv6 bridges. Resolves #18921. --- changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/changes/bug18921 b/changes/bug18921 new file mode 100644 index 0000000..934a604 --- /dev/null +++ b/changes/bug18921 @@ -0,0 +1,4 @@ + o Major bugfixes (IPv6 bridges): + - Fix directory address selection for IPv6 bridges. + Resolves #18921, bugfix on #17840 in 0.2.8.1-alpha. + Patch by "teor". diff --git a/src/or/directory.c b/src/or/directory.c index ab9f738..ca3b3e3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -630,7 +630,6 @@ directory_choose_address_routerstatus(const routerstatus_t *status, tor_assert(use_or_ap != NULL); tor_assert(use_dir_ap != NULL); - const int anonymized_connection = dirind_is_anon(indirection); int have_or = 0, have_dir = 0; /* We expect status to have at least one reachable address if we're @@ -652,13 +651,16 @@ directory_choose_address_routerstatus(const routerstatus_t *status, tor_addr_make_null(&use_dir_ap->addr, AF_UNSPEC); use_dir_ap->port = 0; - if (anonymized_connection) { - /* Use the primary (IPv4) OR address if we're making an indirect - * connection. */ - tor_addr_from_ipv4h(&use_or_ap->addr, status->addr); - use_or_ap->port = status->or_port; - have_or = 1; - } else { + /* ORPort connections */ + if (indirection == DIRIND_ANONYMOUS) { + if (status->addr) { + /* Since we're going to build a 3-hop circuit and ask the 2nd relay + * to extend to this address, always use the primary (IPv4) OR address */ + tor_addr_from_ipv4h(&use_or_ap->addr, status->addr); + use_or_ap->port = status->or_port; + have_or = 1; + } + } else if (indirection == DIRIND_ONEHOP) { /* We use an IPv6 address if we have one and we prefer it. * Use the preferred address and port if they are reachable, otherwise, * use the alternate address and port (if any). @@ -668,9 +670,15 @@ directory_choose_address_routerstatus(const routerstatus_t *status, use_or_ap); } - have_dir = fascist_firewall_choose_address_rs(status, - FIREWALL_DIR_CONNECTION, 0, - use_dir_ap); + /* DirPort connections + * DIRIND_ONEHOP uses ORPort, but may fall back to the DirPort */ + if (indirection == DIRIND_DIRECT_CONN || + indirection == DIRIND_ANON_DIRPORT || + indirection == DIRIND_ONEHOP) { + have_dir = fascist_firewall_choose_address_rs(status, + FIREWALL_DIR_CONNECTION, 0, + use_dir_ap); + } /* We rejected all addresses in the relay's status. This means we can't * connect to it. */

1 0

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

04 May '16

commit 01e7f42a09108e71cede46d4a038c4b1253a3d42 Merge: 6027429 0cf90ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:23:26 2016 -0400 Merge branch 'bug18921_squashed' into maint-0.2.8 changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/master] Choose the correct address for one-hop connections
by nickm＠torproject.org 04 May '16

04 May '16

commit 0cf90bac2a7136e0abb9fed160f70c543ad8b88a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 16:03:23 2016 +1000 Choose the correct address for one-hop connections After #17840 in 0.2.8.1-alpha, we incorrectly chose an IPv4 address for all DIRIND_ONEHOP directory connections, even if the routerstatus didn't have an IPv4 address. This likely affected bridge clients with IPv6 bridges. Resolves #18921. --- changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/changes/bug18921 b/changes/bug18921 new file mode 100644 index 0000000..934a604 --- /dev/null +++ b/changes/bug18921 @@ -0,0 +1,4 @@ + o Major bugfixes (IPv6 bridges): + - Fix directory address selection for IPv6 bridges. + Resolves #18921, bugfix on #17840 in 0.2.8.1-alpha. + Patch by "teor". diff --git a/src/or/directory.c b/src/or/directory.c index ab9f738..ca3b3e3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -630,7 +630,6 @@ directory_choose_address_routerstatus(const routerstatus_t *status, tor_assert(use_or_ap != NULL); tor_assert(use_dir_ap != NULL); - const int anonymized_connection = dirind_is_anon(indirection); int have_or = 0, have_dir = 0; /* We expect status to have at least one reachable address if we're @@ -652,13 +651,16 @@ directory_choose_address_routerstatus(const routerstatus_t *status, tor_addr_make_null(&use_dir_ap->addr, AF_UNSPEC); use_dir_ap->port = 0; - if (anonymized_connection) { - /* Use the primary (IPv4) OR address if we're making an indirect - * connection. */ - tor_addr_from_ipv4h(&use_or_ap->addr, status->addr); - use_or_ap->port = status->or_port; - have_or = 1; - } else { + /* ORPort connections */ + if (indirection == DIRIND_ANONYMOUS) { + if (status->addr) { + /* Since we're going to build a 3-hop circuit and ask the 2nd relay + * to extend to this address, always use the primary (IPv4) OR address */ + tor_addr_from_ipv4h(&use_or_ap->addr, status->addr); + use_or_ap->port = status->or_port; + have_or = 1; + } + } else if (indirection == DIRIND_ONEHOP) { /* We use an IPv6 address if we have one and we prefer it. * Use the preferred address and port if they are reachable, otherwise, * use the alternate address and port (if any). @@ -668,9 +670,15 @@ directory_choose_address_routerstatus(const routerstatus_t *status, use_or_ap); } - have_dir = fascist_firewall_choose_address_rs(status, - FIREWALL_DIR_CONNECTION, 0, - use_dir_ap); + /* DirPort connections + * DIRIND_ONEHOP uses ORPort, but may fall back to the DirPort */ + if (indirection == DIRIND_DIRECT_CONN || + indirection == DIRIND_ANON_DIRPORT || + indirection == DIRIND_ONEHOP) { + have_dir = fascist_firewall_choose_address_rs(status, + FIREWALL_DIR_CONNECTION, 0, + use_dir_ap); + } /* We rejected all addresses in the relay's status. This means we can't * connect to it. */

1 0

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

04 May '16

commit 01e7f42a09108e71cede46d4a038c4b1253a3d42 Merge: 6027429 0cf90ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:23:26 2016 -0400 Merge branch 'bug18921_squashed' into maint-0.2.8 changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

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

04 May '16

commit 2da2718609841bb7028ae2c802e26d80c857fe90 Merge: 27c1b0e 01e7f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:23:38 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18921 | 4 ++++ src/or/directory.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/master] Do not recommend use of nicknames in MapAddress manpage
by nickm＠torproject.org 04 May '16

04 May '16

commit 92615f608c2fd1b5da29068498c5fe473105e88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:30:59 2016 -0400 Do not recommend use of nicknames in MapAddress manpage --- changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18312 b/changes/bug18312 new file mode 100644 index 0000000..7dcb326 --- /dev/null +++ b/changes/bug18312 @@ -0,0 +1,4 @@ + o Documentation: + - Stop recommending use of nicknames to identify relays in our + MapAddress documentation. Closes ticket 18312. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 262a36e..787223d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -961,12 +961,12 @@ The following options are useful only for clients (that is, if When a request for address arrives to Tor, it will transform to newaddress before processing it. For example, if you always want connections to www.example.com to exit via __torserver__ (where __torserver__ is the - nickname of the server), use "MapAddress www.example.com + fingerprint of the server), use "MapAddress www.example.com www.example.com.torserver.exit". If the value is prefixed with a "\*.", matches an entire domain. For example, if you always want connections to example.com and any if its subdomains to exit via - __torserver__ (where __torserver__ is the nickname of the server), use + __torserver__ (where __torserver__ is the fingerprint of the server), use "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the leading "*." in each part of the directive.) You can also redirect all subdomains of a domain to a single address. For example, "MapAddress

1 0

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

04 May '16

commit 60274296c3e012bb0ca5ad3214e2b8aa0fe19e82 Merge: b8e8910 92615f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:13:07 2016 -0400 Merge branch 'doc18312' into maint-0.2.8 changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0