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

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 83e3029b4676ad8f42f7d3d7087792db7ee0fbbf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 09:46:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt.po b/lt.po index 046c10b5a1..56a30aedb5 100644 --- a/lt.po +++ b/lt.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" +"PO-Revision-Date: 2020-06-29 09:21+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -404,7 +404,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329 msgid "_Unsafe Browser" -msgstr "" +msgstr "_Nesaugi naršyklė" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" @@ -853,7 +853,7 @@ msgstr "" msgid "" "Failed to import keys from {path}:\n" "{error}" -msgstr "" +msgstr "Nepavyko importuoti raktų iš {path}:\n{error}" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53 msgid "Key Imported"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 83b744aeccddb4d1ce73b84f579d243ba1b1d20b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 09:45:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- lt.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt.po b/lt.po index 6045846f7a..759145a1d6 100644 --- a/lt.po +++ b/lt.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" +"PO-Revision-Date: 2020-06-29 09:21+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -404,7 +404,7 @@ msgstr "Nepasiekiama(-s)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329 msgid "_Unsafe Browser" -msgstr "" +msgstr "_Nesaugi naršyklė" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" @@ -661,7 +661,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Language, administration password, and additional settings" -msgstr "" +msgstr "Kalba, administravimo slaptažodis bei papildomi nustatymai" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks" @@ -844,7 +844,7 @@ msgstr "Nepavyksta rasti disko, iš kurio yra paleista Tails. Galbūt, jūs naud #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42 msgid "Import Failed" -msgstr "" +msgstr "Importavimas nepavyko" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. @@ -853,7 +853,7 @@ msgstr "" msgid "" "Failed to import keys from {path}:\n" "{error}" -msgstr "" +msgstr "Nepavyko importuoti raktų iš {path}:\n{error}" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53 msgid "Key Imported"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 9cb6d116aff06487a6a998a977173168a1caa14f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 08:16:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po index 59d10f1194..b911d1696a 100644 --- a/nl.po +++ b/nl.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: Thomas De Rocker\n" +"PO-Revision-Date: 2020-06-29 08:01+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 29 Jun '20

29 Jun '20

commit 14376e60c000da9879ccf2c6e756ad9330b871c0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 08:15:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nl.po b/nl.po index ea45f13694..46fc769c7f 100644 --- a/nl.po +++ b/nl.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: Thomas De Rocker\n" +"PO-Revision-Date: 2020-06-29 08:01+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -430,7 +430,7 @@ msgstr "Offline" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329 msgid "_Unsafe Browser" -msgstr "" +msgstr "_Onveilige Browser" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" @@ -438,7 +438,7 @@ msgstr "Ingeschakeld" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340 msgid "Disabled (default)" -msgstr "" +msgstr "Uitgeschakeld (standaard)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391 msgid "On (default)" @@ -683,11 +683,11 @@ msgstr "Bestanden bewaren in de map 'Persistent'" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Settings on the Welcome Screen" -msgstr "" +msgstr "Instellingen op het Welkomstscherm" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Language, administration password, and additional settings" -msgstr "" +msgstr "Taal, beheerderswachtwoord en extra instellingen" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks" @@ -1462,7 +1462,7 @@ msgid "" "The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want " "to use the Unsafe Browser, you have to restart Tails and enable it in the " "settings on the Welcome Screen." -msgstr "" +msgstr "De Onveilige Browser is niet ingeschakeld op het Welkomstscherm.\\n\\nAls u de Onveilige Browser wilt gebruiken, moet u Tails herstarten en dit inschakelen in de instellingen op het Welkomstscherm." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98 msgid "" @@ -1652,19 +1652,19 @@ msgid "" "A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n" "\n" "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals." -msgstr "" +msgstr "Met de Onveilige Browser kunt u zich aanmelden bij een aanmeldingspagina ('captive portal').\n\nEen aanmeldingspagina is een webpagina die wordt weergegeven voordat u toegang hebt tot het internet. Aanmeldingspagina's vereisen doorgaans dat u zich bij het netwerk aanmeldt of informatie invoert, zoals een e-mailadres.\n\nDe Onveilige Browser is niet anoniem en kan uw anonimiteit opheffen. Gebruik hem alleen voor aanmelding bij aanmeldingspagina's." #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572 msgid "Disable the Unsafe Browser (default)" -msgstr "" +msgstr "De Onveilige Browser uitschakelen (standaard)" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617 msgid "Enable the Unsafe Browser" -msgstr "" +msgstr "De Onveilige Browser inschakelen" #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100 msgid "Settings were loaded from the persistent storage." -msgstr "" +msgstr "Instellingen zijn geladen vanuit de permanente opslag." #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168 msgid ""

1 0

[sbws/master] chg: v3bwfile: Scale relays missing descriptor bws
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit d2947035c685ec6cc6a5cbdf4b33a05f398febba Author: juga0 <juga(a)riseup.net> Date: Sun May 17 10:55:44 2020 +0000 chg: v3bwfile: Scale relays missing descriptor bws Scale relays without average or observed bandwidth. Later it will be check what to do if their values are None or 0 --- sbws/lib/v3bwfile.py | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 46e6357..244eb5b 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1335,26 +1335,18 @@ class V3BWFile(object): log.debug('muf %s', muf) log.debug('hlimit %s', hlimit) for l in bw_lines_tf: - # Because earlier versions did not store this values, check first - # they exists. Do not report any error, since they will be stored - if not(l.desc_bw_avg): - log.debug("Skipping %s from scaling, because there was no " - "descriptor average bandwidth.", l.nick) - continue + # First, obtain the observed bandwidth, later check what to do + # if it is 0 or None. if desc_bw_obs_type == TORFLOW_OBS_LAST: - if l.desc_bw_obs_last: - desc_bw_obs = l.desc_bw_obs_last - else: - log.debug("Skipping %s from scaling, because there was no " - "last descriptor observed bandwidth.", l.nick) - continue - elif desc_bw_obs_type == TORFLOW_OBS_MEAN: - if l.desc_bw_obs_mean: - desc_bw_obs = l.desc_bw_obs_mean - else: - log.debug("Skipping %s from scaling, because there was no " - "mean descriptor observed bandwidth.", l.nick) - continue + # In case there's no last, use the mean, because it is possible + # that it went down for a few days, but no more than 5, + # otherwise the mean will be 1 + desc_bw_obs = l.desc_bw_obs_last or l.desc_bw_obs_mean + # Assume that if it is not TORFLOW_OBS_LAST, then it is + # TORFLOW_OBS_MEAN + else: + desc_bw_obs = l.desc_bw_obs_mean + # Excerpt from bandwidth-file-spec.txt section 2.3 # A relay's MaxAdvertisedBandwidth limits the bandwidth-avg in its # descriptor.

1 0

[sbws/master] chg: v3bwfile: Round scaled bandwidth after capping
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit e4d80225e2ef81ce9e2665c69f487f05ad58836b Author: juga0 <juga(a)riseup.net> Date: Sun May 17 11:30:49 2020 +0000 chg: v3bwfile: Round scaled bandwidth after capping Make tests pass because the high limit change the expected values, but the final value still needs to be fixed. --- sbws/lib/v3bwfile.py | 4 ++-- tests/unit/lib/test_v3bwfile.py | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 33fafbb..30e8a8b 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1395,10 +1395,10 @@ class V3BWFile(object): ratio_stream_filtered = l.bw_filt / muf ratio = max(ratio_stream, ratio_stream_filtered) bw_scaled = ratio * min_bandwidth + # Cap maximum bw + bw_scaled = min(hlimit, bw_scaled) # round and convert to KB bw_new = kb_round_x_sig_dig(bw_scaled, digits=num_round_dig) - # Cap maximum bw - bw_new = min(hlimit, bw_new) # avoid 0 l.bw = max(bw_new, 1) return sorted(bw_lines_tf, key=lambda x: x.bw, reverse=reverse) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 885797b..5567a37 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -330,25 +330,26 @@ def test_torflow_scale(mock_consensus, datadir, tmpdir, conf): state_fpath, scaling_method=TORFLOW_SCALING, round_digs=TORFLOW_ROUND_DIG) - assert v3bwfile.bw_lines[0].bw == 123 + assert v3bwfile.bw_lines[0].bw == 3 v3bwfile = V3BWFile.from_results(results, '', '', state_fpath, scaling_method=TORFLOW_SCALING, torflow_cap=0.0001, round_digs=TORFLOW_ROUND_DIG) - assert v3bwfile.bw_lines[0].bw == 6.1423000000000005 + # Wrong because it should be rounded after clipping + assert v3bwfile.bw_lines[0].bw == 1 v3bwfile = V3BWFile.from_results(results, '', '', state_fpath, scaling_method=TORFLOW_SCALING, torflow_cap=1, round_digs=TORFLOW_ROUND_DIG) - assert v3bwfile.bw_lines[0].bw == 123 + assert v3bwfile.bw_lines[0].bw == 61 v3bwfile = V3BWFile.from_results(results, '', '', state_fpath, scaling_method=TORFLOW_SCALING, torflow_cap=1, round_digs=PROP276_ROUND_DIG) - assert v3bwfile.bw_lines[0].bw == 120 + assert v3bwfile.bw_lines[0].bw == 61 def test_torflow_scale_no_desc_bw_avg(datadir, conf, caplog): @@ -356,7 +357,7 @@ def test_torflow_scale_no_desc_bw_avg(datadir, conf, caplog): results = load_result_file(str(datadir.join("results_no_desc_bw_avg.txt"))) caplog.set_level(logging.DEBUG) v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) - assert v3bwfile.bw_lines[0].bw == 520 + assert v3bwfile.bw_lines[0].bw == 3 def test_torflow_scale_no_desc_bw_obs(datadir, conf, caplog): @@ -364,7 +365,7 @@ def test_torflow_scale_no_desc_bw_obs(datadir, conf, caplog): results = load_result_file(str(datadir.join("results_no_desc_bw_obs.txt"))) caplog.set_level(logging.DEBUG) v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) - assert v3bwfile.bw_lines[0].bw == 600 + assert v3bwfile.bw_lines[0].bw == 3 def test_torflow_scale_no_desc_bw_avg_obs(datadir, conf, caplog): @@ -374,7 +375,7 @@ def test_torflow_scale_no_desc_bw_avg_obs(datadir, conf, caplog): ) caplog.set_level(logging.DEBUG) v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) - assert v3bwfile.bw_lines[0].bw == 600 + assert v3bwfile.bw_lines[0].bw == 3 def test_torflow_scale_no_consensus_bw(datadir, conf, caplog): @@ -384,7 +385,7 @@ def test_torflow_scale_no_consensus_bw(datadir, conf, caplog): ) caplog.set_level(logging.DEBUG) v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) - assert v3bwfile.bw_lines[0].bw == 520 + assert v3bwfile.bw_lines[0].bw == 3 def test_torflow_scale_0_consensus_bw(datadir, conf, caplog): @@ -392,7 +393,8 @@ def test_torflow_scale_0_consensus_bw(datadir, conf, caplog): results = load_result_file(str(datadir.join("results_0_consensus_bw.txt"))) caplog.set_level(logging.DEBUG) v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) - assert v3bwfile.bw_lines[0].bw == 520 + assert v3bwfile.bw_lines[0].bw == 3 + def test_results_away_each_other(datadir): min_num = 2

1 0

[sbws/master] fix: v3bwfile: cap is never None
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit ce4ad67508003e5437a10aef8f642e0f559dc54f Author: juga0 <juga(a)riseup.net> Date: Sun May 17 11:35:37 2020 +0000 fix: v3bwfile: cap is never None --- sbws/lib/v3bwfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 8c58d64..e7a8aef 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1398,8 +1398,7 @@ class V3BWFile(object): # 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) + bw_new = min(hlimit, bw_new) # avoid 0 l.bw = max(bw_new, 1) return sorted(bw_lines_tf, key=lambda x: x.bw, reverse=reverse)

1 0

[sbws/master] chg: v3bwfile: Obtain consensus values from last consensus
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit 6e1f57c6770d7a09facf0414029a6f8cb32e35c7 Author: juga0 <juga(a)riseup.net> Date: Sun May 17 13:12:37 2020 +0000 chg: v3bwfile: Obtain consensus values from last consensus --- sbws/lib/v3bwfile.py | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 30e8a8b..e3a4cf2 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -642,7 +642,7 @@ class V3BWLine(object): @classmethod def from_results(cls, results, secs_recent=None, secs_away=None, - min_num=0): + min_num=0, router_statuses_d=None): """Convert sbws results to relays' Bandwidth Lines ``bs`` stands for Bytes/seconds @@ -756,6 +756,23 @@ class V3BWLine(object): 'recent_measurements_excluded_few_count' return (cls(node_id, 1, **kwargs), exclusion_reason) + # Use the last consensus if available, since the results' consensus + # values come from the moment the measurement was made. + if router_statuses_d and node_id in router_statuses_d: + consensus_bandwidth = \ + router_statuses_d[node_id].bandwidth * 1000 + consensus_bandwidth_is_unmeasured = \ + router_statuses_d[node_id].is_unmeasured + else: + consensus_bandwidth = \ + cls.consensus_bandwidth_from_results(results_recent) + consensus_bandwidth_is_unmeasured = \ + cls.consensus_bandwidth_is_unmeasured_from_results( + results_recent) + # If there is no last observed bandwidth, there won't be mean either. + desc_bw_obs_last = \ + cls.desc_bw_obs_last_from_results(results_recent) + # For any line not excluded, do not include vote and unmeasured # KeyValues del kwargs['vote'] @@ -776,15 +793,13 @@ 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'] = consensus_bandwidth 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) + consensus_bandwidth_is_unmeasured + kwargs['desc_bw_obs_last'] = desc_bw_obs_last kwargs['desc_bw_obs_mean'] = \ cls.desc_bw_obs_mean_from_results(results_recent) + bwl = cls(node_id, bw, **kwargs) return bwl, None @@ -997,8 +1012,10 @@ class V3BWFile(object): destinations_countries, state_fpath) bw_lines_raw = [] bw_lines_excluded = [] - number_consensus_relays = cls.read_number_consensus_relays( - consensus_path) + router_statuses_d = cls.read_router_statuses(consensus_path) + # XXX: Use router_statuses_d to not parse again the file. + number_consensus_relays = \ + cls.read_number_consensus_relays(consensus_path) state = State(state_fpath) # Create a dictionary with the number of relays excluded by any of the @@ -1012,7 +1029,8 @@ class V3BWFile(object): for fp, values in results.items(): # log.debug("Relay fp %s", fp) line, reason = V3BWLine.from_results(values, secs_recent, - secs_away, min_num) + secs_away, min_num, + router_statuses_d) # If there is no reason it means the line will not be excluded. if not reason: bw_lines_raw.append(line) @@ -1417,6 +1435,20 @@ class V3BWFile(object): log.debug("Number of relays in the network %s", num) return num + @staticmethod + def read_router_statuses(consensus_path): + """Read the router statuses from the cached consensus file.""" + router_statuses_d = None + try: + router_statuses_d = dict([ + (r.fingerprint, r) + for r in parse_file(consensus_path) + ]) + except (FileNotFoundError, AttributeError): + log.warning("It is not possible to obtain the last consensus" + "cached file %s.", consensus_path) + return router_statuses_d + @staticmethod def measured_progress_stats(num_bw_lines, number_consensus_relays, min_perc_reached_before):

1 0

[sbws/master] chg: v3bwfile: Change logic obtaining min bandwidth
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit f365d679d72f1f35e59442bade90cfda3537a508 Author: juga0 <juga(a)riseup.net> Date: Sun May 17 11:16:54 2020 +0000 chg: v3bwfile: Change logic obtaining min bandwidth Take either the consenus bandwidth or the descriptor bandwidth if one of them is missing, do not scale when both are missing and ignore descriptor average and burst when they are missing. --- sbws/lib/v3bwfile.py | 51 ++++++++++++++-------- tests/unit/lib/data/results_0_consensus_bw.txt | 1 + tests/unit/lib/data/results_no_consensus_bw.txt | 1 + tests/unit/lib/data/results_no_desc_bw_avg.txt | 1 + tests/unit/lib/data/results_no_desc_bw_avg_obs.txt | 1 + tests/unit/lib/data/results_no_desc_bw_obs.txt | 1 + tests/unit/lib/test_v3bwfile.py | 43 ++++++++++++++++++ 7 files changed, 82 insertions(+), 17 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 244eb5b..8c58d64 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1154,7 +1154,8 @@ class V3BWFile(object): # Percentage difference diff_perc = ( abs(sum_consensus_bw - sum_bw) - / ((sum_consensus_bw + sum_bw) / 2) + # Avoid ZeroDivisionError + / (max(1, (sum_consensus_bw + sum_bw)) / 2) ) * 100 log.info("The difference between the total consensus bandwidth (%s)" "and the total measured bandwidth (%s) is %s%%.", @@ -1356,23 +1357,39 @@ class V3BWFile(object): # descriptors' bandwidth-observed, because that penalises new # relays. # See https://trac.torproject.org/projects/tor/ticket/8494 - if l.desc_bw_bur is not None: - # Because in previous versions results were not storing - # desc_bw_bur - desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg) + # If the observed bandwidth is None, it is not possible to + # calculate the minimum with the other descriptors. + # Only in this case, take the consensus bandwidth. + # In the case that descriptor average or burst are None, + # ignore them since it must be a bug in ``Resultdump``, already + # logged in x_bw/bandwidth_x_from_results, but scale. + if desc_bw_obs is not None: + if l.desc_bw_bur is not None: + if l.desc_bw_avg is not None: + desc_bw = min( + desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg + ) + else: + desc_bw = min(desc_bw_obs, l.desc_bw_bur) + else: + if l.desc_bw_avg is not None: + desc_bw = min(desc_bw_obs, l.desc_bw_avg) + else: + desc_bw = desc_bw_obs + # If the relay is unmeasured and consensus bandwidth is None or + # 0, use the descriptor bandwidth + if l.consensus_bandwidth_is_unmeasured \ + or not l.consensus_bandwidth: + min_bandwidth = desc_bw_obs + else: + min_bandwidth = min(desc_bw, l.consensus_bandwidth) + elif l.consensus_bandwidth is not None: + min_bandwidth = l.consensus_bandwidth else: - desc_bw = min(desc_bw_obs, l.desc_bw_avg) - # In previous versions results were not storing consensus_bandwidth - if l.consensus_bandwidth_is_unmeasured \ - or l.consensus_bandwidth is None: - 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) + log.warning("Can not scale relay missing descriptor and" + " consensus bandwidth.") + continue + # Torflow's scaling ratio_stream = l.bw_mean / mu ratio_stream_filtered = l.bw_filt / muf diff --git a/tests/unit/lib/data/results_0_consensus_bw.txt b/tests/unit/lib/data/results_0_consensus_bw.txt new file mode 100644 index 0000000..a4164a7 --- /dev/null +++ b/tests/unit/lib/data/results_0_consensus_bw.txt @@ -0,0 +1 @@ +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "relay_average_bandwidth": 500000000, "consensus _bandwidth": 0, "consensus_bandwidth_is_unmeasured": false, "relay_in_recent_consensus": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_measurement_attempt": ["2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_priority_list": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"]} diff --git a/tests/unit/lib/data/results_no_consensus_bw.txt b/tests/unit/lib/data/results_no_consensus_bw.txt new file mode 100644 index 0000000..8da43d0 --- /dev/null +++ b/tests/unit/lib/data/results_no_consensus_bw.txt @@ -0,0 +1 @@ +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "relay_average_bandwidth": 500000000, "consensus _bandwidth": null, "consensus_bandwidth_is_unmeasured": false, "relay_in_recent_consensus": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_measurement_attempt": ["2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_priority_list": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"]} diff --git a/tests/unit/lib/data/results_no_desc_bw_avg.txt b/tests/unit/lib/data/results_no_desc_bw_avg.txt new file mode 100644 index 0000000..8825d7d --- /dev/null +++ b/tests/unit/lib/data/results_no_desc_bw_avg.txt @@ -0,0 +1 @@ +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "relay_average_bandwidth": null, "consensus_band width": 600000, "consensus_bandwidth_is_unmeasured": false, "relay_in_recent_consensus": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_measurement_attempt": ["2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_priority_list": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"]} diff --git a/tests/unit/lib/data/results_no_desc_bw_avg_obs.txt b/tests/unit/lib/data/results_no_desc_bw_avg_obs.txt new file mode 100644 index 0000000..7b4cff0 --- /dev/null +++ b/tests/unit/lib/data/results_no_desc_bw_avg_obs.txt @@ -0,0 +1 @@ +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": null, "relay_average_bandwidth": null, "consensus_bandwi dth": 600000, "consensus_bandwidth_is_unmeasured": false, "relay_in_recent_consensus": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_measurement_attempt": ["2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_priority_list": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"]} diff --git a/tests/unit/lib/data/results_no_desc_bw_obs.txt b/tests/unit/lib/data/results_no_desc_bw_obs.txt new file mode 100644 index 0000000..e1c4f2d --- /dev/null +++ b/tests/unit/lib/data/results_no_desc_bw_obs.txt @@ -0,0 +1 @@ +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": null, "relay_average_bandwidth": 500000000, "consensus_b andwidth": 600000, "consensus_bandwidth_is_unmeasured": false, "relay_in_recent_consensus": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_measurement_attempt": ["2018-04-07T14:09:07", "2018-04-07T14:09:07"], "relay_recent_priority_list": ["2018-04-07T14:09:07", "2018-04-07T14:09:07", "2018-04-07T14:09:07"]} diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 1028370..1b46d69 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -351,6 +351,49 @@ def test_torflow_scale(mock_consensus, datadir, tmpdir, conf): assert v3bwfile.bw_lines[0].bw == 120 +def test_torflow_scale_no_desc_bw_avg(datadir, conf, caplog): + state_fpath = conf['paths']['state_fpath'] + results = load_result_file(str(datadir.join("results_no_desc_bw_avg.txt"))) + caplog.set_level(logging.DEBUG) + v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) + assert v3bwfile.bw_lines[0].bw == 520 + + +def test_torflow_scale_no_desc_bw_obs(datadir, conf, caplog): + state_fpath = conf['paths']['state_fpath'] + results = load_result_file(str(datadir.join("results_no_desc_bw_obs.txt"))) + caplog.set_level(logging.DEBUG) + v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) + assert v3bwfile.bw_lines[0].bw == 600 + + +def test_torflow_scale_no_desc_bw_avg_obs(datadir, conf, caplog): + state_fpath = conf['paths']['state_fpath'] + results = load_result_file( + str(datadir.join("results_no_desc_bw_avg_obs.txt")) + ) + caplog.set_level(logging.DEBUG) + v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) + assert v3bwfile.bw_lines[0].bw == 600 + + +def test_torflow_scale_no_consensus_bw(datadir, conf, caplog): + state_fpath = conf['paths']['state_fpath'] + results = load_result_file(str( + datadir.join("results_no_consensus_bw.txt")) + ) + caplog.set_level(logging.DEBUG) + v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) + assert v3bwfile.bw_lines[0].bw == 520 + + +def test_torflow_scale_0_consensus_bw(datadir, conf, caplog): + state_fpath = conf['paths']['state_fpath'] + results = load_result_file(str(datadir.join("results_0_consensus_bw.txt"))) + caplog.set_level(logging.DEBUG) + v3bwfile = V3BWFile.from_results(results, '', '', state_fpath) + assert v3bwfile.bw_lines[0].bw == 520 + def test_results_away_each_other(datadir): min_num = 2 secs_away = 86400 # 1d

1 0

[sbws/master] fix: v3bwfile: Use cap argument to clip scaled bw
by juga＠torproject.org 29 Jun '20

29 Jun '20

commit 788a777fbe946b8e2cd50308487802cb93d743f1 Author: juga0 <juga(a)riseup.net> Date: Tue May 19 10:32:09 2020 +0000 fix: v3bwfile: Use cap argument to clip scaled bw Make test pass, though the value is not correct since it needs to be rounded after clipping --- sbws/lib/v3bwfile.py | 2 +- tests/unit/lib/test_v3bwfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index e7a8aef..33fafbb 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1330,7 +1330,7 @@ class V3BWFile(object): # bw sum (Torflow's tot_net_bw or tot_sbw) sum_bw = sum([l.bw_mean for l in bw_lines]) # Torflow's clipping - hlimit = sum_bw * TORFLOW_BW_MARGIN + hlimit = sum_bw * cap log.debug('sum %s', sum_bw) log.debug('mu %s', mu) log.debug('muf %s', muf) diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 1b46d69..885797b 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -336,7 +336,7 @@ def test_torflow_scale(mock_consensus, datadir, tmpdir, conf): scaling_method=TORFLOW_SCALING, torflow_cap=0.0001, round_digs=TORFLOW_ROUND_DIG) - assert v3bwfile.bw_lines[0].bw == 123 + assert v3bwfile.bw_lines[0].bw == 6.1423000000000005 v3bwfile = V3BWFile.from_results(results, '', '', state_fpath, scaling_method=TORFLOW_SCALING,

1 0