August 2012 - tor-commits - lists.torproject.org

[compass/master] Improve warning
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 82f879447132dfaf52da8109adf228240afcd52b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Wed Aug 22 23:36:39 2012 +0530 Improve warning The warning message now gets called only if two ipv4 addresses are present in or_addresses and doesn't care about ipv6 ones. --- compass.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compass.py b/compass.py index 3e20c96..737f667 100755 --- a/compass.py +++ b/compass.py @@ -90,13 +90,15 @@ class SameNetworkFilter(BaseFilter): def load(self, all_relays): for relay in all_relays: or_addresses = relay.get("or_addresses") - if len(or_addresses) > 1: - print "[WARNING] - %s has more than two OR Addresses - %s" % relay.get("fingerprint"), or_addresses + no_of_addresses = 0 for ip in or_addresses: ip, port = ip.rsplit(':', 1) # skip if ipv6 if ':' in ip: continue + no_of_addresses += 1 + if no_of_addresses > 1: + print "[WARNING] - %s has more than two OR Addresses - %s" % relay.get("fingerprint"), or_addresses network = ip.rsplit('.', 1)[0] relay_info = self.Relay(relay) if self.network_data.has_key(network):

1 0

[compass/master] Refactor AlmostFastExitFilter
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 985149b492b44a70a9c1ad7e1568ab79dffcf5ed Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Aug 24 10:49:49 2012 +0530 Refactor AlmostFastExitFilter --- compass.py | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/compass.py b/compass.py index 737f667..04b8313 100755 --- a/compass.py +++ b/compass.py @@ -163,6 +163,33 @@ class FastExitFilter(BaseFilter): return self.inverse return not self.inverse +class AlmostFastExitFilter(BaseFilter): + def load(self, relays): + exit_filter = FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False) + fast_relays = exit_filter.load(relays) + same_network_filter = SameNetworkFilter() + fast_relays_with_network_restriction = same_network_filter.load(fast_relays) + almost_exit_filter = FastExitFilter(80* 125* 1024, 2000 * 1024, [80, 443], False) + almost_fast_relays = almost_exit_filter.load(relays) + almost_exit_filter = FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True) + almost_fast_relays = almost_exit_filter.load(almost_fast_relays) + diffed_relays = self.diff(fast_relays, fast_relays_with_network_restriction) + return self.union(diffed_relays, almost_fast_relays) + + def diff(self, relays_a, relays_b): + relays_a = dict([(relay.get('fingerprint'), relay) for relay in relays_a]) + relays_b = dict([(relay.get('fingerprint'), relay) for relay in relays_b]) + total_relays = dict(relays_a.items() + relays_b.items()) + set_diff = set(relays_a.keys()) - set(relays_b.keys()) + return [total_relays[fp] for fp in set_diff] + + def union(self, relays_a, relays_b): + relays_a = dict([(relay.get('fingerprint'), relay) for relay in relays_a]) + relays_b = dict([(relay.get('fingerprint'), relay) for relay in relays_b]) + total_relays = dict(relays_a.items() + relays_b.items()) + set_union = set(relays_a.keys()) | set(relays_b.keys()) + return [total_relays[fp] for fp in set_union] + class RelayStats(object): def __init__(self, options): self._data = None @@ -180,12 +207,13 @@ class RelayStats(object): def relays(self): if self._relays: return self._relays - + self._relays = {} relays = self.data['relays'] + for f in self._filters: relays = f.load(relays) - + for relay in relays: self.add_relay(relay) return self._relays @@ -208,9 +236,7 @@ class RelayStats(object): filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False)) filters.append(SameNetworkFilter()) if options.almost_fast_exits_only: - filters.append(FastExitFilter(80 * 125 * 1024, 2000 * 1024, [80, 443], False)) - filters.append(SameNetworkFilter()) - filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True)) + filters.append(AlmostFastExitFilter()) return filters def _get_group_function(self, options):

1 0

[compass/master] Refactor Sathya's almost-fast exits code a bit.
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 3ba4dcbe55d7a50bb3ed3eddc6a6a545087fe4e3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 09:25:40 2012 +0200 Refactor Sathya's almost-fast exits code a bit. --- compass.py | 212 +++++++++++++++++++++++++++++------------------------------- 1 files changed, 103 insertions(+), 109 deletions(-) diff --git a/compass.py b/compass.py index 04b8313..770e563 100755 --- a/compass.py +++ b/compass.py @@ -76,119 +76,101 @@ class ExitFilter(BaseFilter): def accept(self, relay): return relay.get('exit_probability', -1) > 0.0 -class SameNetworkFilter(BaseFilter): +class GuardFilter(BaseFilter): + def accept(self, relay): + return relay.get('guard_probability', -1) > 0.0 + +class FastExitFilter(BaseFilter): + class Relay(object): def __init__(self, relay): self.exit = relay.get('exit_probability') self.fp = relay.get('fingerprint') self.relay = relay - - def __init__(self): - self.network_data = {} - self.relays = [] - - def load(self, all_relays): - for relay in all_relays: - or_addresses = relay.get("or_addresses") - no_of_addresses = 0 - for ip in or_addresses: - ip, port = ip.rsplit(':', 1) - # skip if ipv6 - if ':' in ip: - continue - no_of_addresses += 1 - if no_of_addresses > 1: - print "[WARNING] - %s has more than two OR Addresses - %s" % relay.get("fingerprint"), or_addresses - network = ip.rsplit('.', 1)[0] - relay_info = self.Relay(relay) - if self.network_data.has_key(network): - if len(self.network_data[network]) > 1: - # assume current relay to have smallest exit_probability - min_exit = relay.get('exit_probability') - min_id = -1 - for id, value in enumerate(self.network_data[network]): - if value.exit < min_exit: - min_exit = value.exit - min_id = id - if min_id != -1: - del self.network_data[network][min_id] - self.network_data[network].append(relay_info) - else: - self.network_data[network].append(relay_info) - else: - self.network_data[network] = [relay_info] - - for relay_list in self.network_data.values(): - self.relays.extend([relay.relay for relay in relay_list]) - return self.relays - - def accept(self, relay): - return relay.get('fingerprint') in self.relays_fp - -class GuardFilter(BaseFilter): - def accept(self, relay): - return relay.get('guard_probability', -1) > 0.0 -class FastExitFilter(BaseFilter): - def __init__(self, bandwidth_rate, advertised_bandwidth, ports, inverse=False): + def __init__(self, bandwidth_rate, advertised_bandwidth, ports, same_network, inverse=False): self.bandwidth_rate = bandwidth_rate self.advertised_bandwidth = advertised_bandwidth self.ports = ports + self.same_network = same_network self.inverse = inverse - - def accept(self, relay): - if relay.get('bandwidth_rate', -1) < self.bandwidth_rate: - return self.inverse - if relay.get('advertised_bandwidth', -1) < self.advertised_bandwidth: - return self.inverse - relevant_ports = set(self.ports) - summary = relay.get('exit_policy_summary', {}) - if 'accept' in summary: - portlist = summary['accept'] - elif 'reject' in summary: - portlist = summary['reject'] - else: - return self.inverse - ports = [] - for p in portlist: - if '-' in p: - ports.extend(range(int(p.split('-')[0]), - int(p.split('-')[1]) + 1)) + + def load(self, all_relays): + + # First, filter relays based on bandwidth and port requirements. + matching_relays = [] + for relay in all_relays: + if relay.get('bandwidth_rate', -1) < self.bandwidth_rate: + continue + if relay.get('advertised_bandwidth', -1) < self.advertised_bandwidth: + continue + relevant_ports = set(self.ports) + summary = relay.get('exit_policy_summary', {}) + if 'accept' in summary: + portlist = summary['accept'] + elif 'reject' in summary: + portlist = summary['reject'] else: - ports.append(int(p)) - policy_ports = set(ports) - if 'accept' in summary and not relevant_ports.issubset(policy_ports): - return self.inverse - if 'reject' in summary and not relevant_ports.isdisjoint(policy_ports): - return self.inverse - return not self.inverse - -class AlmostFastExitFilter(BaseFilter): - def load(self, relays): - exit_filter = FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False) - fast_relays = exit_filter.load(relays) - same_network_filter = SameNetworkFilter() - fast_relays_with_network_restriction = same_network_filter.load(fast_relays) - almost_exit_filter = FastExitFilter(80* 125* 1024, 2000 * 1024, [80, 443], False) - almost_fast_relays = almost_exit_filter.load(relays) - almost_exit_filter = FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True) - almost_fast_relays = almost_exit_filter.load(almost_fast_relays) - diffed_relays = self.diff(fast_relays, fast_relays_with_network_restriction) - return self.union(diffed_relays, almost_fast_relays) - - def diff(self, relays_a, relays_b): - relays_a = dict([(relay.get('fingerprint'), relay) for relay in relays_a]) - relays_b = dict([(relay.get('fingerprint'), relay) for relay in relays_b]) - total_relays = dict(relays_a.items() + relays_b.items()) - set_diff = set(relays_a.keys()) - set(relays_b.keys()) - return [total_relays[fp] for fp in set_diff] - - def union(self, relays_a, relays_b): - relays_a = dict([(relay.get('fingerprint'), relay) for relay in relays_a]) - relays_b = dict([(relay.get('fingerprint'), relay) for relay in relays_b]) - total_relays = dict(relays_a.items() + relays_b.items()) - set_union = set(relays_a.keys()) | set(relays_b.keys()) - return [total_relays[fp] for fp in set_union] + continue + ports = [] + for p in portlist: + if '-' in p: + ports.extend(range(int(p.split('-')[0]), + int(p.split('-')[1]) + 1)) + else: + ports.append(int(p)) + policy_ports = set(ports) + if 'accept' in summary and not relevant_ports.issubset(policy_ports): + continue + if 'reject' in summary and not relevant_ports.isdisjoint(policy_ports): + continue + matching_relays.append(relay) + + # Second, filter relays based on same /24 requirement. + if self.same_network: + network_data = {} + for relay in matching_relays: + or_addresses = relay.get("or_addresses") + no_of_addresses = 0 + for ip in or_addresses: + ip, port = ip.rsplit(':', 1) + # skip if ipv6 + if ':' in ip: + continue + no_of_addresses += 1 + if no_of_addresses > 1: + print "[WARNING] - %s has more than one IPv4 OR address - %s" % relay.get("fingerprint"), or_addresses + network = ip.rsplit('.', 1)[0] + relay_info = self.Relay(relay) + if network_data.has_key(network): + if len(network_data[network]) > 1: + # assume current relay to have smallest exit_probability + min_exit = relay.get('exit_probability') + min_id = -1 + for id, value in enumerate(network_data[network]): + if value.exit < min_exit: + min_exit = value.exit + min_id = id + if min_id != -1: + del network_data[network][min_id] + network_data[network].append(relay_info) + else: + network_data[network].append(relay_info) + else: + network_data[network] = [relay_info] + matching_relays = [] + for relay_list in network_data.values(): + matching_relays.extend([relay.relay for relay in relay_list]) + + # Either return relays meeting all requirements, or the inverse set. + if self.inverse: + inverse_relays = [] + for relay in all_relays: + if relay not in matching_relays: + inverse_relays.append(relay) + return inverse_relays + else: + return matching_relays class RelayStats(object): def __init__(self, options): @@ -233,10 +215,12 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False)) - filters.append(SameNetworkFilter()) + filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True, False)) if options.almost_fast_exits_only: - filters.append(AlmostFastExitFilter()) + filters.append(FastExitFilter(80 * 125 * 1024, 2000 * 1024, [80, 443], False, False)) + filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True, True)) + if options.fast_exits_only_any_network: + filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False, False)) return filters def _get_group_function(self, options): @@ -355,10 +339,12 @@ def create_option_parser(): help="select family by fingerprint or nickname (for named relays)") group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") - group.add_option("-x", "--fast-exits-only", action="store_true", - help="select only 100+ Mbit/s exits allowing ports 80, 443, 554, and 1755") - group.add_option("-w", "--almost-fast-exits-only", action="store_true", - help="select only 80+ & 95- Mbit/s exits allowing ports 80, 443, 554, and 1755") + group.add_option("--fast-exits-only", action="store_true", + help="select only fast exits (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755, 2- per /24)") + group.add_option("--almost-fast-exits-only", action="store_true", + help="select only almost fast exits (80+ Mbit/s, 2000+ KB/s, 80/443, not in set of fast exits)") + group.add_option("--fast-exits-only-any-network", action="store_true", + help="select only fast exits without network restriction (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755") parser.add_option_group(group) group = OptionGroup(parser, "Grouping options") group.add_option("-A", "--by-as", action="store_true", default=False, @@ -391,6 +377,14 @@ if '__main__' == __name__: if options.family and not re.match(r'^[A-F0-9]{40}$', options.family) and not re.match(r'^[A-Za-z0-9]{1,19}$', options.family): parser.error("Not a valid fingerprint or nickname: %s" % options.family) + + fast_exit_options = 0 + if options.fast_exits_only: fast_exit_options += 1 + if options.almost_fast_exits_only: fast_exit_options += 1 + if options.fast_exits_only_any_network: fast_exit_options += 1 + if fast_exit_options > 1: + parser.error("Can only filter by one fast-exit option.") + if options.download: download_details_file() print "Downloaded details.json. Re-run without --download option."

1 0

[compass/master] Remove unneeded newlines.
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit de49b83777b8611557011ee690add0d371829309 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 13:38:05 2012 +0200 Remove unneeded newlines. --- compass.py | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/compass.py b/compass.py index 770e563..7da2a67 100755 --- a/compass.py +++ b/compass.py @@ -81,7 +81,6 @@ class GuardFilter(BaseFilter): return relay.get('guard_probability', -1) > 0.0 class FastExitFilter(BaseFilter): - class Relay(object): def __init__(self, relay): self.exit = relay.get('exit_probability') @@ -96,7 +95,6 @@ class FastExitFilter(BaseFilter): self.inverse = inverse def load(self, all_relays): - # First, filter relays based on bandwidth and port requirements. matching_relays = [] for relay in all_relays: @@ -125,7 +123,6 @@ class FastExitFilter(BaseFilter): if 'reject' in summary and not relevant_ports.isdisjoint(policy_ports): continue matching_relays.append(relay) - # Second, filter relays based on same /24 requirement. if self.same_network: network_data = {} @@ -161,7 +158,6 @@ class FastExitFilter(BaseFilter): matching_relays = [] for relay_list in network_data.values(): matching_relays.extend([relay.relay for relay in relay_list]) - # Either return relays meeting all requirements, or the inverse set. if self.inverse: inverse_relays = [] @@ -189,13 +185,10 @@ class RelayStats(object): def relays(self): if self._relays: return self._relays - self._relays = {} relays = self.data['relays'] - for f in self._filters: relays = f.load(relays) - for relay in relays: self.add_relay(relay) return self._relays @@ -374,25 +367,20 @@ if '__main__' == __name__: (options, args) = parser.parse_args() if len(args) > 0: parser.error("Did not understand positional argument(s), use options instead.") - if options.family and not re.match(r'^[A-F0-9]{40}$', options.family) and not re.match(r'^[A-Za-z0-9]{1,19}$', options.family): parser.error("Not a valid fingerprint or nickname: %s" % options.family) - fast_exit_options = 0 if options.fast_exits_only: fast_exit_options += 1 if options.almost_fast_exits_only: fast_exit_options += 1 if options.fast_exits_only_any_network: fast_exit_options += 1 if fast_exit_options > 1: parser.error("Can only filter by one fast-exit option.") - if options.download: download_details_file() print "Downloaded details.json. Re-run without --download option." exit() - if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json')): parser.error("Did not find details.json. Re-run with --download.") - stats = RelayStats(options) sorted_groups = stats.format_and_sort_groups(stats.relays, by_country=options.by_country,

1 0

[compass/master] Change default value of top
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 22e666233688ceaf0e5cc710ee02773e78c00c30 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Aug 24 21:32:22 2012 +0530 Change default value of top If top value is not specified, then it should show all the relays; not just the top 10 relays. --- app.py | 4 ++-- templates/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index e7ef634..d84cbdc 100644 --- a/app.py +++ b/app.py @@ -12,7 +12,7 @@ class Opt(object): self.by_country = False self.ases = None self.country = None - self.top = 10 + self.top = -1 self.short = None self.links = None self.guards_only = None @@ -104,7 +104,7 @@ def result(): try: options.top = int(value) except: - options.top = 10 + options.top = -1 elif key == "sort": sort_key = value elif key in ["country", "ases"]: diff --git a/templates/index.html b/templates/index.html index 2ea271d..278765c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -132,8 +132,8 @@ <label class="control-label" for="top">Number of results</label> <div class="controls"> <input type="text" class="input-xlarge" id="top" name="top" - placeholder="10" value="10"> - <span class="help-inline">display only the top results</span> + placeholder="-1" value="-1"> + <span class="help-inline">display only the top results (-1 for all)</span> </div> </div> <div class="form-actions">

1 0

[compass/master] Add more exit filtering options to HTML
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 21702ff29dcd79622ad6aad5659ba9e47a918e87 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Aug 24 22:00:18 2012 +0530 Add more exit filtering options to HTML Add radio buttons which invoke different filtering options that were newly added to compass. --- app.py | 4 ++++ templates/index.html | 32 ++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app.py b/app.py index 2c60a01..e7ef634 100644 --- a/app.py +++ b/app.py @@ -21,6 +21,8 @@ class Opt(object): self.exits_only = False self.download = None self.fast_exits_only = False + self.fast_exits_only_any_network = False + self.all_relays = False class Result(): def __init__(self): @@ -110,6 +112,8 @@ def result(): setattr(options, key, [value]) else: setattr(options, key, None) + elif key == "exits": + setattr(options, value, True) else: setattr(options, key, value) diff --git a/templates/index.html b/templates/index.html index 14e5866..2ea271d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,3 @@ - <!DOCTYPE html> <html lang="en"> <head> @@ -74,15 +73,6 @@ <input type="checkbox" id="exit" value="True" name="exits_only"> select only relays suitable for exit position</label> </div> - <label class="control-label" for="fastExit">Fast - Exit Nodes</label> - <div class="controls"> - <label class="checkbox"> - <input type="checkbox" id="fastExit" value="True" name="fast_exits_only"> - select only 100+ Mbit/s exits allowing ports 80, - 443, 554, and 1755 - </label> - </div> <label class="control-label" for="family">Family</label> <div class="controls"> <input type="text" class="input-xlarge" id="family" name="family" @@ -102,6 +92,26 @@ <span class="help-inline">select only relays from country with code</span> </div> </div> + <label class="control-label" for="exits">Exits</label> + <div class="controls"> + <label class="radio"> + <input type="radio" name="exits" id="all_relays" value="all_relays" checked> + All relays + </label> + <label class="radio"> + <input type="radio" name="exits" id="exits_only" value="fast_exits_only"> + Fast exit relays (95+ Mbit/s, 5000+ KB/s, + 80/443/554/1755, 2 relays per /24) + </label> + <label class="radio"> + <input type="radio" name="exits" id="almost_fast_relays" value="almost_fast_exits_only"> + Almost fast exit relays (80+ Mbit/s, 2000+ KB/s, 80/443, not in set of fast exits) + </label> + <label class="radio"> + <input type="radio" name="exits" id="exit_relays_any_nw" value="fast_exits_only_any_network"> + Fast exits relays any network (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755) + </label> + </div> <div class="control-group"> <h3> Group </h3> <label class="control-label" for="country">Country</label> @@ -150,6 +160,8 @@  <script src="{{ url_for('static', filename='js/jquery-1.8.0.min.js') }}"></script> + <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> + <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> var myForm = document.getElementById('form');

1 0

r25771: {website} the .onion addresses are actually not uniquely derived from (website/trunk/docs/en)
by Roger Dingledine 24 Aug '12

24 Aug '12

Author: arma Date: 2012-08-24 17:04:46 +0000 (Fri, 24 Aug 2012) New Revision: 25771 Modified: website/trunk/docs/en/hidden-services.wml Log: the .onion addresses are actually not uniquely derived from the service's key -- many different keys could in theory produce the same .onion address (though we hope they don't in practice). Modified: website/trunk/docs/en/hidden-services.wml =================================================================== --- website/trunk/docs/en/hidden-services.wml 2012-08-24 14:17:56 UTC (rev 25770) +++ website/trunk/docs/en/hidden-services.wml 2012-08-24 17:04:46 UTC (rev 25771) @@ -47,7 +47,7 @@ introduction point, and signs this descriptor with its private key. It uploads that descriptor to a distributed hash table. The descriptor will be found by clients requesting XYZ.onion where XYZ is a 16 character - name that can be uniquely derived from the service's public key. After + name derived from the service's public key. After this step, the hidden service is set up. </p>

1 0

[tor/maint-0.2.3] When iterating over connections pending DNS, skip marked ones
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit 223e7cfabec5a75a7acd919210f838511e39cb16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 16:46:11 2012 -0400 When iterating over connections pending DNS, skip marked ones Failure to do this would lead to double-free cases and similar, especially when the exit's DNS was broken. See bug 6472 for full details; this is a fix for 6472. Anonymous patch from "cypherpunks" on trac. --- changes/bug6472 | 4 ++++ src/or/dns.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changes/bug6472 b/changes/bug6472 new file mode 100644 index 0000000..dcd42eb --- /dev/null +++ b/changes/bug6472 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid a pair of double-free and use-after-mark bugs that can + occur with certain timings in canceled and re-received DNS + requests. Fix for bug 6472; bugfix on 0.0.7rc1. diff --git a/src/or/dns.c b/src/or/dns.c index 3e88fad..78893bf 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -450,16 +450,17 @@ purge_expired_resolves(time_t now) if (resolve->pending_connections) { log_debug(LD_EXIT, "Closing pending connections on timed-out DNS resolve!"); - tor_fragile_assert(); while (resolve->pending_connections) { pend = resolve->pending_connections; resolve->pending_connections = pend->next; /* Connections should only be pending if they have no socket. */ tor_assert(!SOCKET_OK(pend->conn->_base.s)); pendconn = pend->conn; - connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); - circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); - connection_free(TO_CONN(pendconn)); + if (!pendconn->_base.marked_for_close) { + connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); + circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); + connection_free(TO_CONN(pendconn)); + } tor_free(pend); } } @@ -1091,6 +1092,13 @@ dns_found_answer(const char *address, uint8_t is_reverse, uint32_t addr, pendconn = pend->conn; /* don't pass complex things to the connection_mark_for_close macro */ assert_connection_ok(TO_CONN(pendconn),time(NULL)); + if (pendconn->_base.marked_for_close) { + /* prevent double-remove. */ + pendconn->_base.state = EXIT_CONN_STATE_RESOLVEFAILED; + resolve->pending_connections = pend->next; + tor_free(pend); + continue; + } tor_addr_from_ipv4h(&pendconn->_base.addr, addr); pendconn->address_ttl = ttl;

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6472' into maint-0.2.3
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit ce4add498f6af197a0e856d262825d547f898305 Merge: 991a8ac 223e7cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 24 12:51:02 2012 -0400 Merge remote-tracking branch 'public/bug6472' into maint-0.2.3 changes/bug6472 | 4 ++++ src/or/dns.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-)

1 0

[tor/master] Make node_assert_ok less duplicatey
by nickm＠torproject.org 24 Aug '12

24 Aug '12

commit ca09ea0a8b292a6a06a3c05c2a375817d02031e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 24 12:48:23 2012 -0400 Make node_assert_ok less duplicatey This comes at the cost of making its failure message a little less friendly, but since when do assertion failures count as user-friendly? --- src/or/nodelist.h | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/or/nodelist.h b/src/or/nodelist.h index c93b67a..5558827 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -12,14 +12,8 @@ #ifndef _TOR_NODELIST_H #define _TOR_NODELIST_H -/* XXX duplicating code from tor_assert(). */ -#define node_assert_ok(n) STMT_BEGIN \ - if (PREDICT_UNLIKELY((n)->ri == NULL && (n)->rs == NULL)) { \ - log_err(LD_BUG, "%s:%d: %s: Node is invalid; aborting.", \ - _SHORT_FILE_, __LINE__, __func__); \ - fprintf(stderr, "%s:%d: %s: Node is invalid; aborting.\n", \ - _SHORT_FILE_, __LINE__, __func__); \ - abort(); \ +#define node_assert_ok(n) STMT_BEGIN { \ + tor_assert((n)->ri || (n)->rs); \ } STMT_END node_t *node_get_mutable_by_id(const char *identity_digest);

1 0