April 2014 - tor-commits - lists.torproject.org

[tor/master] Free placeholder circid/chan->circuit map entries on exit
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 852fd1819e911dfafef624640d9b54157073c326 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 25 10:14:26 2014 -0400 Free placeholder circid/chan->circuit map entries on exit In circuitlist_free_all, we free all the circuits, removing them from the map as we go, but we weren't actually freeing the placeholder entries that we use to indicate pending DESTROY cells. Fix for bug 11278; bugfix on the 7912 code that was merged in 0.2.5.1-alpha --- changes/bug11278 | 3 +++ src/or/circuitlist.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug11278 b/changes/bug11278 new file mode 100644 index 0000000..4fa59fc --- /dev/null +++ b/changes/bug11278 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Free placeholder entries in our circuit table at exit; fixes + a harmless memory leak. Fixes bug 11278; bugfix on 0.2.5.1-alpha. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b1efde5..5b8225a 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -833,6 +833,18 @@ circuit_free_all(void) smartlist_free(circuits_pending_chans); circuits_pending_chans = NULL; + { + chan_circid_circuit_map_t **elt, **next, *c; + for (elt = HT_START(chan_circid_map, &chan_circid_map); + elt; + elt = next) { + c = *elt; + next = HT_NEXT_RMV(chan_circid_map, &chan_circid_map, elt); + + tor_assert(c->circuit == NULL); + tor_free(c); + } + } HT_CLEAR(chan_circid_map, &chan_circid_map); }

1 0

[tor/master] Merge remote-tracking branch 'public/bug11278'
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 17d5734df47bc4b9bd40f878e492eb676ca47ae8 Merge: 86f619d 852fd18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 21:56:49 2014 -0400 Merge remote-tracking branch 'public/bug11278' changes/bug11278 | 3 +++ src/or/circuitlist.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Respond to AAAA requests on DNSPort with AAAA automaps
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 46a3914079d6aa91ef456b4bb82d9f842feb0976 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 17:41:43 2014 -0400 Respond to AAAA requests on DNSPort with AAAA automaps Other DNS+IPv6 problems remain, but at least this fixes the automapping. Fixes bug 10468; bugfix on 0.2.4.7-alpha. --- changes/bug10468 | 4 ++++ src/or/dnsserv.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug10468 b/changes/bug10468 new file mode 100644 index 0000000..128eb3a --- /dev/null +++ b/changes/bug10468 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When using DNSPort and AutomapHostsOnResolve, respond to AAAA + requests with AAAA automapped answers. Fixes bug 10468; bugfix + on 0.2.4.7-alpha. diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ebff7b5..4190e9c 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -131,6 +131,16 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) else entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; + if (q->type == EVDNS_TYPE_A) { + entry_conn->ipv4_traffic_ok = 1; + entry_conn->ipv6_traffic_ok = 0; + entry_conn->prefer_ipv6_traffic = 0; + } else if (q->type == EVDNS_TYPE_AAAA) { + entry_conn->ipv4_traffic_ok = 0; + entry_conn->ipv6_traffic_ok = 1; + entry_conn->prefer_ipv6_traffic = 1; + } + strlcpy(entry_conn->socks_request->address, q->name, sizeof(entry_conn->socks_request->address));

1 0

[tor/master] Merge remote-tracking branch 'public/bug10468_024'
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 86f619d0d34657e96d8ae3e83a197382bf6ba344 Merge: fc9e840 46a3914 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 21:50:55 2014 -0400 Merge remote-tracking branch 'public/bug10468_024' changes/bug10468 | 4 ++++ src/or/dnsserv.c | 10 ++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Removing is_internal_IP() function. Resolves ticket 4645.
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 3a4b24c3aba56475822ad94d268b48fd58b74645 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Nov 16 18:29:54 2013 +0200 Removing is_internal_IP() function. Resolves ticket 4645. --- changes/ticket4645 | 3 +++ src/common/address.c | 13 ------------- src/common/address.h | 1 - src/or/config.c | 15 +++++++++++---- src/or/directory.c | 15 +++++++++++++-- src/or/dirserv.c | 7 ++++++- src/test/test_addr.c | 1 - 7 files changed, 33 insertions(+), 22 deletions(-) diff --git a/changes/ticket4645 b/changes/ticket4645 new file mode 100644 index 0000000..cc665ba --- /dev/null +++ b/changes/ticket4645 @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Removing is_internal_IP() function. Resolves ticket 4645. + diff --git a/src/common/address.c b/src/common/address.c index b9f2d93..0b5bb22 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1421,19 +1421,6 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) * XXXX024 IPv6 deprecate some of these. */ -/** Return true iff ip (in host order) is an IP reserved to localhost, - * or reserved for local networks by RFC 1918. - */ -int -is_internal_IP(uint32_t ip, int for_listening) -{ - tor_addr_t myaddr; - myaddr.family = AF_INET; - myaddr.addr.in_addr.s_addr = htonl(ip); - - return tor_addr_is_internal(&myaddr, for_listening); -} - /** Given an address of the form "ip:port", try to divide it into its * ip and port portions, setting *address_out to a newly * allocated string holding the address portion and *port_out diff --git a/src/common/address.h b/src/common/address.h index 77e5855..bdca1f2 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -214,7 +214,6 @@ int tor_addr_port_parse(int severity, const char *addrport, int tor_addr_hostname_is_local(const char *name); /* IPv4 helpers */ -int is_internal_IP(uint32_t ip, int for_listening); int addr_port_lookup(int severity, const char *addrport, char **address, uint32_t *addr, uint16_t *port_out); int parse_port_range(const char *port, uint16_t *port_min_out, diff --git a/src/or/config.c b/src/or/config.c index e7847d5..f840b5e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2053,6 +2053,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, int notice_severity = warn_severity <= LOG_NOTICE ? LOG_NOTICE : warn_severity; + tor_addr_t myaddr; tor_assert(addr_out); /* @@ -2103,8 +2104,11 @@ resolve_my_address(int warn_severity, const or_options_t *options, "local interface. Using that.", fmt_addr32(addr)); strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname)); } else { /* resolved hostname into addr */ + myaddr.family = AF_INET; + myaddr.addr.in_addr.s_addr = htonl(addr); + if (!explicit_hostname && - is_internal_IP(addr, 0)) { + tor_addr_is_internal(&myaddr, 0)) { uint32_t interface_ip; log_fn(notice_severity, LD_CONFIG, "Guessed local hostname '%s' " @@ -2114,7 +2118,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, if (get_interface_address(warn_severity, &interface_ip)) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address. Too bad."); - } else if (is_internal_IP(interface_ip, 0)) { + } else if (tor_addr_is_internal(&myaddr, 0)) { log_fn(notice_severity, LD_CONFIG, "Interface IP address '%s' is a private address too. " "Ignoring.", fmt_addr32(interface_ip)); @@ -2138,8 +2142,11 @@ resolve_my_address(int warn_severity, const or_options_t *options, * out if it is and we don't want that. */ + myaddr.family = AF_INET; + myaddr.addr.in_addr.s_addr = htonl(addr); + addr_string = tor_dup_ip(addr); - if (is_internal_IP(addr, 0)) { + if (tor_addr_is_internal(&myaddr, 0)) { /* make sure we're ok with publishing an internal IP */ if (!options->DirAuthorities && !options->AlternateDirAuthority) { /* if they are using the default authorities, disallow internal IPs @@ -2245,7 +2252,7 @@ is_local_addr(const tor_addr_t *addr) * resolve_my_address will never be called at all). In those cases, * last_resolved_addr will be 0, and so checking to see whether ip is on * the same /24 as last_resolved_addr will be the same as checking whether - * it was on net 0, which is already done by is_internal_IP. + * it was on net 0, which is already done by tor_addr_is_internal. */ if ((last_resolved_addr & (uint32_t)0xffffff00ul) == (ip & (uint32_t)0xffffff00ul)) diff --git a/src/or/directory.c b/src/or/directory.c index 0cacf06..7f26aff 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1415,12 +1415,23 @@ http_set_address_origin(const char *headers, connection_t *conn) fwd = http_get_header(headers, "X-Forwarded-For: "); if (fwd) { struct in_addr in; - if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) { - log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s", + if (!tor_inet_aton(fwd, &in)) { + log_debug(LD_DIR, "Ignoring unrecognized IP %s", escaped(fwd)); tor_free(fwd); return; } + + tor_addr_t toraddr; + toraddr.family = AF_INET; + toraddr.addr.in_addr = in; + + if (tor_addr_is_internal(&toraddr,0)) { + log_debug(LD_DIR, "Ignoring local IP %s", escaped(fwd)); + tor_free(fwd); + return; + } + tor_free(conn->address); conn->address = tor_strdup(fwd); tor_free(fwd); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c0e000c..4a25f99 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -533,7 +533,12 @@ dirserv_router_has_valid_address(routerinfo_t *ri) ri->address); return -1; } - if (is_internal_IP(ntohl(iaddr.s_addr), 0)) { + + tor_addr_t toraddr; + toraddr.family = AF_INET; + toraddr.addr.in_addr = iaddr; + + if (tor_addr_is_internal(&toraddr, 0)) { log_info(LD_DIRSERV, "Router %s published internal IP address '%s'. Refusing.", router_describe(ri), ri->address); diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 4bc602d..829697b 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -402,7 +402,6 @@ test_addr_ip6_helpers(void) test_internal_ip("::ffff:169.254.0.0", 0); test_internal_ip("::ffff:169.254.255.255", 0); test_external_ip("::ffff:169.255.0.0", 0); - test_assert(is_internal_IP(0x7f000001, 0)); /* tor_addr_compare(tor_addr_t x2) */ test_addr_compare("ffff::", ==, "ffff::0");

1 0

[tor/master] Using proper functions to create tor_addr_t.
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit e82e772f2b1a2b2235d3b3bcde85666e09a182b5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Nov 20 21:49:17 2013 +0200 Using proper functions to create tor_addr_t. --- src/or/config.c | 6 ++---- src/or/directory.c | 13 ++----------- src/or/dirserv.c | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f840b5e..a90468d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2104,8 +2104,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, "local interface. Using that.", fmt_addr32(addr)); strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname)); } else { /* resolved hostname into addr */ - myaddr.family = AF_INET; - myaddr.addr.in_addr.s_addr = htonl(addr); + tor_addr_from_ipv4h(&myaddr, addr); if (!explicit_hostname && tor_addr_is_internal(&myaddr, 0)) { @@ -2142,8 +2141,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, * out if it is and we don't want that. */ - myaddr.family = AF_INET; - myaddr.addr.in_addr.s_addr = htonl(addr); + tor_addr_from_ipv4h(&myaddr,addr); addr_string = tor_dup_ip(addr); if (tor_addr_is_internal(&myaddr, 0)) { diff --git a/src/or/directory.c b/src/or/directory.c index 7f26aff..6effe45 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1414,20 +1414,11 @@ http_set_address_origin(const char *headers, connection_t *conn) if (!fwd) fwd = http_get_header(headers, "X-Forwarded-For: "); if (fwd) { - struct in_addr in; - if (!tor_inet_aton(fwd, &in)) { - log_debug(LD_DIR, "Ignoring unrecognized IP %s", - escaped(fwd)); - tor_free(fwd); - return; - } - tor_addr_t toraddr; - toraddr.family = AF_INET; - toraddr.addr.in_addr = in; + tor_addr_parse(&toraddr,fwd); if (tor_addr_is_internal(&toraddr,0)) { - log_debug(LD_DIR, "Ignoring local IP %s", escaped(fwd)); + log_debug(LD_DIR, "Ignoring local/internal IP %s", escaped(fwd)); tor_free(fwd); return; } diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4a25f99..b6bb607 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -535,8 +535,7 @@ dirserv_router_has_valid_address(routerinfo_t *ri) } tor_addr_t toraddr; - toraddr.family = AF_INET; - toraddr.addr.in_addr = iaddr; + tor_addr_from_in(&toraddr,&iaddr); if (tor_addr_is_internal(&toraddr, 0)) { log_info(LD_DIRSERV,

1 0

[tor/master] Fixes for bug4645 fix.
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit dafed84dabbb3afbada5e55ac1d030412418fae5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 14:31:31 2014 -0500 Fixes for bug4645 fix. --- src/or/config.c | 10 +++++----- src/or/dirserv.c | 11 ++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a90468d..517ca70 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2108,22 +2108,22 @@ resolve_my_address(int warn_severity, const or_options_t *options, if (!explicit_hostname && tor_addr_is_internal(&myaddr, 0)) { - uint32_t interface_ip; + tor_addr_t interface_ip; log_fn(notice_severity, LD_CONFIG, "Guessed local hostname '%s' " "resolves to a private IP address (%s). Trying something " "else.", hostname, fmt_addr32(addr)); - if (get_interface_address(warn_severity, &interface_ip)) { + if (get_interface_address6(warn_severity, AF_INET, &interface_ip)<0) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address. Too bad."); - } else if (tor_addr_is_internal(&myaddr, 0)) { + } else if (tor_addr_is_internal(&interface_ip, 0)) { log_fn(notice_severity, LD_CONFIG, "Interface IP address '%s' is a private address too. " - "Ignoring.", fmt_addr32(interface_ip)); + "Ignoring.", fmt_addr(&interface_ip)); } else { from_interface = 1; - addr = interface_ip; + addr = tor_addr_to_ipv4h(&interface_ip); log_fn(notice_severity, LD_CONFIG, "Learned IP address '%s' for local interface." " Using that.", fmt_addr32(addr)); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b6bb607..e3e6519 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -524,20 +524,17 @@ dirserv_free_fingerprint_list(void) static int dirserv_router_has_valid_address(routerinfo_t *ri) { - struct in_addr iaddr; + tor_addr_t addr; if (get_options()->DirAllowPrivateAddresses) return 0; /* whatever it is, we're fine with it */ - if (!tor_inet_aton(ri->address, &iaddr)) { - log_info(LD_DIRSERV,"Router %s published non-IP address '%s'. Refusing.", + if (tor_addr_parse(&addr, ri->address) != AF_INET) { + log_info(LD_DIRSERV,"Router %s published non-IPv4 address '%s'. Refusing.", router_describe(ri), ri->address); return -1; } - tor_addr_t toraddr; - tor_addr_from_in(&toraddr,&iaddr); - - if (tor_addr_is_internal(&toraddr, 0)) { + if (tor_addr_is_internal(&addr, 0)) { log_info(LD_DIRSERV, "Router %s published internal IP address '%s'. Refusing.", router_describe(ri), ri->address);

1 0

[tor/master] Merge remote-tracking branch 'public/bug4645'
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit fc9e84062b73535b63bb3cf555604b1acbcc4c61 Merge: dfc3217 408bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 21:49:01 2014 -0400 Merge remote-tracking branch 'public/bug4645' Conflicts: src/or/dirserv.c changes/ticket4645 | 3 +++ src/common/address.c | 13 ------------- src/common/address.h | 1 - src/or/config.c | 21 +++++++++++++-------- src/or/directory.c | 9 +++++---- src/or/dirserv.c | 5 ++++- src/test/test_addr.c | 1 - 7 files changed, 25 insertions(+), 28 deletions(-) diff --cc src/or/dirserv.c index 19ed12d,e3e6519..b6c5dd4 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -504,12 -524,20 +504,15 @@@ dirserv_free_fingerprint_list(void static int dirserv_router_has_valid_address(routerinfo_t *ri) { + tor_addr_t addr; if (get_options()->DirAllowPrivateAddresses) return 0; /* whatever it is, we're fine with it */ - if (is_internal_IP(ri->addr, 0)) { - if (tor_addr_parse(&addr, ri->address) != AF_INET) { - log_info(LD_DIRSERV,"Router %s published non-IPv4 address '%s'. Refusing.", - router_describe(ri), - ri->address); - return -1; - } ++ tor_addr_from_ipv4h(&addr, ri->addr); + + if (tor_addr_is_internal(&addr, 0)) { log_info(LD_DIRSERV, - "Router %s published internal IP address '%s'. Refusing.", - router_describe(ri), ri->address); + "Router %s published internal IP address. Refusing.", + router_describe(ri)); return -1; /* it's a private IP, we should reject it */ } return 0;

1 0

[tor/master] Add one more missing heck on bug4645 fixes
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 408bd98e79196933e447cbc68c73ecffebaf5a19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 21:10:14 2014 -0400 Add one more missing heck on bug4645 fixes --- src/or/directory.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 6effe45..d6d2339 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1415,9 +1415,8 @@ http_set_address_origin(const char *headers, connection_t *conn) fwd = http_get_header(headers, "X-Forwarded-For: "); if (fwd) { tor_addr_t toraddr; - tor_addr_parse(&toraddr,fwd); - - if (tor_addr_is_internal(&toraddr,0)) { + if (tor_addr_parse(&toraddr,fwd) == -1 || + tor_addr_is_internal(&toraddr,0)) { log_debug(LD_DIR, "Ignoring local/internal IP %s", escaped(fwd)); tor_free(fwd); return;

1 0

[tor/master] Fix documentation of torrc search order
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit a68e6ea9c0288d82ea10076c551f48d63b3813fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 14:58:46 2014 -0400 Fix documentation of torrc search order We are searching @CONFDIR@ before $HOME, but the documentation implied otherwise. I screwed this up in f5e86bcd6c06d43ff3af5acd8135bd8b577bc3, when I first documented the $HOME/.torrc possibility. Fix for bug 9213; bugfix on 0.2.3.18-rc. --- changes/bug9213_doc | 5 +++++ doc/tor.1.txt | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug9213_doc b/changes/bug9213_doc new file mode 100644 index 0000000..2f959dd --- /dev/null +++ b/changes/bug9213_doc @@ -0,0 +1,5 @@ + o Documentation: + - Correctly document that we search for a system torrc file before + looking in ~/.torrc. Fixes documentation side of 9213; bugfix + on 0.2.3.18-rc. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3f8f6da..eb9ad67 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -37,7 +37,7 @@ COMMAND-LINE OPTIONS [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: $HOME/.torrc, or @CONFDIR@/torrc if that file is not + options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) [[opt-defaults-torrc]] **--defaults-torrc** __FILE__:: @@ -2103,6 +2103,9 @@ FILES **@CONFDIR@/torrc**:: The configuration file, which contains "option value" pairs. +**$HOME/.torrc**:: + Fallback location for torrc, if @CONFDIR@/torrc is not found. + **@LOCALSTATEDIR@/lib/tor/**:: The tor process stores keys and other data here.

1 0