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

[sbws/maint-1.1] minor: Change log warning to info or debug
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit 290030aedd6d6ade7e53c22dacab149e3e5b1b8f Author: juga0 <juga(a)riseup.net> Date: Tue Mar 2 17:33:12 2021 +0000 minor: Change log warning to info or debug when it contains sensitive information. --- sbws/core/scanner.py | 2 +- sbws/util/stem.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index c7dde75..e446391 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -388,7 +388,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay): circ_fps, nicknames, exit_policy = r circ_id, reason = cb.build_circuit(circ_fps) if not circ_id: - log.warning( + log.info( "Exit %s (%s) that can't exit all ips, failed to create " " circuit as entry: %s (%s).", relay.fingerprint, relay.nickname, circ_fps, nicknames) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 9fea31f..38d0570 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -29,12 +29,12 @@ def attach_stream_to_circuit_listener(controller, circ_id): circuit_str(controller, circ_id)) try: controller.attach_stream(st.id, circ_id) - except (UnsatisfiableRequest, InvalidRequest) as e: - log.warning('Couldn\'t attach stream to circ %s: %s', - circ_id, e) - except OperationFailed as e: - log.exception("Error attaching stream %s to circ %s: %s", - st.id, circ_id, e) + # So far we never saw this error. + except ( + UnsatisfiableRequest, InvalidRequest, OperationFailed + ) as e: + log.debug('Error attaching stream %s to circ %s: %s', + st.id, circ_id, e) else: pass return closure_stream_event_listener

1 0

[sbws/maint-1.1] fixup! minor: Change info logs to debug or warning
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit a2b2583462d3b993b0c1b76454cc304e6d809dff Author: juga0 <juga(a)riseup.net> Date: Mon Mar 8 10:49:19 2021 +0000 fixup! minor: Change info logs to debug or warning --- sbws/lib/destination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index f007a7a..84473be 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -208,8 +208,8 @@ class Destination: if self._delta_seconds_retry > self._max_seconds_between_retries: self._delta_seconds_retry = self._max_seconds_between_retries log.debug("Incremented the time to try destination %s past the " - "limit, capping it at %s hours.", - self.url, self._delta_seconds_retry / 60 / 60) + "limit, capping it at %s hours.", + self.url, self._delta_seconds_retry / 60 / 60) else: log.debug("Incremented the time to try destination %s to %s " "hours.", self.url, self._delta_seconds_retry / 60 / 60)

1 0

[sbws/maint-1.1] fix: scanner: Return from measure if no helper
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit 83e07312fda00d39d3a7a2a90c1980d7f67c3c0a Author: juga0 <juga(a)riseup.net> Date: Sat Feb 27 11:00:02 2021 +0000 fix: scanner: Return from measure if no helper After refactoring in #40041, it was forgotten to return the error in the case a helper was not found, what can happen in test networks. Closes #40065. --- sbws/core/scanner.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 5fd917a..f9ab1ce 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -346,11 +346,15 @@ def measure_relay(args, conf, destinations, cb, rl, relay): # Instead of ensuring that the relay can exit to all IPs, try first with # the relay as an exit, if it can exit to some IPs. if relay.is_exit_not_bad_allowing_port(dest.port): - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb, relay_as_entry=False) + r = create_path_relay(relay, dest, rl, cb, relay_as_entry=False) else: - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb) + r = create_path_relay(relay, dest, rl, cb) + # When `error_no_helper` is triggered because a helper is not found, what + # can happen in test networks with very few relays, it returns a list with + # the error. + if len(r) == 1: + return r + circ_fps, nicknames, exit_policy = r # Build the circuit circ_id, reason = cb.build_circuit(circ_fps) @@ -378,8 +382,10 @@ def measure_relay(args, conf, destinations, cb, rl, relay): " to connect to %s via circuit %s (%s). Reason: %s. Trying again " "with it as entry.", relay.fingerprint, relay.nickname, exit_policy, dest.url, circ_fps, nicknames, usable_data) - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb) + r = create_path_relay(relay, dest, rl, cb) + if len(r) == 1: + return r + circ_fps, nicknames, exit_policy = r circ_id, reason = cb.build_circuit(circ_fps) if not circ_id: log.warning(

1 0

[sbws/maint-1.1] fix: tests: debug log for tests by default
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit cde895003c0f3aab57008d6cb0a3f570b0a14011 Author: juga0 <juga(a)riseup.net> Date: Fri Mar 5 16:29:14 2021 +0000 fix: tests: debug log for tests by default and fix test that didn't consider that there might be other logs from other threads. Closes #33797. --- setup.cfg | 3 +++ tests/unit/lib/test_resultdump.py | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 8d388e7..fd6b30c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,3 +16,6 @@ tag_prefix = v # String at the start of all unpacked tarball filenames. parentdir_prefix = sbws- +[tool:pytest] +log_cli=true +log_cli_level=DEBUG diff --git a/tests/unit/lib/test_resultdump.py b/tests/unit/lib/test_resultdump.py index 1180bdb..5c1bd0d 100644 --- a/tests/unit/lib/test_resultdump.py +++ b/tests/unit/lib/test_resultdump.py @@ -2,6 +2,7 @@ """Unit tests for resultdump.""" import datetime +import logging from sbws.lib.relaylist import Relay from sbws.lib.resultdump import ( @@ -37,10 +38,10 @@ def test_trim_results_ip_changed_on_changed_ipv6(caplog, results_dict = trim_results_ip_changed(resultdict_ip_not_changed, on_changed_ipv6=True) assert resultdict_ip_not_changed == results_dict - for record in caplog.records: - assert record.levelname == 'WARNING' - assert 'Reseting bandwidth results when IPv6 changes, ' \ - 'is not yet implemented.\n' in caplog.text + # There might be other logs from other threads. + with caplog.at_level(logging.WARNING): + assert 'Reseting bandwidth results when IPv6 changes, ' \ + 'is not yet implemented.\n' in caplog.text def test_resultdump(

1 0

[sbws/maint-1.1] fix: scaling: round bandwidth filtered
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit cc343eb85f53095aceacd9ad2a22cb5dfebd0782 Author: juga0 <juga(a)riseup.net> Date: Mon Mar 1 19:02:04 2021 +0000 fix: scaling: round bandwidth filtered because Torflow does it. --- docs/source/torflow_aggr.rst | 25 +++++++++++++++++++++++++ sbws/lib/scaling.py | 6 ++++-- tests/unit/lib/test_scaling.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/docs/source/torflow_aggr.rst b/docs/source/torflow_aggr.rst index ee832cd..da1c328 100644 --- a/docs/source/torflow_aggr.rst +++ b/docs/source/torflow_aggr.rst @@ -203,6 +203,18 @@ From Torflow's `README.spec.txt`_ (section 1.6):: In the code, `SQLSupport.py`_, ``strm_bw`` is ``sbw`` and ``filt_bw`` is ``filt_sbws``:: + for s in rs.router.streams: + if isinstance(s, ClosedStream): + tot_bytes += s.tot_bytes() + tot_duration += s.end_time - s.start_time + tot_bw += s.bandwidth() + s_cnt += 1 + # FIXME: Hrmm.. do we want to do weighted avg or pure avg here? + # If files are all the same size, it shouldn't matter.. + if s_cnt > 0: + rs.sbw = tot_bw/s_cnt + else: rs.sbw = None + for rs in RouterStats.query.filter(stats_clause).\ options(eagerload_all('router.streams.circuit.routers')).all(): tot_sbw = 0 @@ -224,6 +236,19 @@ In the code, `SQLSupport.py`_, ``strm_bw`` is ``sbw`` and if sbw_cnt: rs.filt_sbw = tot_sbw/sbw_cnt else: rs.filt_sbw = None +When it is written to the file, it seem to write "None" string when +``filt_sbw`` or ``strm_bw`` are None. That would give an exception when +calculating the network average. So it never happen?:: + + def cvt(a,b,c=1): + if type(a) == float: return int(round(a/c,b)) + elif type(a) == int: return a + elif type(a) == type(None): return "None" + else: return type(a) + + f.write(" strm_bw="+str(cvt(s.sbw,0))) + f.write(" filt_bw="+str(cvt(s.filt_sbw,0))) + This is also expressed in pseudocode in the `bandwidth file spec`_, section B.4 step 1. diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 079f36b..6ec8185 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -16,8 +16,10 @@ def bw_filt(bw_measurements): """ mu = 1 if bw_measurements: - mu = mean(bw_measurements) + # Torflow is rounding to an integer, so is `bw_mean_from_results` in + # `v3bwfile.py` + mu = round(mean(bw_measurements)) bws_gte_mean = list(filter(lambda bw: bw >= mu, bw_measurements)) if bws_gte_mean: - return mean(bws_gte_mean) + return round(mean(bws_gte_mean)) return 1 diff --git a/tests/unit/lib/test_scaling.py b/tests/unit/lib/test_scaling.py index 06fb71b..2e4212c 100644 --- a/tests/unit/lib/test_scaling.py +++ b/tests/unit/lib/test_scaling.py @@ -1,4 +1,5 @@ """Unit tests for scaling.py.""" +from statistics import mean from sbws.lib import scaling @@ -10,4 +11,30 @@ def test_bw_filt(): ] fb = scaling.bw_filt(bw_measurements) # This is greater than the mean, that is 61422.73714139576 - assert fb == 83505.81986994506 + assert fb == 83506 + + # When there are no measurements what can not be the case for successful + # results. + bw_measurements = [] + assert 1 == scaling.bw_filt(bw_measurements) + + bw_measurements = [1, 0] + # Because rounded to int + assert 0 == round(mean(bw_measurements)) + # So the filtered bw will be also 0 + assert 0 == scaling.bw_filt(bw_measurements) + + bw_measurements = [1, 2, 3] + # Because rounded to int + assert 2 == round(mean(bw_measurements)) + assert 2 == scaling.bw_filt(bw_measurements) + + bw_measurements = [10, 0] + assert 5 == round(mean(bw_measurements)) + # Because the value 10 is bigger than the mean + assert 10 == scaling.bw_filt(bw_measurements) + + bw_measurements = [0, 10, 20] + assert 10 == round(mean(bw_measurements)) + # Because 10 and 20 are bigger or equal than the mean + assert 15 == scaling.bw_filt(bw_measurements)

1 0

[sbws/maint-1.1] fix: tests: Add bw filtered from results
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit e3b4c4ed4d84bee543b47fd0d683050b3d00182b Author: juga0 <juga(a)riseup.net> Date: Mon Mar 15 14:25:13 2021 +0000 fix: tests: Add bw filtered from results --- tests/unit/lib/test_scaling.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/unit/lib/test_scaling.py b/tests/unit/lib/test_scaling.py index 2e4212c..4a02359 100644 --- a/tests/unit/lib/test_scaling.py +++ b/tests/unit/lib/test_scaling.py @@ -1,7 +1,9 @@ """Unit tests for scaling.py.""" +import os from statistics import mean from sbws.lib import scaling +from sbws.lib.resultdump import load_result_file, ResultSuccess def test_bw_filt(): @@ -38,3 +40,30 @@ def test_bw_filt(): assert 10 == round(mean(bw_measurements)) # Because 10 and 20 are bigger or equal than the mean assert 15 == scaling.bw_filt(bw_measurements) + + +def test_bw_filt_from_results(root_data_path): + results_file = os.path.join( + root_data_path, ".sbws", "datadir", "2019-03-25.txt" + ) + results = load_result_file(results_file) + bw_filts = {} + for fp, values in results.items(): + success_results = [r for r in values if isinstance(r, ResultSuccess)] + if success_results: + bw_measurements = scaling.bw_measurements_from_results( + success_results + ) + mu = round(mean(bw_measurements)) + muf = scaling.bw_filt(bw_measurements) + bw_filts[fp] = (mu, muf) + for fp, values in bw_filts.items(): + assert bw_filts[fp][0] <= bw_filts[fp][1] + assert 5526756 == bw_filts['117A456C911114076BEB4E757AC48B16CC0CCC5F'][0] + assert 5643086 == bw_filts['117A456C911114076BEB4E757AC48B16CC0CCC5F'][1] + assert 5664965 == bw_filts['693F73187624BE760AAD2A12C5ED89DB1DE044F5'][0] + assert 5774274 == bw_filts['693F73187624BE760AAD2A12C5ED89DB1DE044F5'][1] + assert 5508279 == bw_filts['270A861ABED22EC2B625198BCCD7B2B9DBFFC93C'][0] + assert 5583737 == bw_filts['270A861ABED22EC2B625198BCCD7B2B9DBFFC93C'][1] + assert 5379911 == bw_filts['E894C65997F8EC96558B554176EEEA39C6A43EF6'][0] + assert 5485088 == bw_filts['E894C65997F8EC96558B554176EEEA39C6A43EF6'][1]

1 0

[sbws/maint-1.1] fix: scaling: Return if there are no measurements
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit 455a7f69a9f3d0b2945a428e55e4eed604031e4e Author: juga0 <juga(a)riseup.net> Date: Mon Mar 1 19:04:34 2021 +0000 fix: scaling: Return if there are no measurements it should not be the case because the measurements come from successful results, but otherwise it'd throw an exception. --- sbws/lib/scaling.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 6ec8185..4b21e79 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -14,11 +14,13 @@ def bw_filt(bw_measurements): It is the equivalent to Torflow's ``filt_sbw``. ``mu`` in this function is the equivalent to Torflow's ``sbw``. """ - mu = 1 - if bw_measurements: - # Torflow is rounding to an integer, so is `bw_mean_from_results` in - # `v3bwfile.py` - mu = round(mean(bw_measurements)) + # This should never be the case, as the measurements come from successful + # results. + if not bw_measurements: + return 1 + # Torflow is rounding to an integer, so is `bw_mean_from_results` in + # `v3bwfile.py` + mu = round(mean(bw_measurements)) bws_gte_mean = list(filter(lambda bw: bw >= mu, bw_measurements)) if bws_gte_mean: return round(mean(bws_gte_mean))

1 0

[sbws/maint-1.1] fix: scaling: Return mean if no bw >= mean
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit bd57e473e2975bf0ef1a0abae214a59f115223b8 Author: juga0 <juga(a)riseup.net> Date: Mon Mar 15 14:10:33 2021 +0000 fix: scaling: Return mean if no bw >= mean --- sbws/lib/scaling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 2f63886..5415f63 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -27,7 +27,7 @@ def bw_filt(bw_measurements): bws_gte_mean = list(filter(lambda bw: bw >= mu, bw_measurements)) if bws_gte_mean: return round(mean(bws_gte_mean)) - return 1 + return mu def network_means_by_relay_type(bw_lines, router_statuses_d):

1 0

[sbws/maint-1.1] fix: scaling: Stop returning 1 as the means minima
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit a82c26184097bea3ca405ae19773de7c4354a541 Author: juga0 <juga(a)riseup.net> Date: Wed Mar 10 10:34:56 2021 +0000 fix: scaling: Stop returning 1 as the means minima since they are used as the numerator when calculating the ratio and the rounding already returns a minimum of 1. --- sbws/lib/scaling.py | 25 ++++++++++++++++++++++++- sbws/lib/v3bwfile.py | 7 +++++-- tests/unit/lib/test_scaling.py | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 4b21e79..2f63886 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -14,10 +14,13 @@ def bw_filt(bw_measurements): It is the equivalent to Torflow's ``filt_sbw``. ``mu`` in this function is the equivalent to Torflow's ``sbw``. """ + # It's safe to return 0 here, because: + # 1. this value will be the numerator when calculating the ratio. + # 2. `kb_round_x_sig_dig` returns a minimum of 1. # This should never be the case, as the measurements come from successful # results. if not bw_measurements: - return 1 + return 0 # Torflow is rounding to an integer, so is `bw_mean_from_results` in # `v3bwfile.py` mu = round(mean(bw_measurements)) @@ -25,3 +28,23 @@ def bw_filt(bw_measurements): if bws_gte_mean: return round(mean(bws_gte_mean)) return 1 + + +def network_means_by_relay_type(bw_lines, router_statuses_d): + # Temporarily assign the type of relay to calculate network stream and + # filtered bandwidth by type + for line in bw_lines: + rs = None + if router_statuses_d: + rs = router_statuses_d.get(line.node_id.replace("$", ""), None) + line.set_relay_type(rs_relay_type(rs)) + + mu_type = muf_type = {} + for rt in RELAY_TYPES: + bw_lines_type = [line for line in bw_lines if line.relay_type == rt] + if len(bw_lines_type) > 0: + # Torflow does not round these values. + # Ensure they won't be 0 to avoid division by 0 Exception + mu_type[rt] = mean([line.bw_mean for line in bw_lines_type]) or 1 + muf_type[rt] = mean([line.bw_filt for line in bw_lines_type]) or 1 + return mu_type, muf_type diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 362c696..22cf155 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -875,9 +875,12 @@ class V3BWLine(object): def bw_mean_from_results(results): bws = [dl['amount'] / dl['duration'] for r in results for dl in r.downloads] + # It's safe to return 0 here, because: + # 1. this value will be the numerator when calculating the ratio. + # 2. `kb_round_x_sig_dig` returns a minimum of 1. if bws: - return max(round(mean(bws)), 1) - return 1 + return round(mean(bws)) + return 0 @staticmethod def last_time_from_results(results): diff --git a/tests/unit/lib/test_scaling.py b/tests/unit/lib/test_scaling.py index 4a02359..e55c2b0 100644 --- a/tests/unit/lib/test_scaling.py +++ b/tests/unit/lib/test_scaling.py @@ -18,7 +18,7 @@ def test_bw_filt(): # When there are no measurements what can not be the case for successful # results. bw_measurements = [] - assert 1 == scaling.bw_filt(bw_measurements) + assert 0 == scaling.bw_filt(bw_measurements) bw_measurements = [1, 0] # Because rounded to int

1 0

[sbws/maint-1.1] fix: v3bwfile: network means by relay type
by juga＠torproject.org 16 Mar '21

16 Mar '21

commit fc3d3b992ada601a6255f8a6889179abd4b7e55e Author: juga0 <juga(a)riseup.net> Date: Mon Mar 1 22:04:04 2021 +0000 fix: v3bwfile: network means by relay type Calculate network stream and filtered bandwidth averages per relay type, to obtain bandwidth weights the same way as Torflow. Closes #40059. --- sbws/globals.py | 8 ++++++++ sbws/lib/scaling.py | 3 +++ sbws/lib/v3bwfile.py | 24 +++++++++++++++--------- sbws/util/stem.py | 22 +++++++++++++++++++++- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index fa16096..b7b1097 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -187,6 +187,14 @@ MAX_RECENT_PRIORITY_RELAY_COUNT = ( MAX_RECENT_PRIORITY_LIST_COUNT * MAX_RELAYS_PER_PRIORITY_LIST ) +# Used by util/stem.py +G = 0 +M = 1 +E = 2 +GE = 3 +# Used by lib/scaling.py to calculate network means by relay type +RELAY_TYPES = [G, M, E, GE] + def fail_hard(*a, **kw): ''' Log something ... and then exit as fast as possible ''' diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 5415f63..1af007e 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -1,5 +1,8 @@ from statistics import mean +from sbws.globals import RELAY_TYPES +from sbws.util.stem import rs_relay_type + def bw_measurements_from_results(results): return [ diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 22cf155..88bfc56 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -985,6 +985,11 @@ class V3BWLine(object): len(bw_line_str), BW_LINE_SIZE) return bw_line_str + def set_relay_type(self, relay_type): + self.relay_type = relay_type + + def del_relay_type(self): + delattr(self, "relay_type") class V3BWFile(object): """ @@ -1226,12 +1231,11 @@ class V3BWFile(object): """ log.info("Calculating relays' bandwidth using Torflow method.") bw_lines_tf = copy.deepcopy(bw_lines) - # mean (Torflow's strm_avg) - mu = mean([l.bw_mean for l in bw_lines]) - # filtered mean (Torflow's filt_avg) - muf = mean([l.bw_filt for l in bw_lines]) - log.debug('mu %s', mu) - log.debug('muf %s', muf) + mu_type, muf_type = scaling.network_means_by_relay_type( + bw_lines_tf, router_statuses_d + ) + log.debug('mu %s', mu_type) + log.debug('muf %s', muf_type) # Torflow's ``tot_net_bw``, sum of the scaled bandwidth for the relays # that are in the last consensus @@ -1292,10 +1296,12 @@ class V3BWFile(object): continue # Torflow's scaling - ratio_stream = l.bw_mean / mu - ratio_stream_filtered = l.bw_filt / muf + # relay_type is set in `network_means_by_relay_type` in the lines + # above + ratio_stream = l.bw_mean / mu_type[l.relay_type] + ratio_stream_filtered = l.bw_filt / muf_type[l.relay_type] + l.del_relay_type() ratio = max(ratio_stream, ratio_stream_filtered) - # Assign it to an attribute, so it's not lost before capping and # rounding l.bw = ratio * min_bandwidth diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 9fea31f..e617800 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -12,9 +12,11 @@ import logging import os from sbws.globals import fail_hard from sbws.globals import (TORRC_STARTING_POINT, TORRC_RUNTIME_OPTIONS, - TORRC_OPTIONS_CAN_FAIL) + TORRC_OPTIONS_CAN_FAIL, G, M, E, GE) from sbws import settings +from stem import Flag + log = logging.getLogger(__name__) stream_building_lock = RLock() @@ -325,3 +327,21 @@ def is_torrc_starting_point_set(tor_controller): if not bad_options: log.info("Tor is correctly configured to work with sbws.") return bad_options + + +def rs_relay_type(rs): + # In torflow, the equivalent to the bw_lines is initialized to "", so when + # the relay is not in the previous consensus and it is not known which + # flags it has, it would return "Medium", as it's the fail case in + # Node.node_class(). + # It is not known if it is a bug, or a desired side effect that they relays + # not in the consensus will end up in the Middle class + if not rs: + return M + if Flag.EXIT in rs.flags and Flag.GUARD in rs.flags: + return GE + if Flag.GUARD in rs.flags: + return G + if Flag.EXIT in rs.flags: + return E + return M

1 0