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

[sbws/master] destination, scanner: choose exits with same flags
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit b2eeda230bbcd82eaee419f9aced709274da2012 Author: juga0 <juga(a)riseup.net> Date: Thu Nov 22 14:25:50 2018 +0000 destination, scanner: choose exits with same flags The flags are: not having a badflag and the policy allows to exit to a port. --- sbws/core/scanner.py | 7 +++---- sbws/lib/destination.py | 3 +-- sbws/lib/relaylist.py | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 6188a19..6c63b68 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -136,8 +136,8 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit): destination **dest**, pick a second relay that is or is not an exit according to **is_exit**. ''' - candidates = [] - candidates.extend(rl.exits if is_exit else rl.non_exits) + candidates = rl.exits_not_bad_allowing_port(dest.port) if is_exit \ + else rl.non_exits if not len(candidates): return None log.debug('Picking a 2nd hop to measure %s from %d choices. is_exit=%s', @@ -177,8 +177,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay): # exit, then pick a non-exit. Otherwise pick an exit. helper = None circ_fps = None - if relay.can_exit_to(dest.hostname, dest.port) and \ - relay not in rl.bad_exits: + if relay.is_exit_not_bad_allowing_port(dest.port): helper = _pick_ideal_second_hop( relay, dest, rl, cb.controller, is_exit=False) if helper: diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index d01fd04..ddbe6c8 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -179,8 +179,7 @@ class DestinationList: session = requests_utils.make_session(cont, timeout) usable_dests = [] for dest in self._all_dests: - possible_exits = [e for e in self._rl.exits - if e.can_exit_to(dest.hostname, dest.port)] + possible_exits = self._rl.exits_not_bad_allowing_port(dest.port) # Keep the fastest 10% of exits, or 3, whichever is larger num_keep = int(max(3, len(possible_exits) * 0.1)) possible_exits = sorted( diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 28802a1..17761a6 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -231,7 +231,6 @@ class RelayList: self._relays = self._init_relays() self._last_refresh = time.time() - def exits_not_bad_allowing_port(self, port): return [r for r in self.exits if r.is_exit_not_bad_allowing_port(port)]

1 0

[sbws/master] relaylist: add method to check exit policy with port
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit d980582f240801ef2c98011d3066b5af9394c0c5 Author: juga0 <juga(a)riseup.net> Date: Thu Nov 22 14:18:40 2018 +0000 relaylist: add method to check exit policy with port In order to do not relay on resolving a domain locally to check the IP in the exit policy. --- sbws/lib/relaylist.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 9402574..9d5c050 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -127,6 +127,17 @@ class Relay: assert is_valid_ipv4_address(host) or is_valid_ipv6_address(host) return self.exit_policy.can_exit_to(host, port) + def can_exit_to_port(self, port): + """ + Returns True if the relay has an exit policy and the policy accepts + exiting to the given portself or False otherwise. + """ + assert isinstance(port, int) + # if dind't get the descriptor, there isn't exit policy + if not self.exit_policy: + return False + return self.exit_policy.can_exit_to(port=port) + class RelayList: ''' Keeps a list of all relays in the current Tor network and updates it

1 0

[sbws/master] relaylist: add method to get exits with some flags
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit 2e100e818da0ad50bb9ddb4bb72ae4968f286166 Author: juga0 <juga(a)riseup.net> Date: Thu Nov 22 14:23:15 2018 +0000 relaylist: add method to get exits with some flags The flags are: not have the badflag and the policy allows to exit to a port. --- sbws/lib/relaylist.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 979ae7f..28802a1 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -230,3 +230,8 @@ class RelayList: def _refresh(self): self._relays = self._init_relays() self._last_refresh = time.time() + + + def exits_not_bad_allowing_port(self, port): + return [r for r in self.exits + if r.is_exit_not_bad_allowing_port(port)]

1 0

[sbws/master] Merge branch 'bug28458_02'
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit c4f7a3a2eff3af53c319a6e7206d7a022be6aca1 Merge: 54afe75 bad2291 Author: juga0 <juga(a)riseup.net> Date: Mon Dec 3 22:32:32 2018 +0000 Merge branch 'bug28458_02' CHANGELOG.md | 2 ++ sbws/core/scanner.py | 7 +++---- sbws/globals.py | 23 ----------------------- sbws/lib/destination.py | 3 +-- sbws/lib/relaylist.py | 43 +++++++++++++++++-------------------------- 5 files changed, 23 insertions(+), 55 deletions(-)

1 0

[sbws/master] globals: remove unused resolve and can_exit_to functions
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit bad22915444fbd647acc40f73ea4dab1615a7f1d Author: juga0 <juga(a)riseup.net> Date: Mon Dec 3 21:37:02 2018 +0000 globals: remove unused resolve and can_exit_to functions They were used to resolve the IP of the destination and check whether an exit policy allows to exit to that IP, but when the destination is a CDN, the IP locally resolved would be different to the IP resolved in the exit, and when the IP resolved to IPv6, it was possible that the scanner didn't have IPv6. The correct method to check whether an exit policy allows to exit to an IP, would be to resolve the domain via Tor itself using RESOLVE and ADDRMAP events with that exit. --- sbws/globals.py | 23 ----------------------- sbws/lib/relaylist.py | 29 ----------------------------- 2 files changed, 52 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 217e1a7..a621b5f 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -1,6 +1,5 @@ import os import logging -import socket log = logging.getLogger(__name__) @@ -70,25 +69,3 @@ def touch_file(fname, times=None): log.debug('Touching %s', fname) with open(fname, 'a') as fd: os.utime(fd.fileno(), times=times) - - -def resolve(hostname, ipv4_only=False, ipv6_only=False): - assert not (ipv4_only and ipv6_only) - results = [] - try: - results = socket.getaddrinfo(hostname, 0) - except socket.gaierror: - log.warn( - 'Unable to resolve %s hostname. Returning empty list of addresses', - hostname) - return [] - ret = set() - for result in results: - fam, _, _, _, addr = result - if fam == socket.AddressFamily.AF_INET6 and not ipv4_only: - ret.add(addr[0]) - elif fam == socket.AddressFamily.AF_INET and not ipv6_only: - ret.add(addr[0]) - else: - assert None, 'Unknown address family {}'.format(fam) - return list(ret) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 17761a6..00e67ed 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -1,12 +1,9 @@ from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import ServerDescriptor from stem import Flag, DescriptorUnavailable, ControllerError -from stem.util.connection import is_valid_ipv4_address -from stem.util.connection import is_valid_ipv6_address import random import time import logging -from sbws.globals import resolve from threading import Lock log = logging.getLogger(__name__) @@ -101,32 +98,6 @@ class Relay: return None return key.rstrip('=') - def can_exit_to(self, host, port): - ''' - Returns if this relay can MOST LIKELY exit to the given host:port. - **host** can be a hostname, but be warned that we will resolve it - locally and use the first (arbitrary/unknown order) result when - checking exit policies, which is different than what other parts of the - code may do (leaving it up to the exit to resolve the name). - ''' - if not self.exit_policy: - return False - assert isinstance(host, str) - assert isinstance(port, int) - if not is_valid_ipv4_address(host) and not is_valid_ipv6_address(host): - # It certainly isn't perfect trying to guess if an exit can connect - # to an ipv4/6 address based on the DNS result we got locally. But - # it's the best we can do. - # - # Also, only use the first ipv4/6 we get even if there is more than - # one. - results = resolve(host) - if not len(results): - return False - host = results[0] - assert is_valid_ipv4_address(host) or is_valid_ipv6_address(host) - return self.exit_policy.can_exit_to(host, port) - def can_exit_to_port(self, port): """ Returns True if the relay has an exit policy and the policy accepts

1 0

[sbws/master] v3bwfile: add consensus bandwidth and is_unmeasured
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit a9222fcea717a541e1880e830f7fb58e751130cf Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 16:32:35 2018 +0000 v3bwfile: add consensus bandwidth and is_unmeasured attributes to BWLine. Add methods to obtain them from results. --- sbws/lib/v3bwfile.py | 48 ++++++++++++++++++++++++++++++++++------- tests/unit/lib/test_v3bwfile.py | 1 + 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index e08ef28..1cf7b63 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -51,7 +51,9 @@ BW_KEYVALUES_FILE = BW_KEYVALUES_BASIC + \ ['master_key_ed25519', 'nick', 'rtt', 'time', 'success', 'error_stream', 'error_circ', 'error_misc'] BW_KEYVALUES_EXTRA_BWS = ['bw_median', 'bw_mean', 'desc_bw_avg', 'desc_bw_bur', - 'desc_bw_obs_last', 'desc_bw_obs_mean'] + 'desc_bw_obs_last', 'desc_bw_obs_mean', + 'consensus_bandwidth', + 'consensus_bandwidth_is_unmeasured'] BW_KEYVALUES_EXTRA = BW_KEYVALUES_FILE + BW_KEYVALUES_EXTRA_BWS BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', 'error_circ', 'error_misc'] + BW_KEYVALUES_EXTRA_BWS @@ -338,6 +340,11 @@ class V3BWLine(object): cls.desc_bw_avg_from_results(results_recent) kwargs['desc_bw_bur'] = \ cls.desc_bw_bur_from_results(results_recent) + kwargs['consensus_bandwidth'] = \ + cls.consensus_bandwidth_from_results(results_recent) + kwargs['consensus_bandwidth_is_unmeasured'] = \ + cls.consensus_bandwidth_is_unmeasured_from_results( + results_recent) kwargs['desc_bw_obs_last'] = \ cls.desc_bw_obs_last_from_results(results_recent) kwargs['desc_bw_obs_mean'] = \ @@ -438,6 +445,22 @@ class V3BWLine(object): return None @staticmethod + def consensus_bandwidth_from_results(results): + """Obtain the last consensus bandwidth from the results.""" + for r in reversed(results): + if r.consensus_bandwidth is not None: + return r.consensus_bandwidth + return None + + @staticmethod + def consensus_bandwidth_is_unmeasured_from_results(results): + """Obtain the last consensus unmeasured flag from the results.""" + for r in reversed(results): + if r.consensus_bandwidth_is_unmeasured is not None: + return r.consensus_bandwidth_is_unmeasured + return None + + @staticmethod def desc_bw_obs_mean_from_results(results): desc_bw_obs_ls = [] for r in results: @@ -825,14 +848,23 @@ class V3BWFile(object): # descriptors' bandwidth-observed, because that penalises new # relays. # See https://trac.torproject.org/projects/tor/ticket/8494 - # just applying the formula above: desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg) - bw_new = kb_round_x_sig_dig( - max( - l.bw_mean / mu, # ratio - max(l.bw_mean, mu) / muf # ratio filtered - ) * desc_bw, \ - digits=num_round_dig) # convert to KB + if l.consensus_bandwidth_is_unmeasured: + min_bandwidth = desc_bw + # If the relay is measured, use the minimum between the descriptors + # bandwidth and the consensus bandwidth, so that + # MaxAdvertisedBandwidth limits the consensus weight + # The consensus bandwidth in a measured relay has been obtained + # doing the same calculation as here + else: + min_bandwidth = min(desc_bw, l.consensus_bandwidth) + # Torflow's scaling + ratio_stream = l.bw_mean / mu + ratio_stream_filtered = max(l.bw_mean, mu) / muf + ratio = max(ratio_stream, ratio_stream_filtered) + bw_scaled = ratio * min_bandwidth + # round and convert to KB + bw_new = kb_round_x_sig_dig(bw_scaled, digits=num_round_dig) # Cap maximum bw if cap is not None: bw_new = min(hlimit, bw_new) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index da2c8d8..31a5612 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -40,6 +40,7 @@ header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP # Line produced without any scaling. raw_bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\ + "consensus_bandwidth=600000 consensus_bandwidth_is_unmeasured=False "\ "desc_bw_avg=1000000000 desc_bw_bur=123456 desc_bw_obs_last=524288 "\ "desc_bw_obs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \ "master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \

1 0

[sbws/master] relaylist: add property is_unmeasured
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit 9e089b72d8abfb2b2a6c2ec9a66cb01d115205a6 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 10:25:01 2018 +0000 relaylist: add property is_unmeasured --- sbws/core/scanner.py | 8 ++++---- sbws/lib/destination.py | 3 ++- sbws/lib/relaylist.py | 9 ++++++++- sbws/util/stem.py | 6 +++--- tests/integration/lib/test_relaylist.py | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 6188a19..e065666 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -143,7 +143,7 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit): log.debug('Picking a 2nd hop to measure %s from %d choices. is_exit=%s', relay.nickname, len(candidates), is_exit) for min_bw_factor in [2, 1.75, 1.5, 1.25, 1]: - min_bw = relay.bandwidth * min_bw_factor + min_bw = relay.consensus_bandwidth * min_bw_factor new_candidates = stem_utils.only_relays_with_bandwidth( cont, candidates, min_bw=min_bw) if len(new_candidates) > 0: @@ -152,15 +152,15 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit): 'Found %d candidate 2nd hops with at least %sx the bandwidth ' 'of %s. Returning %s (bw=%s).', len(new_candidates), min_bw_factor, relay.nickname, - chosen.nickname, chosen.bandwidth) + chosen.nickname, chosen.consensus_bandwidth) return chosen candidates = sorted(candidates, key=lambda r: r.bandwidth, reverse=True) chosen = candidates[0] log.debug( 'Didn\'t find any 2nd hops at least as fast as %s (bw=%s). It\'s ' 'probably really fast. Returning %s (bw=%s), the fastest ' - 'candidate we have.', relay.nickname, relay.bandwidth, - chosen.nickname, chosen.bandwidth) + 'candidate we have.', relay.nickname, relay.consensus_bandwidth, + chosen.nickname, chosen.consensus_bandwidth) return chosen diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index d01fd04..cfa6cda 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -184,7 +184,8 @@ class DestinationList: # Keep the fastest 10% of exits, or 3, whichever is larger num_keep = int(max(3, len(possible_exits) * 0.1)) possible_exits = sorted( - possible_exits, key=lambda e: e.bandwidth, reverse=True) + possible_exits, key=lambda e: e.consensus_bandwidth, + reverse=True) exits = possible_exits[0:num_keep] if len(exits) < 1: log.warning("There are no exits to perform usability tests.") diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 5ec9252..c61e24e 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -83,10 +83,17 @@ class Relay: return self._from_desc('observed_bandwidth') @property - def bandwidth(self): + def consensus_bandwidth(self): return self._from_ns('bandwidth') @property + def consensus_bandwidth_is_unmeasured(self): + # measured appears only votes, unmeasured appears in consensus + # therefore is_unmeasured is needed to know whether the bandwidth + # value in consensus is comming from bwauth measurements or not. + return self._from_ns('is_unmeasured') + + @property def address(self): return self._from_ns('address') diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 232be2a..c3fffd1 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -230,10 +230,10 @@ def only_relays_with_bandwidth(controller, relays, min_bw=None, max_bw=None): assert max_bw is None or max_bw >= 0 ret = [] for relay in relays: - assert hasattr(relay, 'bandwidth') - if min_bw is not None and relay.bandwidth < min_bw: + assert hasattr(relay, 'consensus_bandwidth') + if min_bw is not None and relay.consensus_bandwidth < min_bw: continue - if max_bw is not None and relay.bandwidth > max_bw: + if max_bw is not None and relay.consensus_bandwidth > max_bw: continue ret.append(relay) return ret diff --git a/tests/integration/lib/test_relaylist.py b/tests/integration/lib/test_relaylist.py index 8488c8b..a1a5efb 100644 --- a/tests/integration/lib/test_relaylist.py +++ b/tests/integration/lib/test_relaylist.py @@ -11,7 +11,7 @@ def test_relay_properties(persistent_launch_tor): assert 'Authority' in relay.flags assert not relay.exit_policy or not relay.exit_policy.is_exiting_allowed() assert relay.average_bandwidth == 1073741824 - assert relay.bandwidth == 0 + assert relay.consensus_bandwidth == 0 assert relay.address == '127.10.0.1' assert relay.master_key_ed25519 == \ 'wLglSEw9/DHfpNrlrqjVRSnGLVWfnm0vYxkryH4aT6Q'

1 0

[sbws/master] resultdump: store bandwidth and is_unmeasured
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit 35d36883e87a714f8b2aa7ca89095f3508530f8d Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 10:36:22 2018 +0000 resultdump: store bandwidth and is_unmeasured In order to use it in torflow's scaling method. Tech-debt is growing repeating Relay in relaylist and resultdump, Relay should have Results, not Result has Relay --- sbws/lib/resultdump.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 149f6ff..0f7e1af 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -201,7 +201,8 @@ class Result: Result class to be happy ''' def __init__(self, fingerprint, nickname, address, master_key_ed25519, average_bandwidth=None, burst_bandwidth=None, - observed_bandwidth=None): + observed_bandwidth=None, consensus_bandwidth=None, + consensus_bandwidth_is_unmeasured=None): self.fingerprint = fingerprint self.nickname = nickname self.address = address @@ -209,13 +210,18 @@ class Result: self.average_bandwidth = average_bandwidth self.burst_bandwidth = burst_bandwidth self.observed_bandwidth = observed_bandwidth + self.consensus_bandwidth = consensus_bandwidth + self.consensus_bandwidth_is_unmeasured = \ + consensus_bandwidth_is_unmeasured def __init__(self, relay, circ, dest_url, scanner_nick, t=None): self._relay = Result.Relay(relay.fingerprint, relay.nickname, relay.address, relay.master_key_ed25519, relay.average_bandwidth, relay.burst_bandwidth, - relay.observed_bandwidth) + relay.observed_bandwidth, + relay.consensus_bandwidth, + relay.consensus_bandwidth_is_unmeasured) self._circ = circ self._dest_url = dest_url self._scanner = scanner_nick @@ -238,6 +244,14 @@ class Result: return self._relay.observed_bandwidth @property + def consensus_bandwidth(self): + return self._relay.consensus_bandwidth + + @property + def consensus_bandwidth_is_unmeasured(self): + return self._relay.consensus_bandwidth_is_unmeasured + + @property def fingerprint(self): return self._relay.fingerprint @@ -487,7 +501,9 @@ class ResultSuccess(Result): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], d['relay_average_bandwidth'], - d['relay_burst_bandwidth'], d['relay_observed_bandwidth']), + d['relay_burst_bandwidth'], d['relay_observed_bandwidth'], + d['consensus_bandwidth'], + d['consensus_bandwidth_is_unmeasured']), d['circ'], d['dest_url'], d['scanner'], t=d['time']) @@ -499,6 +515,9 @@ class ResultSuccess(Result): 'relay_average_bandwidth': self.relay_average_bandwidth, 'relay_burst_bandwidth': self.relay_burst_bandwidth, 'relay_observed_bandwidth': self.relay_observed_bandwidth, + 'consensus_bandwidth': self.consensus_bandwidth, + 'consensus_bandwidth_is_unmeasured': + self.consensus_bandwidth_is_unmeasured, }) return d

1 0

[sbws/master] v3bwfile: do not round twice in torflow's scale method
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit 619c2f46d93c1171e9d9a0a32a9a76648e8df901 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 16:50:36 2018 +0000 v3bwfile: do not round twice in torflow's scale method --- sbws/lib/v3bwfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 1cf7b63..55f63ec 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -868,8 +868,8 @@ class V3BWFile(object): # Cap maximum bw if cap is not None: bw_new = min(hlimit, bw_new) - # remove decimals and avoid 0 - l.bw = max(round(bw_new), 1) + # avoid 0 + l.bw = max(bw_new, 1) return sorted(bw_lines_tf, key=lambda x: x.bw, reverse=reverse) @staticmethod

1 0

[sbws/master] tests: add bandwidth and is_unmeasured to results
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit d5e4d3a89caaf3d74b4d324fab2e41943cdeb075 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 15:59:09 2018 +0000 tests: add bandwidth and is_unmeasured to results --- tests/unit/conftest.py | 9 +++++++-- tests/unit/lib/data/results.txt | 2 +- tests/unit/lib/data/results_away.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 9b2201c..4dd442b 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -65,10 +65,13 @@ SCANNER = "test" AVG_BW = 966080 BUR_BW = 1048576 OBS_BW = 524288 +BW = 600000 +UNMEASURED = False RELAY1 = Result.Relay(FP1, NICK1, IP1, ED25519, average_bandwidth=AVG_BW, burst_bandwidth=BUR_BW, - observed_bandwidth=OBS_BW) + observed_bandwidth=OBS_BW, consensus_bandwidth=BW, + consensus_bandwidth_is_unmeasured=UNMEASURED) RELAY2 = Result.Relay(FP2, NICK2, IP2, ED25519) RESULT = Result(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1) @@ -89,7 +92,9 @@ RELAY_DICT = { "master_key_ed25519": ED25519, "relay_average_bandwidth": AVG_BW, "relay_burst_bandwidth": BUR_BW, - "relay_observed_bandwidth": OBS_BW + "relay_observed_bandwidth": OBS_BW, + "consensus_bandwidth": BW, + "consensus_bandwidth_is_unmeasured": UNMEASURED, } BASE_RESULT_NO_RELAY_DICT = { diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt index 9bb4909..59a35b4 100644 --- a/tests/unit/lib/data/results.txt +++ b/tests/unit/lib/data/results.txt @@ -1,2 +1,2 @@ -{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth": 524288, "consensus_ba ndwidth": 600000, "consensus_bandwidth_is_unmeasured": false} {"version": 4, "time": 1523974147, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg": "Something bad happened while measuring bandwidth", "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} diff --git a/tests/unit/lib/data/results_away.txt b/tests/unit/lib/data/results_away.txt index 71698e8..6074bd9 100644 --- a/tests/unit/lib/data/results_away.txt +++ b/tests/unit/lib/data/results_away.txt @@ -1,7 +1,7 @@ -{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} {"version": 4, "time": 1523974147, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg": "Something bad happened while measuring bandwidth", "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} -{"version": 4, "time": 1523975587, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} -{"version": 4, "time": 1524019507, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} -{"version": 4, "time": 1523975587, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} -{"version": 4, "time": 1524019507, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} -{"version": 4, "time": 1524019507, "circ": ["CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "C", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1523975587, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"version": 4, "time": 1524019507, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"version": 4, "time": 1523975587, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"version": 4, "time": 1524019507, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"version": 4, "time": 1524019507, "circ": ["CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "C", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false}

1 0