March 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 34120549878aa05969b66d9564cdd902adeeb6be Merge: 5c5198e 1b28f36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 14:47:13 2013 -0400 Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4 changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/master] Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 1b28f366b8796a9e6d27af74146dbc7836100263 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 14 11:19:08 2013 -0400 Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells Fixes bug 8475; bugfix on 0.2.0.7-alpha. --- changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug8475 b/changes/bug8475 new file mode 100644 index 0000000..eb8debe --- /dev/null +++ b/changes/bug8475 @@ -0,0 +1,4 @@ + o Major bugfixes: + - If configured via ClientDNSRejectInternalAddresses not to report + DNS queries which have resolved to internal addresses, apply that + rule to IPv6 as well. Fixes bug 8475; bugfix on 0.2.0.7-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index a17c333..e69eade 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -969,12 +969,15 @@ connection_edge_process_relay_cell_not_open( 2+answer_len)); else ttl = -1; - if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) { - uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); - if (get_options()->ClientDNSRejectInternalAddresses && - is_internal_IP(addr, 0)) { + if (answer_type == RESOLVED_TYPE_IPV4 || + answer_type == RESOLVED_TYPE_IPV6) { + tor_addr_t addr; + if (decode_address_from_payload(&addr, cell->payload+RELAY_HEADER_SIZE, + rh->length) && + tor_addr_is_internal(&addr, 0) && + get_options()->ClientDNSRejectInternalAddresses) { log_info(LD_APP,"Got a resolve with answer %s. Rejecting.", - fmt_addr32(addr)); + fmt_addr(&addr)); connection_ap_handshake_socks_resolved(entry_conn, RESOLVED_TYPE_ERROR_TRANSIENT, 0, NULL, 0, TIME_MAX);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 7c2eabcf8e68aee149bff1d5c9f11eff14152bc7 Merge: a87f22e 3412054 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 14:47:49 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.4] Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 1b28f366b8796a9e6d27af74146dbc7836100263 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 14 11:19:08 2013 -0400 Apply ClientDNSRejectInternalAddresses to IPv6 in RESOLVED cells Fixes bug 8475; bugfix on 0.2.0.7-alpha. --- changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug8475 b/changes/bug8475 new file mode 100644 index 0000000..eb8debe --- /dev/null +++ b/changes/bug8475 @@ -0,0 +1,4 @@ + o Major bugfixes: + - If configured via ClientDNSRejectInternalAddresses not to report + DNS queries which have resolved to internal addresses, apply that + rule to IPv6 as well. Fixes bug 8475; bugfix on 0.2.0.7-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index a17c333..e69eade 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -969,12 +969,15 @@ connection_edge_process_relay_cell_not_open( 2+answer_len)); else ttl = -1; - if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) { - uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); - if (get_options()->ClientDNSRejectInternalAddresses && - is_internal_IP(addr, 0)) { + if (answer_type == RESOLVED_TYPE_IPV4 || + answer_type == RESOLVED_TYPE_IPV6) { + tor_addr_t addr; + if (decode_address_from_payload(&addr, cell->payload+RELAY_HEADER_SIZE, + rh->length) && + tor_addr_is_internal(&addr, 0) && + get_options()->ClientDNSRejectInternalAddresses) { log_info(LD_APP,"Got a resolve with answer %s. Rejecting.", - fmt_addr32(addr)); + fmt_addr(&addr)); connection_ap_handshake_socks_resolved(entry_conn, RESOLVED_TYPE_ERROR_TRANSIENT, 0, NULL, 0, TIME_MAX);

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 34120549878aa05969b66d9564cdd902adeeb6be Merge: 5c5198e 1b28f36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 14:47:13 2013 -0400 Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4 changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/master] Set default minimum bandwidth for exit flag to zero for TestingTorNetwork
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 5c5198e713365fecf44741ae6f287c2ebdef18f6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 20 11:16:41 2013 -0700 Set default minimum bandwidth for exit flag to zero for TestingTorNetwork --- src/or/config.c | 1 + src/or/dirserv.c | 10 ++++++++-- src/or/or.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9e2230e..a238a1a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -341,6 +341,7 @@ static config_var_t option_vars_[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(TestingMinExitFlagThreshold, MEMUNIT, "0"), V(TestingMinFastFlagThreshold, MEMUNIT, "0"), V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 81f328a..e837e4b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1894,11 +1894,17 @@ router_counts_toward_thresholds(const node_t *node, time_t now, /* Have measured bw? */ int have_mbw = dirserv_has_measured_bw(node->ri->cache_info.identity_digest); + uint64_t min_bw = ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER; + const or_options_t *options = get_options(); + + if (options->TestingTorNetwork) { + min_bw = (int64_t)options->TestingMinExitFlagThreshold; + } return node->ri && router_is_active(node->ri, node, now) && !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) && - (dirserv_get_credible_bandwidth(node->ri) >= - ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER) && (have_mbw || !require_mbw); + (dirserv_get_credible_bandwidth(node->ri) >= min_bw) && + (have_mbw || !require_mbw); } /** Look through the routerlist, the Mean Time Between Failure history, and diff --git a/src/or/or.h b/src/or/or.h index 2b0102d..4e19140 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3910,6 +3910,9 @@ typedef struct { * of certain configuration options. */ int TestingTorNetwork; + /** Minimum value for the Exit flag threshold on testing networks. */ + uint64_t TestingMinExitFlagThreshold; + /** Minimum value for the Fast flag threshold on testing networks. */ uint64_t TestingMinFastFlagThreshold;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit a87f22ef6499818c1ff32f30c66e2e18d1e80ddf Merge: 63a42b3 5c5198e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 14:26:22 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8408 | 4 ++++ doc/tor.1.txt | 5 +++++ src/or/circuituse.c | 1 + src/or/config.c | 2 ++ src/or/dirserv.c | 13 +++++++++++-- src/or/or.h | 6 ++++++ 6 files changed, 29 insertions(+), 2 deletions(-)

1 0

[tor/master] Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit a660fe6fd51cd511cdc610e4a50f06d59cbf74aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 13:34:57 2013 -0400 Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG This adds a new option to fix bug 8508 which broke chutney networks. The bug was introduced by 317d16de. --- changes/bug8408 | 4 ++++ doc/tor.1.txt | 5 +++++ src/or/config.c | 1 + src/or/dirserv.c | 3 +++ src/or/or.h | 3 +++ 5 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/bug8408 b/changes/bug8408 new file mode 100644 index 0000000..ae9cf17 --- /dev/null +++ b/changes/bug8408 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Allow TestingTorNetworks to override the 4096-byte minimum for the Fast + threshold. Otherwise they can't bootstrap until they've observed more + traffic. Fixes bug 8508; bugfix on 0.2.4.10-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3be90be..5727ec3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2019,6 +2019,11 @@ The following options are used for running a testing Tor network. time. Changing this requires that **TestingTorNetwork** is set. (Default: 10 minutes) +**TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: + Minimum value for the Fast flag. Overrides the ordinary minimum taken + from the consensus when TestingTorNetwork is set. (Default: 0.) + + SIGNALS ------- diff --git a/src/or/config.c b/src/or/config.c index 2b8eab7..9e2230e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -341,6 +341,7 @@ static config_var_t option_vars_[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(TestingMinFastFlagThreshold, MEMUNIT, "0"), V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), V(PortForwardingHelper, FILENAME, "tor-fw-helper"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8e8f79a..81f328a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2005,6 +2005,9 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG, ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG, INT32_MAX); + if (options->TestingTorNetwork) { + min_fast = (int32_t)options->TestingMinFastFlagThreshold; + } max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold", INT32_MAX, min_fast, INT32_MAX); if (fast_bandwidth < (uint32_t)min_fast) diff --git a/src/or/or.h b/src/or/or.h index 6731552..2b0102d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3910,6 +3910,9 @@ typedef struct { * of certain configuration options. */ int TestingTorNetwork; + /** Minimum value for the Fast flag threshold on testing networks. */ + uint64_t TestingMinFastFlagThreshold; + /** If true, and we have GeoIP data, and we're a bridge, keep a per-country * count of how many client addresses have contacted us so that we can help * the bridge authority guess which countries have blocked access to us. */

1 0

[tor/master] Fix an EOL@EOF in circuituse.c
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 8e29a7ae1da643197cc237ecb81096cd55913eff Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 20 11:03:18 2013 -0700 Fix an EOL@EOF in circuituse.c --- src/or/circuituse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d48449f..f02597e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2312,3 +2312,4 @@ mark_circuit_unusable_for_new_conns(origin_circuit_t *circ) circ->unusable_for_new_conns = 1; } +

1 0

[tor/maint-0.2.4] Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit a660fe6fd51cd511cdc610e4a50f06d59cbf74aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 13:34:57 2013 -0400 Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG This adds a new option to fix bug 8508 which broke chutney networks. The bug was introduced by 317d16de. --- changes/bug8408 | 4 ++++ doc/tor.1.txt | 5 +++++ src/or/config.c | 1 + src/or/dirserv.c | 3 +++ src/or/or.h | 3 +++ 5 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/bug8408 b/changes/bug8408 new file mode 100644 index 0000000..ae9cf17 --- /dev/null +++ b/changes/bug8408 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Allow TestingTorNetworks to override the 4096-byte minimum for the Fast + threshold. Otherwise they can't bootstrap until they've observed more + traffic. Fixes bug 8508; bugfix on 0.2.4.10-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3be90be..5727ec3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2019,6 +2019,11 @@ The following options are used for running a testing Tor network. time. Changing this requires that **TestingTorNetwork** is set. (Default: 10 minutes) +**TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**:: + Minimum value for the Fast flag. Overrides the ordinary minimum taken + from the consensus when TestingTorNetwork is set. (Default: 0.) + + SIGNALS ------- diff --git a/src/or/config.c b/src/or/config.c index 2b8eab7..9e2230e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -341,6 +341,7 @@ static config_var_t option_vars_[] = { V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(TestingMinFastFlagThreshold, MEMUNIT, "0"), V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), V(PortForwardingHelper, FILENAME, "tor-fw-helper"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8e8f79a..81f328a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2005,6 +2005,9 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG, ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG, INT32_MAX); + if (options->TestingTorNetwork) { + min_fast = (int32_t)options->TestingMinFastFlagThreshold; + } max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold", INT32_MAX, min_fast, INT32_MAX); if (fast_bandwidth < (uint32_t)min_fast) diff --git a/src/or/or.h b/src/or/or.h index 6731552..2b0102d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3910,6 +3910,9 @@ typedef struct { * of certain configuration options. */ int TestingTorNetwork; + /** Minimum value for the Fast flag threshold on testing networks. */ + uint64_t TestingMinFastFlagThreshold; + /** If true, and we have GeoIP data, and we're a bridge, keep a per-country * count of how many client addresses have contacted us so that we can help * the bridge authority guess which countries have blocked access to us. */

1 0