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

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit c40e6e11f3d064f7c5fc8ec1895081ae673781fc Merge: e37c472 cb6a8a7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 7 22:55:33 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1 docs/source/man_sbws.ini.rst | 4 +++ sbws/config.default.ini | 1 + sbws/core/scanner.py | 18 ++---------- sbws/util/config.py | 4 ++- sbws/util/stem.py | 66 +++++++++++++++++++++---------------------- tests/… [View More]

1 0

[sbws/maint-1.1] Merge branch 'bug_40035' into 'maint-1.1'
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit e37c47238f3cbea71efa0ad4ef237f8e1423efd6 Merge: 713d400 17e6eca Author: juga <juga(a)riseup.net> Date: Thu Jan 7 15:51:35 2021 +0000 Merge branch 'bug_40035' into 'maint-1.1' fix: doc: Update values in config_tor.rst + clean-up Closes #40035 See merge request tpo/network-health/sbws!49 docs/source/config_tor.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)

1 0

[sbws/maint-1.1] fix: relaylist: Stop measuring relays not in the consenus
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit a050110db59d136f6f46809c4b18fe487012e546 Author: juga0 <juga(a)riseup.net> Date: Mon Dec 21 16:24:50 2020 +0000 fix: relaylist: Stop measuring relays not in the consenus as this might cause many circuit errors. They're already added to the generator. Also adapt the number in test_init_relays. Closes: #40037. Happy solstice! :) --- sbws/lib/relaylist.py | 17 +++++------------ tests/unit/lib/test_relaylist.py | 8 ++++---- 2 … [View More]files changed, 9 insertions(+), 16 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 8a07ce7..640e3eb 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -14,7 +14,7 @@ from ..globals import ( MAX_RECENT_PRIORITY_LIST_COUNT, MEASUREMENTS_PERIOD ) -from ..util import timestamp, timestamps +from ..util import timestamps log = logging.getLogger(__name__) @@ -250,12 +250,6 @@ class Relay: def relay_recent_priority_list_count(self): return len(self.relay_recent_priority_list) - def is_old(self): - """Whether the last consensus seen for this relay is older than the - measurement period. - """ - return timestamp.is_old(self.last_consensus_timestamp) - # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last # descriptors seen for this relay and the timestamp. def update_server_descriptor(self, server_descriptor): @@ -417,11 +411,10 @@ class RelayList: # already added to the new list. new_relays_dict.pop(fp) - # If the relay is not in the current consensus but is not "old" - # yet, add it to the new list of relays too, though its timestamp, - # router status and descriptor can't be updated. - elif not r.is_old(): - new_relays.append(r) + # In #30727, the relay that is not in the current conensus but is + # not "old", was added to the new list of relays too. + # In #40037 we think it should not be measured, as it might cause + # many circuit errors. It's already added to the generator. # Otherwise, don't add it to the new list of relays. # For debugging, count the old relays that will be discarded. else: diff --git a/tests/unit/lib/test_relaylist.py b/tests/unit/lib/test_relaylist.py index 31673ba..399d897 100644 --- a/tests/unit/lib/test_relaylist.py +++ b/tests/unit/lib/test_relaylist.py @@ -51,7 +51,7 @@ def test_init_relays( assert 6505 == 6433 + len(added_fps) # The calculated min bw for the second hop assert 2120000 == relay_list._exit_min_bw - assert 200000 == relay_list._non_exit_min_bw + assert 210000 == relay_list._non_exit_min_bw # Five days later plus 1 second. # The first consensus timestamp will get removed. @@ -69,10 +69,10 @@ def test_init_relays( removed_fps = fps.difference(fps_5days_later) # The number of relays will be the number of relays in the cosensus plus # the added ones minus the removed ones. - assert 6925 == 6505 + len(added_fps) - len(removed_fps) + assert 6596 == 6505 + len(added_fps) - len(removed_fps) # The calculated min bw for the second hop - assert 2790000 == relay_list._exit_min_bw - assert 110000 == relay_list._non_exit_min_bw + assert 2800000 == relay_list._exit_min_bw + assert 150000 == relay_list._non_exit_min_bw def test_increment_recent_measurement_attempt(args, conf, controller): [View Less]

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/53' into maint-1.1
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 6dc6e94bd0509ddc329c14f3edc4188bfa9716e8 Merge: c40e6e1 8805a1d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 11 09:28:54 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/53' into maint-1.1 .../source/images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes docs/source/monitoring_bandwidth.rst | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)

1 0

[sbws/maint-1.1] fix: doc: Sphinx warnings when creating documentation
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit c931dd014e7fce265da9a46dd48fb9c304c0efeb Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 21 09:30:39 2020 +0000 fix: doc: Sphinx warnings when creating documentation This should give us at least a clean html, text, and man build experience. Closes #40036. --- AUTHORS.md | 3 ++- README.md | 3 ++- docs/source/conf.py | 2 +- docs/source/torflow_aggr.rst | 2 +- sbws/lib/relaylist.py | 5 +++--… [View More] sbws/lib/relayprioritizer.py | 1 + sbws/lib/resultdump.py | 2 +- sbws/lib/v3bwfile.py | 2 +- sbws/util/stem.py | 3 ++- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 4eaef8f..1e8641e 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,4 +1,5 @@ -# Authors +Authors +======= The following people have contributed to Simple Bandwidth Scanner. Thank you for helping make Tor better. diff --git a/README.md b/README.md index 852d02c..fe12cba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Readme +Readme +====== [![Build Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://t… diff --git a/docs/source/conf.py b/docs/source/conf.py index 3dc8660..1f33c71 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -97,7 +97,7 @@ html_theme = 'nature' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = [] # Custom sidebar templates, must be a dictionary that maps document names # to template names. diff --git a/docs/source/torflow_aggr.rst b/docs/source/torflow_aggr.rst index 5b4b3fd..bc9420d 100644 --- a/docs/source/torflow_aggr.rst +++ b/docs/source/torflow_aggr.rst @@ -426,4 +426,4 @@ oldest measurements are 5 days old:: .. _SQLSupport.py: https://gitweb.torproject.org/pytorctl.git/tree/SQLSupport.py#n493 .. _bandwidth file spec: https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt .. _aggregate.py: https://gitweb.torproject.org/torflow.git/tree/NetworkScanners/BwAuthority/… -.. _TorCtly.py: https://gitweb.torproject.org/pytorctl.git/tree/TorCtl.py +.. _TorCtl.py: https://gitweb.torproject.org/pytorctl.git/tree/TorCtl.py diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 8a07ce7..bc6b5ce 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -24,6 +24,7 @@ def valid_after_from_network_statuses(network_statuses): attribute of a ``stem.descriptor.RouterStatusEntryV3``. :param list network_statuses: + returns datetime: """ for ns in network_statuses: @@ -228,7 +229,7 @@ class Relay: Increment The number of times that a relay has been queued to be measured. - It is call from :funf:`~sbws.core.scaner.main_loop`. + It is call from :func:`~sbws.core.scaner.main_loop`. """ self.relay_recent_measurement_attempt.update() @@ -468,7 +469,7 @@ class RelayList: Increment the number of times that any relay has been queued to be measured. - It is call from :funf:`~sbws.core.scaner.main_loop`. + It is call from :func:`~sbws.core.scaner.main_loop`. It is read and stored in a ``state`` file. """ diff --git a/sbws/lib/relayprioritizer.py b/sbws/lib/relayprioritizer.py index ef45391..2d6a488 100644 --- a/sbws/lib/relayprioritizer.py +++ b/sbws/lib/relayprioritizer.py @@ -97,6 +97,7 @@ class RelayPrioritizer: measurements that did not succed. :param bool return_fraction: whether to return only a fraction of the relays seen in the network or return all. + return: a generator of the new ordered list of relays to measure next. """ diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 9792fde..542837e 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -558,7 +558,7 @@ class ResultErrorSecondRelay(ResultError): A second suitable relay is a relay that: - Has at least equal bandwidth as the relay to measure. - - If the relay to measure is not an exit, + - If the relay to measure is not an exit, \ the second relay is an exit without `bad` flag and can exit to port 443. - If the relay to measure is an exit, the second relay is not an exit. diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 553265b..362c696 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -625,7 +625,7 @@ class V3BWLine(object): :param dict kwargs: extra headers. .. note:: tech-debt: move node_id and bw to kwargs and just ensure that - the required values are in **kwargs + the required values are in ``**kwargs`` """ def __init__(self, node_id, bw, **kwargs): assert isinstance(node_id, str) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index ce5253c..5835237 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -118,7 +118,8 @@ def parse_user_torrc_config(torrc, torrc_text): """Parse the user configuration torrc text call `extra_lines` to a dictionary suitable to use with stem and return a new torrc dictionary that merges that dictionary with the existing torrc. - Example: + Example:: + [tor] extra_lines = Log debug file /tmp/tor-debug.log [View Less]

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/51' into maint-1.1
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 96aadc69d0da29d2b85cba08c549c9ccf82a70fc Merge: 38649f0 a050110 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 11:21:59 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/51' into maint-1.1 sbws/lib/relaylist.py | 17 +++++------------ tests/unit/lib/test_relaylist.py | 8 ++++---- 2 files changed, 9 insertions(+), 16 deletions(-)

1 0

[sbws/maint-1.1] fix: doc: Add forgotten image from consensus health
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 8805a1d2f68260a3f996e16a8938aff954af6172 Author: juga0 <juga(a)riseup.net> Date: Mon Jan 11 07:37:25 2021 +0000 fix: doc: Add forgotten image from consensus health It was referenced by 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d. Since that image was wrong, created a new screenshot from the current "past 90 days" at consensus-health.tpo. --- .../source/images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes docs/source/monitoring_bandwidth.rst … [View More]

1 0

[sbws/maint-1.1] Merge branch 'bug_40036_v3' into 'maint-1.1'
by juga＠torproject.org 25 Jan '21

25 Jan '21

commit 38649f0f938bcc4496fd47699cc4f29f78547293 Merge: 6dc6e94 c931dd0 Author: juga <juga(a)riseup.net> Date: Thu Jan 14 10:23:06 2021 +0000 Merge branch 'bug_40036_v3' into 'maint-1.1' fix: doc: Sphinx warnings when creating documentation Closes #40036 See merge request tpo/network-health/sbws!54 AUTHORS.md | 3 ++- README.md | 3 ++- docs/source/conf.py | 2 +- docs/source/torflow_aggr.rst | 2 +- sbws/lib/… [View More]

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 25 Jan '21

25 Jan '21

commit cc0273ec8a3f60d1cde0f3ac1a6e40ce6fb12242 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:16:42 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index e89b5c1c00..919477d249 100644 --- a/es.po +++ b/es.po @@ -8,7 +8,7 @@ # Edward Navarro, 2015 # vareli <ehespinosa(a)ya.com>, 2020 # el buve, 2015 -# … [View More]

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 25 Jan '21

25 Jan '21

commit 49086df09a77a2d90e506ec372892d860fa25ae5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:15:55 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index e65b54561b..43bd28ab01 100644 --- a/es.po +++ b/es.po @@ -8,7 +8,7 @@ # Edward Navarro, 2015 # vareli <ehespinosa(a)ya.com>, 2020 # el buve, 2015 -# Emma … [View More]

1 0