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

[sbws/master] Remove unnecessary fp_or_nick_to_relay function
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 3d47a3b02c7eb1dc91d019493edf9bc96440e7bb Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 7 20:59:22 2018 -0400 Remove unnecessary fp_or_nick_to_relay function --- sbws/lib/circuitbuilder.py | 23 +++++------------------ sbws/util/stem.py | 11 ----------- tests/integration/util/test_stem.py | 32 -------------------------------- 3 files changed, 5 insertions(+), 61 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index ac5603b..3c6c0fd 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -2,7 +2,7 @@ from stem import CircuitExtensionFailed, InvalidRequest, ProtocolError, Timeout from stem import InvalidArguments import random import sbws.util.stem as stem_utils -from .relaylist import RelayList +from .relaylist import Relay, RelayList import logging log = logging.getLogger(__name__) @@ -125,9 +125,9 @@ class GapsCircuitBuilder(CircuitBuilder): if not fp: new_path.append(None) continue - relay = stem_utils.fp_or_nick_to_relay(self.controller, fp) - if not relay: - log.debug('Failed to get descriptor for relay %s', fp) + relay = Relay(fp, self.controller) + if not relay.fingerprint: + log.debug('Tor seems to no longer think %s is a relay', fp) return None new_path.append(relay) return new_path @@ -147,20 +147,7 @@ class GapsCircuitBuilder(CircuitBuilder): continue chosen_fps.append(choice) black_fps.append(choice) - relays = [] - for fp in chosen_fps: - relay = stem_utils.fp_or_nick_to_relay(self.controller, fp) - if not relay: - log.warning( - 'We\'re selecting a handful of random relays and stem ' - 'doesn\'t think one of the fingerprints we gave it goes ' - 'to a relay. Maybe we got a new consensus since the last ' - 'time we refreshed our list of relays. In any case, we ' - 'could try to recover. But failing inside ' - '_random_sample_relays is easier. Sorry.') - return None - relays.append(relay) - return relays + return [Relay(fp, self.controller) for fp in chosen_fps] def build_circuit(self, path): ''' <path> is a list of relays and Falsey values. Relays can be diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 0341d74..8a92673 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -14,17 +14,6 @@ log = logging.getLogger(__name__) stream_building_lock = RLock() -def fp_or_nick_to_relay(controller, fp_nick): - ''' Takes a string that could be either a relay's fingerprint or nickname. - Return the relay's descriptor if found. Otherwise return None. - - Note that if a nickname is given and multiple relays have that nickname, - only one of them will be returned. ''' - assert isinstance(fp_nick, str) - assert is_controller_okay(controller) - return controller.get_network_status(fp_nick, default=None) - - def attach_stream_to_circuit_listener(controller, circ_id): ''' Returns a function that should be given to add_event_listener(). It looks for newly created streams and attaches them to the given circ_id ''' diff --git a/tests/integration/util/test_stem.py b/tests/integration/util/test_stem.py index 1591d2d..203cf5d 100644 --- a/tests/integration/util/test_stem.py +++ b/tests/integration/util/test_stem.py @@ -1,39 +1,7 @@ import sbws.util.stem as stem_utils -from stem.descriptor.router_status_entry import RouterStatusEntryV3 def test_launch_and_okay(persistent_launch_tor): cont = persistent_launch_tor assert stem_utils.is_controller_okay(cont) assert stem_utils.is_bootstrapped(cont) - - -def test_get_relay_from_fp(persistent_launch_tor): - cont = persistent_launch_tor - # AA45C13025C037F056E734169891878ED0880231 is auth1 - relay = stem_utils.fp_or_nick_to_relay( - cont, 'AA45C13025C037F056E734169891878ED0880231') - assert isinstance(relay, RouterStatusEntryV3) - assert relay.fingerprint == 'AA45C13025C037F056E734169891878ED0880231' - assert relay.nickname == 'auth1' - - -def test_get_relay_from_nick(persistent_launch_tor): - cont = persistent_launch_tor - # AA45C13025C037F056E734169891878ED0880231 is auth1 - relay = stem_utils.fp_or_nick_to_relay(cont, 'auth1') - assert isinstance(relay, RouterStatusEntryV3) - assert relay.fingerprint == 'AA45C13025C037F056E734169891878ED0880231' - assert relay.nickname == 'auth1' - - -def test_get_relay_from_bad_nick(persistent_launch_tor): - cont = persistent_launch_tor - relay = stem_utils.fp_or_nick_to_relay(cont, 'notarelaynick') - assert relay is None - - -def test_get_relay_from_bad_fp(persistent_launch_tor): - cont = persistent_launch_tor - relay = stem_utils.fp_or_nick_to_relay(cont, 'A'*40) - assert relay is None

1 0

[sbws/master] Add ed25519 key to V3BWLine in tests
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 19ecda6a1caddd323dd4b5b48ae840c1853f1e38 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 10 14:28:34 2018 +0000 Add ed25519 key to V3BWLine in tests --- tests/unit/core/test_generate.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/tests/unit/core/test_generate.py b/tests/unit/core/test_generate.py index 5598a2a..dca2435 100644 --- a/tests/unit/core/test_generate.py +++ b/tests/unit/core/test_generate.py @@ -120,9 +120,11 @@ def test_generate_single_success_noscale(dotsbws_success_result, caplog, rtt = median([round(r * 1000) for r in result.rtts]) bw_line = V3BWLine(result.fingerprint, bw, nick=result.nickname, rtt=rtt, time=unixts_to_isodt_str(round(result.time)), + master_key_ed25519=result.ed25519_master_key, success=1, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_success_scale(dotsbws_success_result, parser, @@ -152,9 +154,11 @@ def test_generate_single_success_scale(dotsbws_success_result, parser, rtt = median([round(r * 1000) for r in result.rtts]) bw_line = V3BWLine(result.fingerprint, bw, nick=result.nickname, rtt=rtt, time=unixts_to_isodt_str(round(result.time)), + master_key_ed25519=result.ed25519_master_key, success=1, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_relay_success_noscale( @@ -184,15 +188,13 @@ def test_generate_single_relay_success_noscale( for r in results for dl in r.downloads] speed = round(median(speeds)) rtt = round(median([round(r * 1000) for r in result.rtts])) - bw_line = 'node_id=${} bw={} nick={} rtt={} time={} ed25519={}'.format( - result.fingerprint, speed, result.nickname, rtt, - unixts_to_isodt_str(round(result.time))) bw_line = V3BWLine(result.fingerprint, speed, nick=result.nickname, - rtt=rtt, + rtt=rtt, master_key_ed25519=result.ed25519_master_key, time=unixts_to_isodt_str(round(result.time)), success=2, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_relay_success_scale( @@ -222,10 +224,12 @@ def test_generate_single_relay_success_scale( rtt = round(median([round(r * 1000) for r in result.rtts])) bw_line = V3BWLine(result.fingerprint, speed, nick=result.nickname, rtt=rtt, + master_key_ed25519=result.ed25519_master_key, time=unixts_to_isodt_str(round(result.time)), success=2, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_two_relays_success_noscale( @@ -262,10 +266,11 @@ def test_generate_two_relays_success_noscale( r1_rtt = round(median([round(rtt * 1000) for r in r1_results for rtt in r.rtts])) bw_line = V3BWLine(r1_fingerprint, r1_speed, nick=r1_name, rtt=r1_rtt, - time=r1_time, + time=r1_time, master_key_ed25519=r1_ed25519, success=2, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[1 + NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[1 + NUM_LINES_HEADER_V110] + '\n' == str(bw_line) r2_results = [r for r in results if r.fingerprint == 'B' * 40] r2_time = unixts_to_isodt_str(round(max([r.time for r in r2_results]))) r2_name = r2_results[0].nickname @@ -277,7 +282,8 @@ def test_generate_two_relays_success_noscale( r2_rtt = round(median([round(rtt * 1000) for r in r2_results for rtt in r.rtts])) bw_line = V3BWLine(r2_fingerprint, r2_speed, nick=r2_name, rtt=r2_rtt, - time=r2_time, + time=r2_time, master_key_ed25519=r2_ed25519, success=2, error_circ=0, error_misc=0, error_stream=0) - assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + # FIXME: left side does not contain ed25519 + # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line)

1 0

[sbws/master] Add ed25519_master_key to results; bump result version to 3
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 2c8212d23984b5a890dc2bdaa39109935f907249 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 7 21:10:09 2018 -0400 Add ed25519_master_key to results; bump result version to 3 node_id=$B058ABB695524A11D0FE958C0F8AA7963FD4258C bw=5685 nick=exit2 rtt=139 time=2018-06-08T01:06:27 ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s --- sbws/globals.py | 2 +- sbws/lib/resultdump.py | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index a16682c..e48b378 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -4,7 +4,7 @@ import socket log = logging.getLogger(__name__) -RESULT_VERSION = 2 +RESULT_VERSION = 3 WIRE_VERSION = 1 SPEC_VERSION = '1.1.0' diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index ffa493d..4401412 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -150,14 +150,15 @@ class Result: class Relay: ''' Implements just enough of a stem RouterStatusEntryV3 for this Result class to be happy ''' - def __init__(self, fingerprint, nickname, address): + def __init__(self, fingerprint, nickname, address, ed25519_master_key): self.fingerprint = fingerprint self.nickname = nickname self.address = address + self.ed25519_master_key = ed25519_master_key def __init__(self, relay, circ, dest_url, scanner_nick, t=None): self._relay = Result.Relay(relay.fingerprint, relay.nickname, - relay.address) + relay.address, relay.ed25519_master_key) self._circ = circ self._dest_url = dest_url self._scanner = scanner_nick @@ -180,6 +181,10 @@ class Result: return self._relay.address @property + def ed25519_master_key(self): + return self._relay.ed25519_master_key + + @property def circ(self): return self._circ @@ -204,6 +209,7 @@ class Result: 'fingerprint': self.fingerprint, 'nickname': self.nickname, 'address': self.address, + 'ed25519_master_key': self.ed25519_master_key, 'circ': self.circ, 'dest_url': self.dest_url, 'time': self.time, @@ -275,7 +281,9 @@ class ResultError(Result): def from_dict(d): assert isinstance(d, dict) return ResultError( - Result.Relay(d['fingerprint'], d['nickname'], d['address']), + Result.Relay( + d['fingerprint'], d['nickname'], d['address'], + d['ed25519_master_key']), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -314,7 +322,9 @@ class ResultErrorCircuit(ResultError): def from_dict(d): assert isinstance(d, dict) return ResultErrorCircuit( - Result.Relay(d['fingerprint'], d['nickname'], d['address']), + Result.Relay( + d['fingerprint'], d['nickname'], d['address'], + d['ed25519_master_key']), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -335,7 +345,9 @@ class ResultErrorStream(ResultError): def from_dict(d): assert isinstance(d, dict) return ResultErrorStream( - Result.Relay(d['fingerprint'], d['nickname'], d['address']), + Result.Relay( + d['fingerprint'], d['nickname'], d['address'], + d['ed25519_master_key']), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -369,7 +381,9 @@ class ResultErrorAuth(ResultError): def from_dict(d): assert isinstance(d, dict) return ResultErrorAuth( - Result.Relay(d['fingerprint'], d['nickname'], d['address']), + Result.Relay( + d['fingerprint'], d['nickname'], d['address'], + d['ed25519_master_key']), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -401,7 +415,9 @@ class ResultSuccess(Result): assert isinstance(d, dict) return ResultSuccess( d['rtts'], d['downloads'], - Result.Relay(d['fingerprint'], d['nickname'], d['address']), + Result.Relay( + d['fingerprint'], d['nickname'], d['address'], + d['ed25519_master_key']), d['circ'], d['dest_url'], d['scanner'], t=d['time'])

1 0

[sbws/master] Recover datadir fixture needed for v3bwfile tests
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 91844fbf0b912ca5db80c07653fc47923a52aed3 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 10 14:31:50 2018 +0000 Recover datadir fixture needed for v3bwfile tests --- tests/unit/conftest.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index bb9f8e3..c9002eb 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -27,6 +27,29 @@ class _PseudoArguments(argparse.Namespace): setattr(self, key, kw[key]) +(a)pytest.fixture() +def datadir(request): + """ get, read, open test files from the "data" directory. """ + class D: + def __init__(self, basepath): + self.basepath = basepath + + def open(self, name, mode="r"): + return self.basepath.join(name).open(mode) + + def join(self, name): + return self.basepath.join(name).strpath + + def read(self, name): + with self.open(name, "r") as f: + return f.read() + + def readlines(self, name): + with self.open(name, "r") as f: + return f.readlines() + return D(request.fspath.dirpath("data")) + + @pytest.fixture(scope='session') def parser(): return create_parser()

1 0

[sbws/master] Fix tests that broke with new ed25519 stuff
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 7d69bc7d78cac4734ebc27c9b998dce3a57f8e48 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jun 7 21:26:39 2018 -0400 Fix tests that broke with new ed25519 stuff --- tests/unit/conftest.py | 14 +++++++++----- tests/unit/core/test_generate.py | 5 +++-- tests/unit/core/test_stats.py | 8 ++++---- tests/unit/lib/test_results.py | 38 +++++++++++++++++++++++++++----------- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 0701646..bb9f8e3 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -64,6 +64,7 @@ def dotsbws_error_result(empty_dotsbws_datadir): ''' fp1 = 'A' * 40 fp2 = 'B' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] nick = 'CowSayWhat' relay_ip = '169.254.100.1' @@ -71,7 +72,7 @@ def dotsbws_error_result(empty_dotsbws_datadir): scanner_nick = 'SBWSscanner' msg = 'UnitTest error message' t = time.time() - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) result = ResultError(relay, circ, server_ip, scanner_nick, t=t, msg=msg) args = _PseudoArguments(directory=empty_dotsbws_datadir.name) conf = get_config(args) @@ -87,6 +88,7 @@ def dotsbws_success_result(empty_dotsbws_datadir): ''' fp1 = 'A' * 40 fp2 = 'B' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] nick = 'CowSayWhat' relay_ip = '169.254.100.1' @@ -95,7 +97,7 @@ def dotsbws_success_result(empty_dotsbws_datadir): rtts = [4.242] downloads = [{'duration': 4, 'amount': 40*1024}] t = time.time() - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) result = ResultSuccess(rtts, downloads, relay, circ, server_ip, scanner_nick, t=t) args = _PseudoArguments(directory=empty_dotsbws_datadir.name) @@ -115,6 +117,7 @@ def dotsbws_success_result_one_relay(empty_dotsbws_datadir): dd = conf['paths']['datadir'] fp1 = 'A' * 40 fp2 = 'B' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] nick = 'CowSayWhat' relay_ip = '169.254.100.1' @@ -123,7 +126,7 @@ def dotsbws_success_result_one_relay(empty_dotsbws_datadir): rtts = [5, 25] downloads = [{'duration': 4, 'amount': 40*1024}] t = time.time() - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) result = ResultSuccess(rtts, downloads, relay, circ, server_ip, scanner_nick, t=t) write_result_to_datadir(result, dd) @@ -148,6 +151,7 @@ def dotsbws_success_result_two_relays(empty_dotsbws_datadir): dd = conf['paths']['datadir'] fp1 = 'A' * 40 fp2 = 'C' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] nick = 'CowSayWhat1' relay_ip = '169.254.100.1' @@ -156,7 +160,7 @@ def dotsbws_success_result_two_relays(empty_dotsbws_datadir): rtts = [5, 25] downloads = [{'duration': 4, 'amount': 40*1024}] t = time.time() - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) result = ResultSuccess(rtts, downloads, relay, circ, server_ip, scanner_nick, t=t) write_result_to_datadir(result, dd) @@ -175,7 +179,7 @@ def dotsbws_success_result_two_relays(empty_dotsbws_datadir): rtts = [50, 250] downloads = [{'duration': 4, 'amount': 400*1024}] t = time.time() - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) result = ResultSuccess(rtts, downloads, relay, circ, server_ip, scanner_nick, t=t) write_result_to_datadir(result, dd) diff --git a/tests/unit/core/test_generate.py b/tests/unit/core/test_generate.py index e9b341c..5598a2a 100644 --- a/tests/unit/core/test_generate.py +++ b/tests/unit/core/test_generate.py @@ -184,7 +184,7 @@ def test_generate_single_relay_success_noscale( for r in results for dl in r.downloads] speed = round(median(speeds)) rtt = round(median([round(r * 1000) for r in result.rtts])) - bw_line = 'node_id=${} bw={} nick={} rtt={} time={}'.format( + bw_line = 'node_id=${} bw={} nick={} rtt={} time={} ed25519={}'.format( result.fingerprint, speed, result.nickname, rtt, unixts_to_isodt_str(round(result.time))) bw_line = V3BWLine(result.fingerprint, speed, nick=result.nickname, @@ -255,6 +255,7 @@ def test_generate_two_relays_success_noscale( r1_time = unixts_to_isodt_str(round(max([r.time for r in r1_results]))) r1_name = r1_results[0].nickname r1_fingerprint = r1_results[0].fingerprint + r1_ed25519 = r1_results[0].ed25519_master_key r1_speeds = [dl['amount'] / dl['duration'] / 1024 for r in r1_results for dl in r.downloads] r1_speed = round(median(r1_speeds)) @@ -265,11 +266,11 @@ def test_generate_two_relays_success_noscale( success=2, error_circ=0, error_misc=0, error_stream=0) assert stdout_lines[1 + NUM_LINES_HEADER_V110] + '\n' == str(bw_line) - r2_results = [r for r in results if r.fingerprint == 'B' * 40] r2_time = unixts_to_isodt_str(round(max([r.time for r in r2_results]))) r2_name = r2_results[0].nickname r2_fingerprint = r2_results[0].fingerprint + r2_ed25519 = r2_results[0].ed25519_master_key r2_speeds = [dl['amount'] / dl['duration'] / 1024 for r in r2_results for dl in r.downloads] r2_speed = round(median(r2_speeds)) diff --git a/tests/unit/core/test_stats.py b/tests/unit/core/test_stats.py index e77b0c4..9554b16 100644 --- a/tests/unit/core/test_stats.py +++ b/tests/unit/core/test_stats.py @@ -25,7 +25,7 @@ def init_directory(dname): def add_single_stale_result(dname): r = ResultError( - Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1'), + Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1', 'ed25519key'), ['DEADBEEF1111', 'BEADDEEF2222'], '127.0.1.1', 'SBWSscanner', t=19950216) dd = os.path.join(str(dname), 'datadir') @@ -35,7 +35,7 @@ def add_single_stale_result(dname): def add_single_fresh_result(dname): r = ResultError( - Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1'), + Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1', 'ed25519key'), ['DEADBEEF1111', 'BEADDEEF2222'], '127.0.1.1', 'SBWSscanner', t=time.time()) dd = os.path.join(str(dname), 'datadir') @@ -45,12 +45,12 @@ def add_single_fresh_result(dname): def add_two_fresh_results(dname, t): r1 = ResultError( - Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1'), + Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1', 'ed25519key'), ['DEADBEEF1111', 'BEADDEEF2222'], '127.0.1.1', 'SBWSscanner', t=t) r2 = ResultSuccess( [1, 2, 3], [{'amount': 100, 'duration': 1}], - Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1'), + Result.Relay('DEADBEEF1111', 'CowSayWhat', '127.0.0.1', 'ed25519key'), ['DEADBEEF1111', 'BEADDEEF2222'], '127.0.1.1', 'SBWSscanner', t=t) dd = os.path.join(str(dname), 'datadir') diff --git a/tests/unit/lib/test_results.py b/tests/unit/lib/test_results.py index 449222e..010d505 100644 --- a/tests/unit/lib/test_results.py +++ b/tests/unit/lib/test_results.py @@ -19,12 +19,13 @@ def test_Result(time_mock): time_mock.side_effect = monotonic_time() fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) r = Result(relay, circ, dest_url, scanner_nick) try: str(r) @@ -64,12 +65,13 @@ def test_ResultSuccess(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) rtts = [5, 25] downloads = [{'duration': 4, 'amount': 40}] r1 = ResultSuccess(rtts, downloads, relay, circ, dest_url, scanner_nick) @@ -95,12 +97,13 @@ def test_ResultSuccess_from_dict(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) rtts = [5, 25] downloads = [{'duration': 4, 'amount': 40}] r1 = ResultSuccess(rtts, downloads, relay, circ, dest_url, scanner_nick) @@ -109,6 +112,7 @@ def test_ResultSuccess_from_dict(time_mock): 'nickname': nick, 'address': relay_ip, 'circ': circ, 'dest_url': dest_url, 'scanner': scanner_nick, 'version': RESULT_VERSION, 'type': _ResultType.Success, 'time': t, + 'ed25519_master_key': ed25519, } r2 = Result.from_dict(d) assert isinstance(r1, ResultSuccess) @@ -122,12 +126,13 @@ def test_ResultError(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultError(relay, circ, dest_url, scanner_nick, msg=msg) r2 = ResultError(relay, circ, dest_url, scanner_nick, msg=msg, t=t) @@ -150,12 +155,13 @@ def test_ResultError_from_dict(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultError(relay, circ, dest_url, scanner_nick, msg=msg) d = { @@ -163,6 +169,7 @@ def test_ResultError_from_dict(time_mock): 'nickname': nick, 'address': relay_ip, 'circ': circ, 'dest_url': dest_url, 'scanner': scanner_nick, 'version': RESULT_VERSION, 'type': _ResultType.Error, 'time': t, + 'ed25519_master_key': ed25519, } r2 = Result.from_dict(d) assert isinstance(r1, ResultError) @@ -176,12 +183,13 @@ def test_ResultErrorCircuit(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorCircuit(relay, circ, dest_url, scanner_nick, msg=msg) r2 = ResultErrorCircuit(relay, circ, dest_url, scanner_nick, msg=msg, @@ -205,12 +213,13 @@ def test_ResultErrorCircuit_from_dict(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorCircuit(relay, circ, dest_url, scanner_nick, msg=msg) d = { @@ -218,6 +227,7 @@ def test_ResultErrorCircuit_from_dict(time_mock): 'nickname': nick, 'address': relay_ip, 'circ': circ, 'dest_url': dest_url, 'scanner': scanner_nick, 'version': RESULT_VERSION, 'type': _ResultType.ErrorCircuit, 'time': t, + 'ed25519_master_key': ed25519, } r2 = Result.from_dict(d) assert isinstance(r1, ResultErrorCircuit) @@ -231,12 +241,13 @@ def test_ResultErrorStream(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorStream(relay, circ, dest_url, scanner_nick, msg=msg) r2 = ResultErrorStream(relay, circ, dest_url, scanner_nick, msg=msg, @@ -260,12 +271,13 @@ def test_ResultErrorStream_from_dict(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorStream(relay, circ, dest_url, scanner_nick, msg=msg) d = { @@ -273,6 +285,7 @@ def test_ResultErrorStream_from_dict(time_mock): 'nickname': nick, 'address': relay_ip, 'circ': circ, 'dest_url': dest_url, 'scanner': scanner_nick, 'version': RESULT_VERSION, 'type': _ResultType.ErrorStream, 'time': t, + 'ed25519_master_key': ed25519, } r2 = Result.from_dict(d) assert isinstance(r1, ResultErrorStream) @@ -286,12 +299,13 @@ def test_ResultErrorAuth(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorAuth(relay, circ, dest_url, scanner_nick, msg=msg) r2 = ResultErrorAuth(relay, circ, dest_url, scanner_nick, msg=msg, @@ -315,12 +329,13 @@ def test_ResultErrorAuth_from_dict(time_mock): time_mock.side_effect = monotonic_time(start=t) fp1 = 'A' * 40 fp2 = 'Z' * 40 + ed25519 = 'g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s' circ = [fp1, fp2] dest_url = 'http://example.com/sbws.bin' scanner_nick = 'sbwsscanner' nick = 'Mooooooo' relay_ip = '169.254.100.1' - relay = Result.Relay(fp1, nick, relay_ip) + relay = Result.Relay(fp1, nick, relay_ip, ed25519) msg = 'aaaaayyyyyy bb' r1 = ResultErrorAuth(relay, circ, dest_url, scanner_nick, msg=msg) d = { @@ -328,6 +343,7 @@ def test_ResultErrorAuth_from_dict(time_mock): 'nickname': nick, 'address': relay_ip, 'circ': circ, 'dest_url': dest_url, 'scanner': scanner_nick, 'version': RESULT_VERSION, 'type': _ResultType.ErrorAuth, 'time': t, + 'ed25519_master_key': ed25519, } r2 = Result.from_dict(d) assert isinstance(r1, ResultErrorAuth)

1 0

[sbws/master] Add ed25519 key to data files for testing
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit f0f5ef20498f2bd75ee5cef34dac5a291d1b2b28 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 10 14:32:57 2018 +0000 Add ed25519 key to data files for testing --- tests/unit/lib/data/results.txt | 4 ++-- tests/unit/lib/data/v3bw.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt index 2f14585..33dacf4 100644 --- a/tests/unit/lib/data/results.txt +++ b/tests/unit/lib/data/results.txt @@ -1,2 +1,2 @@ -{"version": 2, "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"} -{"version": 2, "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"} +{"version": 2, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} +{"version": 2, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} diff --git a/tests/unit/lib/data/v3bw.txt b/tests/unit/lib/data/v3bw.txt index 4ca416f..0b45c0a 100644 --- a/tests/unit/lib/data/v3bw.txt +++ b/tests/unit/lib/data/v3bw.txt @@ -7,4 +7,4 @@ latest_bandwidth=2018-04-17T14:09:07 software=sbws software_version=0.3.1-dev ==== -bw=54 error_circ=0 error_misc=0 error_stream=1 nick=A node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07 +bw=54 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s nick=A node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07

1 0

[sbws/master] Fix tests that were not using ed25519 from Result
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 764f1414774a3e4525dac3a71b11b0467e47dec0 Author: juga0 <juga(a)riseup.net> Date: Mon Jun 11 10:04:16 2018 +0000 Fix tests that were not using ed25519 from Result --- tests/unit/core/test_generate.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tests/unit/core/test_generate.py b/tests/unit/core/test_generate.py index dca2435..fae4fe0 100644 --- a/tests/unit/core/test_generate.py +++ b/tests/unit/core/test_generate.py @@ -71,8 +71,6 @@ def test_generate_empty_datadir(empty_dotsbws_datadir, caplog, parser): sbws.core.generate.main(args, conf) assert 'No recent results' in caplog.records[-1].getMessage() -# TODO: move the following tests to test_v3bwfile? - def test_generate_single_error(dotsbws_error_result, caplog, parser): caplog.set_level(logging.DEBUG) @@ -123,8 +121,7 @@ def test_generate_single_success_noscale(dotsbws_success_result, caplog, master_key_ed25519=result.ed25519_master_key, success=1, error_circ=0, error_misc=0, error_stream=0) - # FIXME: left side does not contain ed25519 - # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_success_scale(dotsbws_success_result, parser, @@ -157,8 +154,7 @@ def test_generate_single_success_scale(dotsbws_success_result, parser, master_key_ed25519=result.ed25519_master_key, success=1, error_circ=0, error_misc=0, error_stream=0) - # FIXME: left side does not contain ed25519 - # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_relay_success_noscale( @@ -193,8 +189,7 @@ def test_generate_single_relay_success_noscale( time=unixts_to_isodt_str(round(result.time)), success=2, error_circ=0, error_misc=0, error_stream=0) - # FIXME: left side does not contain ed25519 - # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_single_relay_success_scale( @@ -228,8 +223,7 @@ def test_generate_single_relay_success_scale( time=unixts_to_isodt_str(round(result.time)), success=2, error_circ=0, error_misc=0, error_stream=0) - # FIXME: left side does not contain ed25519 - # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) def test_generate_two_relays_success_noscale( @@ -285,5 +279,4 @@ def test_generate_two_relays_success_noscale( time=r2_time, master_key_ed25519=r2_ed25519, success=2, error_circ=0, error_misc=0, error_stream=0) - # FIXME: left side does not contain ed25519 - # assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line) + assert stdout_lines[NUM_LINES_HEADER_V110] + '\n' == str(bw_line)

1 0

[sbws/master] Disable tests not working because of Result changes
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 956ed042e3b668705ebd9f2f99223bbca245b8fd Author: juga0 <juga(a)riseup.net> Date: Sun Jun 10 14:34:05 2018 +0000 Disable tests not working because of Result changes --- tests/unit/lib/test_v3bwfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index f6fb51b..b54ea39 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- """Test generation of bandwidth measurements document (v3bw)""" import json +import pytest from sbws import __version__ as version from sbws.globals import SPEC_VERSION @@ -127,6 +128,7 @@ def test_v3bwheader_from_file(datadir): assert str(h) == str(header) +(a)pytest.mark.skip(reason="FIXME results") def test_num_results_of_type(): assert num_results_of_type([Result.from_dict(RESULT_SUCCESS_DICT)], 'success') == 1 @@ -138,6 +140,7 @@ def test_num_results_of_type(): 'error-stream') == 1 +(a)pytest.mark.skip(reason="FIXME results") def test_v3bwline_from_results_file(datadir): lines = datadir.readlines('results.txt') d = dict() @@ -151,6 +154,7 @@ def test_v3bwline_from_results_file(datadir): assert bwl_str == str(bwl) +(a)pytest.mark.skip(reason="FIXME results") def test_v3bwfile(datadir, tmpdir): """Test generate v3bw file (including relay_lines).""" v3bw = datadir.read('v3bw.txt')

1 0

[sbws/master] Fix tests missing ed25519 and wrong Result version
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit d3f21849ca7224c73d485ad9df826503e568f45b Author: juga0 <juga(a)riseup.net> Date: Mon Jun 11 10:05:08 2018 +0000 Fix tests missing ed25519 and wrong Result version --- tests/unit/lib/data/results.txt | 4 ++-- tests/unit/lib/test_v3bwfile.py | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt index 33dacf4..ecf0b68 100644 --- a/tests/unit/lib/data/results.txt +++ b/tests/unit/lib/data/results.txt @@ -1,2 +1,2 @@ -{"version": 2, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} -{"version": 2, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} +{"version": 3, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} +{"version": 3, "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", "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index b54ea39..b61c303 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- """Test generation of bandwidth measurements document (v3bw)""" import json -import pytest from sbws import __version__ as version -from sbws.globals import SPEC_VERSION +from sbws.globals import SPEC_VERSION, RESULT_VERSION from sbws.lib.resultdump import Result, load_result_file from sbws.lib.v3bwfile import (V3BwHeader, V3BWLine, TERMINATOR, LINE_SEP, KEYVALUE_SEP_V110, num_results_of_type, @@ -36,6 +35,7 @@ header_extra_ls = [timestamp_l, version_l, header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP bwl_str = "bw=54 error_circ=0 error_misc=0 error_stream=1 " \ + "master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \ "nick=A " \ "node_id=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 " \ "time=2018-04-17T14:09:07\n" @@ -49,11 +49,12 @@ RESULT_ERROR_STREAM_DICT = { "time": 1526894062.6408398, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], - "version": 2, + "version": RESULT_VERSION, "scanner": "IDidntEditTheSBWSConfig", "type": "error-stream", "msg": "Something bad happened while measuring bandwidth", - "nickname": "A" + "nickname": "A", + "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s" } RESULT_SUCCESS_DICT = { @@ -67,7 +68,7 @@ RESULT_SUCCESS_DICT = { 0.4635589122772217], "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], - "version": 2, + "version": RESULT_VERSION, "scanner": "IDidntEditTheSBWSConfig", "type": "success", "downloads": [ @@ -76,7 +77,8 @@ RESULT_SUCCESS_DICT = { {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], - "nickname": "A" + "nickname": "A", + "ed25519_master_key": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s" } RESULT_SUCCESS_STR = str(RESULT_SUCCESS_DICT) RESULT_ERROR_STREAM_STR = str(RESULT_ERROR_STREAM_DICT) @@ -128,7 +130,6 @@ def test_v3bwheader_from_file(datadir): assert str(h) == str(header) -(a)pytest.mark.skip(reason="FIXME results") def test_num_results_of_type(): assert num_results_of_type([Result.from_dict(RESULT_SUCCESS_DICT)], 'success') == 1 @@ -140,7 +141,6 @@ def test_num_results_of_type(): 'error-stream') == 1 -(a)pytest.mark.skip(reason="FIXME results") def test_v3bwline_from_results_file(datadir): lines = datadir.readlines('results.txt') d = dict() @@ -154,7 +154,6 @@ def test_v3bwline_from_results_file(datadir): assert bwl_str == str(bwl) -(a)pytest.mark.skip(reason="FIXME results") def test_v3bwfile(datadir, tmpdir): """Test generate v3bw file (including relay_lines).""" v3bw = datadir.read('v3bw.txt') @@ -165,5 +164,4 @@ def test_v3bwfile(datadir, tmpdir): earliest_bandwidth=earliest_bandwidth) bwls = [V3BWLine.from_results(results[fp]) for fp in results] f = V3BwFile(header, bwls) - # f = V3BwFile.from_results(None, str(tmpdir.join("v3bw.txt")), results) assert v3bw == str(f)

1 0

[sbws/master] Add Result ed25519 attr to V3BwLine
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit fc3716a02699a54454a880d347c650dbca8bfd92 Author: juga0 <juga(a)riseup.net> Date: Mon Jun 11 09:32:30 2018 +0000 Add Result ed25519 attr to V3BwLine --- sbws/lib/v3bwfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 27476c6..9a2dfdd 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -336,6 +336,8 @@ class V3BWLine(object): bw = cls.bw_from_results(success_results) kwargs = dict() kwargs['nick'] = results[0].nickname + if getattr(results[0], 'ed25519_master_key'): + kwargs['master_key_ed25519'] = results[0].ed25519_master_key kwargs['rtt'] = cls.rtt_from_results(success_results) kwargs['time'] = cls.last_time_from_results(results) kwargs.update(cls.result_types_from_results(results))

1 0