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

[sbws/master] Sleep in hopes that we can avoid tests failing due to missing descs
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 82e7665d1fd337ced3c7dd16cc610ffdbb6a9b3d Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jun 11 09:25:47 2018 -0400 Sleep in hopes that we can avoid tests failing due to missing descs --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 5134fb4..a3af1ef 100644 --- a/tox.ini +++ b/tox.ini @@ -22,10 +22,12 @@ deps = .[test] whitelist_externals = tar bash + sleep commands = tar -C {envtmpdir} -vxf {toxinidir}/tests/integration/net.tar bash {envtmpdir}/net/start.sh bash -c "time python3 {envtmpdir}/net/wait.py {envtmpdir}/net/{auth,relay,exit}*" + sleep 30 coverage run -a --rcfile={toxinidir}/.coveragerc --source=sbws -m pytest -s {toxinidir}/tests/integration -vv bash {envtmpdir}/net/stop.sh

1 0

[sbws/master] Remove some unused code
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 9463b7c4c6b16c3c475759bc477e4414f319d478 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 09:37:56 2018 -0400 Remove some unused code Part of this takes care of... GH: closes #145 --- sbws/lib/relaylist.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 4f7055c..7b3d58a 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -112,11 +112,6 @@ class RelayList: return self._relays_with_flag(Flag.FAST) @property - def slow(self): - ''' Returns relays without the Fast flag ''' - return self._relays_without_flag(Flag.FAST) - - @property def exits(self): return self._relays_with_flag(Flag.EXIT) @@ -125,27 +120,9 @@ class RelayList: return self._relays_with_flag(Flag.GUARD) @property - def hsdirs(self): - return self._relays_with_flag(Flag.HSDIR) - - @property def authorities(self): return self._relays_with_flag(Flag.AUTHORITY) - @property - def unmeasured(self): - ''' SEEMS BROKEN in stem 1.6.0 as it always returns no relays ''' - relays = self.relays - # return [r for r in relays if r.measured is None] - return [r for r in relays if r.is_unmeasured] - - @property - def measured(self): - ''' SEEMS BROKEN in stem 1.6.0 as it always returns all relays ''' - relays = self.relays - # return [r for r in relays if r.measured is not None] - return [r for r in relays if not r.is_unmeasured] - def exits_can_exit_to(self, host, port): ''' Return exits that can MOST LIKELY exit to the given host:port. **host**

1 0

[sbws/master] Fix .join needing only strs; first changelog entry
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 68eb23a4006dadbd96c038c718e2714d91f424c1 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 20:32:09 2018 -0400 Fix .join needing only strs; first changelog entry --- CHANGELOG.md | 19 ++++++++++++++++++- sbws/lib/circuitbuilder.py | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8fba5c..648d149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,18 @@ -This file will be populated once we hit 1.0.0 +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed + +- Exception that causes sbws to fall back to one measurement thread. We first + tried fixing something in this area with `88fae60bc` but neglected to +remember that `.join()` wants only string arguments and can't handle a `None`. +So fix that. + + +[Unreleased]: https://github.com/pastly/simple-bw-scanner/v0.4.0...master diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index 3c6c0fd..33df6ec 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -164,7 +164,7 @@ class GapsCircuitBuilder(CircuitBuilder): insert_relays = self._random_sample_relays( num_missing, [r for r in path if r is not None]) if insert_relays is None: - path = ','.join([r.nickname if r else None for r in path]) + path = ','.join([r.nickname if r else str(None) for r in path]) log.warning( 'Problem building a circuit to satisfy %s with available ' 'relays in the network', path)

1 0

[sbws/master] Make script executable
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 01eaa1f799cb95104797e81024d880a81a790036 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 08:57:35 2018 -0400 Make script executable --- scripts/tools/osx-extra-loopback.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/tools/osx-extra-loopback.sh b/scripts/tools/osx-extra-loopback.sh old mode 100644 new mode 100755

1 0

[sbws/master] Avoid exception when we can't fetch an ed25519_master_key
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 08f6205744d1a5888598c51ee59e4bec2b7987ab Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 21:42:45 2018 -0400 Avoid exception when we can't fetch an ed25519_master_key --- CHANGELOG.md | 2 ++ sbws/lib/relaylist.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918421a..a8f2bd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ the exit position. tried fixing something in this area with `88fae60bc` but neglected to remember that `.join()` wants only string arguments and can't handle a `None`. So fix that. +- Exception when failing to get a relay's `ed25519_master_key` from Tor and + trying to do `.rstrip()` on a None. [Unreleased]: https://github.com/pastly/simple-bw-scanner/compare/v0.4.0...master diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index f1899ca..f87d3d0 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -85,7 +85,10 @@ class Relay: """ # Even if this key is called master-key-ed25519 in dir-spec.txt, # it seems that stem parses it as ed25519_master_key - return self._from_desc('ed25519_master_key').rstrip('=') + key = self._from_desc('ed25519_master_key') + if key is None: + return None + return key.rstrip('=') def can_exit_to(self, host, port): '''

1 0

[sbws/master] Bump to 0.4.1-dev
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 6988eee3c7497bebcaae5d2b0b6efed84a32de81 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 10:09:36 2018 -0400 Bump to 0.4.1-dev --- sbws/__init__.py | 2 +- tests/unit/lib/data/v3bw.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/__init__.py b/sbws/__init__.py index abeeedb..cb2db29 100644 --- a/sbws/__init__.py +++ b/sbws/__init__.py @@ -1 +1 @@ -__version__ = '0.4.0' +__version__ = '0.4.1-dev' diff --git a/tests/unit/lib/data/v3bw.txt b/tests/unit/lib/data/v3bw.txt index b63b98c..4252137 100644 --- a/tests/unit/lib/data/v3bw.txt +++ b/tests/unit/lib/data/v3bw.txt @@ -5,6 +5,6 @@ file_created=2018-04-25T13:10:57 generator_started=2018-04-16T14:09:05 latest_bandwidth=2018-04-17T14:09:07 software=sbws -software_version=0.4.0 +software_version=0.4.1-dev ==== 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] Comment out a debug log line
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 26612221646922f51bd24a595b1a15b55c18cf3f Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 21:11:44 2018 -0400 Comment out a debug log line --- sbws/lib/v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 4091912..bf5832c 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -331,7 +331,7 @@ class V3BWLine(object): @classmethod def from_results(cls, results): success_results = [r for r in results if isinstance(r, ResultSuccess)] - log.debug('len(success_results) %s', len(success_results)) + # log.debug('len(success_results) %s', len(success_results)) node_id = results[0].fingerprint bw = cls.bw_from_results(success_results) kwargs = dict()

1 0

[sbws/master] Merge remote-tracking branch 'juga/v3bwfile_fix_earliest'
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit c3eb08e93e228ef3a25c853f0d47b0cad6cf04de Merge: 08f6205 d548abe Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jun 13 06:08:30 2018 -0400 Merge remote-tracking branch 'juga/v3bwfile_fix_earliest' sbws/lib/v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[sbws/master] Fix earliest bandwidth from results
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit d548abe8e48f05db86e2c356d0babfbedc23bac1 Author: juga0 <juga(a)riseup.net> Date: Wed Jun 13 06:12:41 2018 +0000 Fix earliest bandwidth from results by mistake from_results was calling latest_bandwidth instead of earliest_bandwidth --- sbws/lib/v3bwfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 4091912..71c9755 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -223,7 +223,7 @@ class V3BwHeader(object): def from_results(cls, conf, results): kwargs = dict() latest_bandwidth = cls.latest_bandwidth_from_results(results) - earliest_bandwidth = cls.latest_bandwidth_from_results(results) + earliest_bandwidth = cls.earliest_bandwidth_from_results(results) generator_started = cls.generator_started_from_file(conf) timestamp = str(latest_bandwidth) kwargs['latest_bandwidth'] = unixts_to_isodt_str(latest_bandwidth)

1 0

[sbws/master] Add changelog to docs, add info about it in contributing
by pastly＠torproject.org 14 Jun '18

14 Jun '18

commit 4851d077ef66fc78f2e8e77dab2deb7bfb3d5bda Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 12 21:37:53 2018 -0400 Add changelog to docs, add info about it in contributing --- CONTRIBUTING.rst | 11 +++++++++++ docs/source/CHANGELOG.md | 1 + docs/source/index.rst | 1 + 3 files changed, 13 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 683b5cb..31d0324 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -52,6 +52,15 @@ approxmiately all sbws configuration options and can be changed with an sbws update. The latter is used as a starting point for generating a client's ``config.ini`` and changes to it only affect newly generated config files. +**Document your addition, fix, change, or whatever in the changelog**. See +`keep a changelog`_ for the standard we follow. Of note, add Added, Changed, +Deprecated, Removed, Fixed, and Security headings as needed in the Unreleased +section. **If your change has a trac or GitHub ticket, reference it** like +``(GH#123)`` or ``(trac#22104)``. When it comes time to do a release, the +person doing the release should (1) change the name of the Unreleased section +and add a new one, and (2) update the links at the bottom. + + .. _commit-msg: Example commit message @@ -89,3 +98,5 @@ With thanks to `Tim Pope`_: .. _pull request: https://github.com/pastly/simple-bw-scanner/compare .. _tim pope: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html + +.. _`keep a changelog`: https://keepachangelog.com/en/1.0.0/ diff --git a/docs/source/CHANGELOG.md b/docs/source/CHANGELOG.md new file mode 120000 index 0000000..699cc9e --- /dev/null +++ b/docs/source/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/docs/source/index.rst b/docs/source/index.rst index e1942d0..ec605db 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -18,6 +18,7 @@ Contents INSTALL DEPLOY README + CHANGELOG CONTRIBUTING AUTHORS LICENSE

1 0