tor-commits September 2015

tor-commits@lists.torproject.org

15 participants
1411 discussions

[tor/maint-0.2.7] Fix past changelog spelling again!
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 22a912755faba6ef1315f701b358b005906a3100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 12:49:23 2015 +0200 Fix past changelog spelling again! --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0191717..46005a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25 Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r". o Minor features (client-side privacy): - - New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit + - New KeepAliveIsolateSOCKSAuth option to indefinitely extend circuit lifespan when IsolateSOCKSAuth and streams with SOCKS authentication are attached to the circuit. This allows applications like TorBrowser to manage circuit lifetime on their

1 0

[tor/master] Socks->SOCKS in torrcs. Fixes 15609
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 87dee5c6517e23dc9358db0aeb994913ca156672 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 10:20:31 2015 +0200 Socks->SOCKS in torrcs. Fixes 15609 --- changes/bug15609 | 2 ++ src/config/torrc.minimal.in-staging | 20 ++++++++++---------- src/config/torrc.sample.in | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/changes/bug15609 b/changes/bug15609 new file mode 100644 index 0000000..efaccde --- /dev/null +++ b/changes/bug15609 @@ -0,0 +1,2 @@ + o Documentation: + - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609. diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index ff324a9..248cb5c 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -12,20 +12,20 @@ ## Tor will look for this file in various places based on your platform: ## https://www.torproject.org/docs/faq#torrc -## Tor opens a socks proxy on port 9050 by default -- even if you don't -## configure one below. Set "SocksPort 0" if you plan to run Tor only +## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't +## configure one below. Set "SOCKSPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. -#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this address:port too. +#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections. +#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests that reach a SocksPort. Untrusted users who -## can access your SocksPort may be able to learn about the connections +## First entry that matches wins. If no SOCKSPolicy is set, we accept +## all (and only) requests that reach a SOCKSPort. Untrusted users who +## can access your SOCKSPort may be able to learn about the connections ## you make. -#SocksPolicy accept 192.168.0.0/16 -#SocksPolicy accept6 FC00::/7 -#SocksPolicy reject * +#SOCKSPolicy accept 192.168.0.0/16 +#SOCKSPolicy accept6 FC00::/7 +#SOCKSPolicy reject * ## Logs go to stdout at level "notice" unless redirected by something ## else, like one of the below lines. You can have as many Log lines as diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index ff324a9..248cb5c 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -12,20 +12,20 @@ ## Tor will look for this file in various places based on your platform: ## https://www.torproject.org/docs/faq#torrc -## Tor opens a socks proxy on port 9050 by default -- even if you don't -## configure one below. Set "SocksPort 0" if you plan to run Tor only +## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't +## configure one below. Set "SOCKSPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. -#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this address:port too. +#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections. +#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests that reach a SocksPort. Untrusted users who -## can access your SocksPort may be able to learn about the connections +## First entry that matches wins. If no SOCKSPolicy is set, we accept +## all (and only) requests that reach a SOCKSPort. Untrusted users who +## can access your SOCKSPort may be able to learn about the connections ## you make. -#SocksPolicy accept 192.168.0.0/16 -#SocksPolicy accept6 FC00::/7 -#SocksPolicy reject * +#SOCKSPolicy accept 192.168.0.0/16 +#SOCKSPolicy accept6 FC00::/7 +#SOCKSPolicy reject * ## Logs go to stdout at level "notice" unless redirected by something ## else, like one of the below lines. You can have as many Log lines as

1 0

[tor/master] go back in time to fix a changelog entry. Fix for 17165
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit c1981955ffe1d504b920ad1a1d10b83057d35660 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 10:21:52 2015 +0200 go back in time to fix a changelog entry. Fix for 17165 --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 25c7442..0191717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25 Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r". o Minor features (client-side privacy): - - New KeyAliveSOCKSAuth option to indefinitely extend circuit + - New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit lifespan when IsolateSOCKSAuth and streams with SOCKS authentication are attached to the circuit. This allows applications like TorBrowser to manage circuit lifetime on their

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit efff55bdfd45e1587d074430ffe5a8a775a35bf5 Merge: 8e93cfb c198195 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 10:22:38 2015 +0200 Merge remote-tracking branch 'origin/maint-0.2.7' ChangeLog | 2 +- changes/bug15609 | 2 ++ src/config/torrc.minimal.in-staging | 20 ++++++++++---------- src/config/torrc.sample.in | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.2.7] go back in time to fix a changelog entry. Fix for 17165
by nickm＠torproject.org 29 Sep '15

29 Sep '15

1 0

[tor/maint-0.2.7] Socks->SOCKS in torrcs. Fixes 15609
by nickm＠torproject.org 29 Sep '15

29 Sep '15

1 0

[tor/master] get_interface_address6_list(): Bring back a return code check
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 3ea834ce0a63f275fd806f9ebeec64a2bbcd1b55 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Mon Sep 28 16:57:07 2015 +0200 get_interface_address6_list(): Bring back a return code check ... that was removed by 31eb486c46 which first appeared in 0.2.7.3-rc. If tor is running in a ElectroBSD (or FreeBSD) jail it can't get any IP addresses that aren't assigned to the jail by looking at the interfaces and (by design) the get_interface_address6_via_udp_socket_hack() fallback doesn't work either. The missing return code check resulted in tor_addr_is_internal() complaining about a "non-IP address of type 49", due to reading uninitialised memory. Fixes #17173. --- src/common/address.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/address.c b/src/common/address.c index 163db59..fc85f8e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1711,7 +1711,8 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, } /* Okay, the smart way is out. */ - get_interface_address6_via_udp_socket_hack(severity,family,&addr); + if (get_interface_address6_via_udp_socket_hack(severity,family,&addr)) + return smartlist_new(); if (!include_internal && tor_addr_is_internal(&addr, 0)) { return smartlist_new(); } else {

1 0

[tor/master] Add checks and unit tests for get_interface_address* failure
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 7fa102b48783b51673095e1ddcb2f88050a2ba32 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Sep 29 07:04:49 2015 +0200 Add checks and unit tests for get_interface_address* failure Ensure that either a valid address is returned in address pointers, or that the address data is zeroed on error. Ensure that free_interface_address6_list handles NULL lists. Add unit tests for get_interface_address* failure cases. Fixes bug #17173. Patch by fk/teor, not in any released version of tor. --- changes/bug17173-socket-hack-rv | 10 +++++ src/common/address.c | 24 ++++++---- src/common/address.h | 8 ++-- src/test/test_address.c | 95 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 12 deletions(-) diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv new file mode 100644 index 0000000..c9f30d3 --- /dev/null +++ b/changes/bug17173-socket-hack-rv @@ -0,0 +1,10 @@ + o Minor bug fixes (addresses, testing): + - Handle errors in get_interface_address6_via_udp_socket_hack by + returning an empty list (no addresses found). This bug was triggered + in ElectroBSD/FreeBSD jails. + - Ensure that either a valid address is returned in address pointers, + or that the address data is zeroed on error. + - Ensure that free_interface_address6_list handles NULL lists. + - Add unit tests for get_interface_address* failure cases. + Fixes bug #17173. + Patch by fk/teor, not in any released version of tor. diff --git a/src/common/address.c b/src/common/address.c index fc85f8e..cfa8fd1 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1506,8 +1506,8 @@ get_interface_addresses_ioctl(int severity) * Return a new smartlist of tor_addr_t on success, and NULL on failure. * (An empty smartlist indicates that we successfully learned that we have no * addresses.) Log failure messages at severity. */ -STATIC smartlist_t * -get_interface_addresses_raw(int severity) +MOCK_IMPL(smartlist_t *, +get_interface_addresses_raw,(int severity)) { smartlist_t *result = NULL; #if defined(HAVE_IFADDRS_TO_SMARTLIST) @@ -1547,10 +1547,10 @@ tor_addr_is_multicast(const tor_addr_t *a) * UDP socket trickery. Only look for address of given family. * Set result to *addr. Return 0 on success, -1 on failure. */ -STATIC int -get_interface_address6_via_udp_socket_hack(int severity, - sa_family_t family, - tor_addr_t *addr) +MOCK_IMPL(int, +get_interface_address6_via_udp_socket_hack,(int severity, + sa_family_t family, + tor_addr_t *addr)) { struct sockaddr_storage my_addr, target_addr; int sock=-1, r=-1; @@ -1614,6 +1614,8 @@ get_interface_address6_via_udp_socket_hack(int severity, err: if (sock >= 0) tor_close_socket(sock); + if (r == -1) + memset(addr, 0, sizeof(tor_addr_t)); return r; } @@ -1632,6 +1634,8 @@ get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr)) int rv = -1; tor_assert(addr); + memset(addr, 0, sizeof(tor_addr_t)); + /* Get a list of public or internal IPs in arbitrary order */ addrs = get_interface_address6_list(severity, family, 1); @@ -1656,8 +1660,10 @@ get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr)) void free_interface_address6_list(smartlist_t *addrs) { - SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a)); - smartlist_free(addrs); + if (addrs != NULL) { + SMARTLIST_FOREACH(addrs, tor_addr_t *, a, tor_free(a)); + smartlist_free(addrs); + } } /** Return a smartlist of the IP addresses of type family from all interfaces @@ -1975,6 +1981,8 @@ get_interface_address,(int severity, uint32_t *addr)) tor_addr_t local_addr; int r; + memset(addr, 0, sizeof(uint32_t)); + r = get_interface_address6(severity, AF_INET, &local_addr); if (r>=0) *addr = tor_addr_to_ipv4h(&local_addr); diff --git a/src/common/address.h b/src/common/address.h index 7d49fb5..d2841e1 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -310,11 +310,11 @@ get_interface_address_list(int severity, int include_internal) tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port); #ifdef ADDRESS_PRIVATE -STATIC smartlist_t *get_interface_addresses_raw(int severity); +MOCK_DECL(smartlist_t *,get_interface_addresses_raw,(int severity)); STATIC int tor_addr_is_multicast(const tor_addr_t *a); -STATIC int get_interface_address6_via_udp_socket_hack(int severity, - sa_family_t family, - tor_addr_t *addr); +MOCK_DECL(int,get_interface_address6_via_udp_socket_hack,(int severity, + sa_family_t family, + tor_addr_t *addr)); #ifdef HAVE_IFADDRS_TO_SMARTLIST STATIC smartlist_t *ifaddrs_to_smartlist(const struct ifaddrs *ifa); diff --git a/src/test/test_address.c b/src/test/test_address.c index 72742df..b442f4a 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -779,6 +779,99 @@ test_address_get_if_addrs6_list_no_internal(void *arg) return; } +static int called_get_interface_addresses_raw = 0; + +smartlist_t * +mock_get_interface_addresses_raw_fail(int severity) +{ + (void)severity; + + called_get_interface_addresses_raw++; + return smartlist_new(); +} + +static int called_get_interface_address6_via_udp_socket_hack = 0; + +int +mock_get_interface_address6_via_udp_socket_hack_fail(int severity, + sa_family_t family, + tor_addr_t *addr) +{ + (void)severity; + (void)family; + (void)addr; + + called_get_interface_address6_via_udp_socket_hack++; + return -1; +} + +static void +test_address_get_if_addrs_internal_fail(void *arg) +{ + smartlist_t *results1 = NULL, *results2 = NULL; + int rv = 0; + uint32_t ipv4h_addr = 0; + tor_addr_t ipv6_addr; + + memset(&ipv6_addr, 0, sizeof(tor_addr_t)); + + (void)arg; + + MOCK(get_interface_addresses_raw, + mock_get_interface_addresses_raw_fail); + MOCK(get_interface_address6_via_udp_socket_hack, + mock_get_interface_address6_via_udp_socket_hack_fail); + + results1 = get_interface_address6_list(LOG_ERR, AF_INET6, 1); + tt_assert(results1 != NULL); + tt_int_op(smartlist_len(results1),==,0); + + results2 = get_interface_address_list(LOG_ERR, 1); + tt_assert(results2 != NULL); + tt_int_op(smartlist_len(results2),==,0); + + rv = get_interface_address6(LOG_ERR, AF_INET6, &ipv6_addr); + tt_assert(rv == -1); + + rv = get_interface_address(LOG_ERR, &ipv4h_addr); + tt_assert(rv == -1); + +done: + UNMOCK(get_interface_addresses_raw); + UNMOCK(get_interface_address6_via_udp_socket_hack); + free_interface_address6_list(results1); + free_interface_address6_list(results2); + return; +} + +static void +test_address_get_if_addrs_no_internal_fail(void *arg) +{ + smartlist_t *results1 = NULL, *results2 = NULL; + + (void)arg; + + MOCK(get_interface_addresses_raw, + mock_get_interface_addresses_raw_fail); + MOCK(get_interface_address6_via_udp_socket_hack, + mock_get_interface_address6_via_udp_socket_hack_fail); + + results1 = get_interface_address6_list(LOG_ERR, AF_INET6, 0); + tt_assert(results1 != NULL); + tt_int_op(smartlist_len(results1),==,0); + + results2 = get_interface_address_list(LOG_ERR, 0); + tt_assert(results2 != NULL); + tt_int_op(smartlist_len(results2),==,0); + +done: + UNMOCK(get_interface_addresses_raw); + UNMOCK(get_interface_address6_via_udp_socket_hack); + free_interface_address6_list(results1); + free_interface_address6_list(results2); + return; +} + static void test_address_get_if_addrs(void *arg) { @@ -838,6 +931,8 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(get_if_addrs_list_no_internal, 0), ADDRESS_TEST(get_if_addrs6_list_internal, 0), ADDRESS_TEST(get_if_addrs6_list_no_internal, 0), + ADDRESS_TEST(get_if_addrs_internal_fail, 0), + ADDRESS_TEST(get_if_addrs_no_internal_fail, 0), ADDRESS_TEST(get_if_addrs, 0), ADDRESS_TEST(get_if_addrs6, 0), #ifdef HAVE_IFADDRS_TO_SMARTLIST

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 8e93cfb47f218dc7f431cfa820a5228b509d142c Merge: 3d8a045 7fa102b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 10:18:09 2015 +0200 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug17173-socket-hack-rv | 10 +++++ src/common/address.c | 27 +++++++---- src/common/address.h | 8 ++-- src/test/test_address.c | 95 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.2.7] get_interface_address6_list(): Bring back a return code check
by nickm＠torproject.org 29 Sep '15

29 Sep '15

1 0

← Newer
1
2
3
4
5
6
7
8
...
142
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2015