December 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/first-hop-no-private'
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit caff66530924f45ce8aacdef0f00002a0b001ccd Merge: d6a3b1f 45f2e7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 10:47:59 2015 -0500 Merge remote-tracking branch 'teor/first-hop-no-private' changes/first-hop-no-private | 8 ++++++++ doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/master] fixup! Refuse to make direct connections to private OR addresses
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 45f2e7ec040c20d2640de2df1ce5da94d338f76f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 25 07:54:18 2015 +1100 fixup! Refuse to make direct connections to private OR addresses Add changes file. --- changes/first-hop-no-private | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/first-hop-no-private b/changes/first-hop-no-private new file mode 100644 index 0000000..e8d0684 --- /dev/null +++ b/changes/first-hop-no-private @@ -0,0 +1,8 @@ + o Minor bugfix (relays, hidden services): + - Refuse connection requests to private OR addresses unless + ExtendAllowPrivateAddresses is set. Previously, tor would + connect, then refuse to send any cells to a private address. + Fixes bugs 17674 and 8976; bugfix on b7c172c9ec76 (28 Aug 2012) + Original bug 6710, released in 0.2.3.21-rc and an 0.2.2 maint + release. + Patch by "teor".

1 0

[tor/master] Refuse to make direct connections to private OR addresses
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 23b088907fd23da417f5caf2b7b5f664f317ef4a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 25 03:11:15 2015 +1100 Refuse to make direct connections to private OR addresses Refuse connection requests to private OR addresses unless ExtendAllowPrivateAddresses is set. Previously, tor would connect, then refuse to send any cells to a private address. Fixes bugs 17674 and 8976; bugfix on b7c172c9ec76 (28 Aug 2012) Original bug 6710, released in 0.2.3.21-rc and an 0.2.2 maint release. Patch by "teor". --- doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aba0c1c..2ada568 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1898,9 +1898,11 @@ is non-zero): (Default: 1) [[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**:: - When this option is enabled, Tor routers allow EXTEND request to - localhost, RFC1918 addresses, and so on. This can create security issues; - you should probably leave it off. (Default: 0) + When this option is enabled, Tor will connect to localhost, RFC1918 + addresses, and so on. In particular, Tor will make direct connections, and + Tor routers allow EXTEND requests, to these private addresses. This can + create security issues; you should probably leave it off. + (Default: 0) [[MaxMemInQueues]] **MaxMemInQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: This option configures a threshold above which Tor will assume that it diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0688398..933d70b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -498,6 +498,14 @@ circuit_handle_first_hop(origin_circuit_t *circ) tor_assert(firsthop); tor_assert(firsthop->extend_info); + /* XX/teor - does tor ever need build a circuit directly to itself? */ + if (tor_addr_is_internal(&firsthop->extend_info->addr, 0) && + !get_options()->ExtendAllowPrivateAddresses) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Client asked me to connect directly to a private address"); + return -END_CIRC_REASON_TORPROTOCOL; + } + /* now see if we're already connected to the first OR in 'route' */ log_debug(LD_CIRC,"Looking for firsthop '%s'", fmt_addrport(&firsthop->extend_info->addr,

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit a6a4718a1e5a74dd0803fdc3a5ea22af1a034c4c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 15:45:51 2015 +0000 Update translations for abouttor-homepage_completed --- ru/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index bb5a49b..ac71c5b 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот обозреватель устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor"">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit f75efe8c2bdec7a49f7515bca434d7d7f6114fc7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 15:45:46 2015 +0000 Update translations for abouttor-homepage --- ru/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd index bb5a49b..ac71c5b 100644 --- a/ru/aboutTor.dtd +++ b/ru/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот обозреватель устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor"">

1 0

[tor/master] changes file for bug17791
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit d6a3b1f0199db5b6d792f84b5073e532e4c6d10b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 10:38:13 2015 -0500 changes file for bug17791 --- changes/bug17791 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug17791 b/changes/bug17791 new file mode 100644 index 0000000..f191012 --- /dev/null +++ b/changes/bug17791 @@ -0,0 +1,4 @@ + o Documentation: + - Fix a minor formatting typo in the manpage. Closes ticket + 17791. +

1 0

[tor/master] Fix formatting typo in manpage.
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 61d3364f269d22d7286850a93980ca74c9c21e27 Author: Andrew Kvalheim <Andrew(a)Kvalhe.im> Date: Tue Dec 8 18:23:43 2015 -0800 Fix formatting typo in manpage. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7f6d91d..56b709f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1801,7 +1801,7 @@ is non-zero): [[ServerDNSTestAddresses]] **ServerDNSTestAddresses** __address__,__address__,__...__:: When we're detecting DNS hijacking, make sure that these __valid__ addresses aren't getting redirected. If they are, then our DNS is completely useless, - and we'll reset our exit policy to "reject *:*". This option only affects + and we'll reset our exit policy to "reject \*:*". This option only affects name lookups that your server does on behalf of clients. (Default: "www.google.com, www.mit.edu, www.yahoo.com, www.slashdot.org")

1 0

[tor/master] Merge branch 'bug17776'
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 8f48e1d686415c89688ecfb0ec9fe3e0e554ca3f Merge: 2a965b7 c76059e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 10:31:14 2015 -0500 Merge branch 'bug17776' changes/bug17776 | 6 +++++ src/or/rendcache.c | 6 ++--- src/or/routerlist.c | 8 +++--- src/test/test_dir_handle_get.c | 21 ++++++++++----- src/test/test_rendcache.c | 55 +++++++++++++++++++++++----------------- 5 files changed, 60 insertions(+), 36 deletions(-)

1 0

[tor/master] Assert that the directory server digest is given
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit c76059ec9bc8ac99096b253fc4af1119f26102eb Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Dec 9 13:12:45 2015 +0100 Assert that the directory server digest is given This prevents a possible crash when memory is copied from a pointer to NULL. --- src/or/routerlist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8145515..5e79064 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4051,6 +4051,8 @@ dir_server_new(int is_authority, uint32_t a; char *hostname_ = NULL; + tor_assert(digest); + if (weight < 0) return NULL;

1 0

[tor/master] Mention the expected length of the digests
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit fbdd32ebe9021d34dbe314a9cb24480ff3a9c9b1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Dec 9 13:07:35 2015 +0100 Mention the expected length of the digests Some functions that use digest maps did not mention that the digests are expected to have DIGEST_LEN bytes. This lead to buffer over-reads in the past. --- src/or/rendcache.c | 6 +++--- src/or/routerlist.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 790e0c2..c69671e 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -321,9 +321,9 @@ rend_cache_failure_purge(void) } /** Lookup the rend failure cache using a relay identity digest in - * identity and service ID service_id. If found, the intro - * failure is set in intro_entry else it stays untouched. Return 1 - * iff found else 0. */ + * identity which has DIGEST_LEN bytes and service ID service_id + * which is a null-terminated string. If found, the intro failure is set in + * intro_entry else it stays untouched. Return 1 iff found else 0. */ STATIC int cache_failure_intro_lookup(const uint8_t *identity, const char *service_id, rend_cache_failure_intro_t **intro_entry) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 08911b9..8145515 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4034,9 +4034,9 @@ router_exit_policy_rejects_all(const routerinfo_t *router) } /** Create an directory server at address:port, with OR identity - * key digest. If address is NULL, add ourself. If - * is_authority, this is a directory authority. Return the new - * directory server entry on success or NULL on failure. */ + * key digest which has DIGEST_LEN bytes. If address is NULL, + * add ourself. If is_authority, this is a directory authority. Return + * the new directory server entry on success or NULL on failure. */ static dir_server_t * dir_server_new(int is_authority, const char *nickname,

1 0