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

[bridgedb/master] Merge branch 'master' into develop
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 5ca53926d4bf32fe2cdd2ae3f2dba9e7a6f91b4e Merge: ac7df7f 8a74291 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 21 18:59:51 2018 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Change maintainer and CI references
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 38c025ab495347956b1d3a74c1f7e3504f823159 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 22:24:51 2018 +0000 Change maintainer and CI references Isis, thanks for everything. * FIXES #28528 https://trac.torproject.org/28528 --- .travis.yml | 1 - AUTHORS | 2 +- README.rst | 11 ++++++----- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9fb68f3..c474963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ notifications: on_failure: always email: recipients: - - isis(a)torproject.org - sysrqb(a)torproject.org on_success: never on_failure: change diff --git a/AUTHORS b/AUTHORS index 4995534..e8b068b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,8 @@ Current core developers: - Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2 Past core developers: + Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 Nick Mathewson <nickm(a)torproject.org> 0x21194EBB165733EA Aaron Gibson <aagbsn(a)torproject.org> 0x2C4B239DD876C9F6 Christian Fromme <kaner(a)torproject.org> 0xA922CB73CC0960D0 diff --git a/README.rst b/README.rst index b234d01..feb5227 100644 --- a/README.rst +++ b/README.rst @@ -9,10 +9,11 @@ a webserver with `an HTTPS interface <https://bridges.torproject.org>`__, .. |Latest Version| image:: https://pypip.in/version/bridgedb/badge.svg?style=flat :target: https://pypi.python.org/pypi/bridgedb/ -.. |Build Status| image:: https://travis-ci.org/isislovecruft/bridgedb.svg - :target: https://travis-ci.org/isislovecruft/bridgedb -.. |Coverage Status| image:: https://coveralls.io/repos/isislovecruft/bridgedb/badge.png?branch=develop - :target: https://coveralls.io/r/isislovecruft/bridgedb?branch=develop +.. |Build Status| image:: https://travis-ci.org/sysrqbci/bridgedb.svg + :target: https://travis-ci.org/sysrqbci/bridgedb +.. |Coverage Status| image:: https://coveralls.io/repos/github/sysrqbci/bridgedb/badge.svg?branch=develop + :target: https://coveralls.io/github/sysrqbci/bridgedb?branch=develop + .. image:: doc/sphinx/source/_static/bay-bridge.jpg @@ -590,4 +591,4 @@ Contact & Support Send your questions, patches, and suggestions to `the tor-dev mailing list <mailto:tor-dev@lists.torproject.org>`__ -or `isis <mailto:isis@torproject.org>`__. +or `sysrqb <mailto:sysrqb@torproject.org>`__. diff --git a/setup.py b/setup.py index 1139a65..a31391c 100644 --- a/setup.py +++ b/setup.py @@ -369,8 +369,8 @@ setuptools.setup( description='Backend systems for distribution of Tor bridge relays', author='Nick Mathewson', author_email='nickm at torproject dot org', - maintainer='Isis Agora Lovecruft', - maintainer_email='isis(a)torproject.org 0xA3ADB67A2CDB8B35', + maintainer='Matthew Finkel', + maintainer_email='sysrqb(a)torproject.org 0xCB8FC772D1AA1D30', url='https://www.torproject.org', download_url='https://gitweb.torproject.org/bridgedb.git', package_dir={'bridgedb': 'bridgedb'},

1 0

[bridgedb/master] Change contact email address
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 280599e1836610e052be84d7d7ab16e50c091a3f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 21:35:21 2018 +0000 Change contact email address * FIXES #23894 https://bugs.torproject.org/23894 --- bridgedb/strings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/strings.py b/bridgedb/strings.py index 1c40695..49bb933 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -271,7 +271,7 @@ EMAIL_SPRINTF = { # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]`` "HOWTO_TBB1": ("", "[0]"), # For the "you should email %s" in ``HELP[0]`` - "HELP0": ("help(a)rt.torproject.org"), + "HELP0": ("frontdesk(a)torproject.org"), } """``EMAIL_SPRINTF`` is a dictionary that maps translated strings which contain format specifiers (i.e. ``%s``) to what those format specifiers should

1 0

[bridgedb/master] Merge branch '28528' into develop
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 21e9bb195915957baa088838c2f9c46cae7fb53e Merge: 5ca5392 38c025a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 22:54:29 2018 +0000 Merge branch '28528' into develop .travis.yml | 1 - AUTHORS | 2 +- README.rst | 11 ++++++----- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)

1 0

[bridgedb/develop] Change contact email address
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 280599e1836610e052be84d7d7ab16e50c091a3f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 21:35:21 2018 +0000 Change contact email address * FIXES #23894 https://bugs.torproject.org/23894 --- bridgedb/strings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/strings.py b/bridgedb/strings.py index 1c40695..49bb933 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -271,7 +271,7 @@ EMAIL_SPRINTF = { # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]`` "HOWTO_TBB1": ("", "[0]"), # For the "you should email %s" in ``HELP[0]`` - "HELP0": ("help(a)rt.torproject.org"), + "HELP0": ("frontdesk(a)torproject.org"), } """``EMAIL_SPRINTF`` is a dictionary that maps translated strings which contain format specifiers (i.e. ``%s``) to what those format specifiers should

1 0

[bridgedb/develop] Merge branch '28528' into develop
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 21e9bb195915957baa088838c2f9c46cae7fb53e Merge: 5ca5392 38c025a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 22:54:29 2018 +0000 Merge branch '28528' into develop .travis.yml | 1 - AUTHORS | 2 +- README.rst | 11 ++++++----- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)

1 0

[bridgedb/develop] Merge branch 'bug23894' into develop
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 09de26c244f31a7029825b402b70d3a316af1604 Merge: 21e9bb1 280599e Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 22:54:37 2018 +0000 Merge branch 'bug23894' into develop bridgedb/strings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/develop] Change maintainer and CI references
by sysrqb＠torproject.org 19 Nov '18

19 Nov '18

commit 38c025ab495347956b1d3a74c1f7e3504f823159 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 22:24:51 2018 +0000 Change maintainer and CI references Isis, thanks for everything. * FIXES #28528 https://trac.torproject.org/28528 --- .travis.yml | 1 - AUTHORS | 2 +- README.rst | 11 ++++++----- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9fb68f3..c474963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ notifications: on_failure: always email: recipients: - - isis(a)torproject.org - sysrqb(a)torproject.org on_success: never on_failure: change diff --git a/AUTHORS b/AUTHORS index 4995534..e8b068b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,8 @@ Current core developers: - Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2 Past core developers: + Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 Nick Mathewson <nickm(a)torproject.org> 0x21194EBB165733EA Aaron Gibson <aagbsn(a)torproject.org> 0x2C4B239DD876C9F6 Christian Fromme <kaner(a)torproject.org> 0xA922CB73CC0960D0 diff --git a/README.rst b/README.rst index b234d01..feb5227 100644 --- a/README.rst +++ b/README.rst @@ -9,10 +9,11 @@ a webserver with `an HTTPS interface <https://bridges.torproject.org>`__, .. |Latest Version| image:: https://pypip.in/version/bridgedb/badge.svg?style=flat :target: https://pypi.python.org/pypi/bridgedb/ -.. |Build Status| image:: https://travis-ci.org/isislovecruft/bridgedb.svg - :target: https://travis-ci.org/isislovecruft/bridgedb -.. |Coverage Status| image:: https://coveralls.io/repos/isislovecruft/bridgedb/badge.png?branch=develop - :target: https://coveralls.io/r/isislovecruft/bridgedb?branch=develop +.. |Build Status| image:: https://travis-ci.org/sysrqbci/bridgedb.svg + :target: https://travis-ci.org/sysrqbci/bridgedb +.. |Coverage Status| image:: https://coveralls.io/repos/github/sysrqbci/bridgedb/badge.svg?branch=develop + :target: https://coveralls.io/github/sysrqbci/bridgedb?branch=develop + .. image:: doc/sphinx/source/_static/bay-bridge.jpg @@ -590,4 +591,4 @@ Contact & Support Send your questions, patches, and suggestions to `the tor-dev mailing list <mailto:tor-dev@lists.torproject.org>`__ -or `isis <mailto:isis@torproject.org>`__. +or `sysrqb <mailto:sysrqb@torproject.org>`__. diff --git a/setup.py b/setup.py index 1139a65..a31391c 100644 --- a/setup.py +++ b/setup.py @@ -369,8 +369,8 @@ setuptools.setup( description='Backend systems for distribution of Tor bridge relays', author='Nick Mathewson', author_email='nickm at torproject dot org', - maintainer='Isis Agora Lovecruft', - maintainer_email='isis(a)torproject.org 0xA3ADB67A2CDB8B35', + maintainer='Matthew Finkel', + maintainer_email='sysrqb(a)torproject.org 0xCB8FC772D1AA1D30', url='https://www.torproject.org', download_url='https://gitweb.torproject.org/bridgedb.git', package_dir={'bridgedb': 'bridgedb'},

1 0

[stem/master] Parse 'bandwidth-file-digest' lines from votes
by atagar＠torproject.org 19 Nov '18

19 Nov '18

commit e810cc093a6469e26fe57789f064cb627f017e64 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 19 10:43:00 2018 -0800 Parse 'bandwidth-file-digest' lines from votes Parsing of a newly added field... https://gitweb.torproject.org/torspec.git/commit/?id=1b686ef --- docs/change_log.rst | 3 ++- stem/descriptor/networkstatus.py | 21 +++++++++++++++++++ test/unit/descriptor/networkstatus/document_v3.py | 25 +++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 0c427784..2fb3ae7e 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -53,6 +53,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.descriptor.Descriptor.type_annotation` method (:trac:`28397`) * Added the **hash_type** and **encoding** arguments to `ServerDescriptor <api/descriptor/server_descriptor.html#stem.descriptor.server_descriptor.ServerDescriptor.digest>`_ and `ExtraInfo's <api/descriptor/extrainfo_descriptor.html#stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest>`_ digest methods (:trac:`28398`) + * Added the network status vote's new bandwidth_file_digest attribute (:spec:`1b686ef`) * Added :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods (:trac:`28448`) * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`) * Don't download from Serge, a bridge authority that frequently timeout @@ -102,7 +103,7 @@ and the `stem.directory module <api/directory.html>`_. * `Fallback directory v2 support <https://lists.torproject.org/pipermail/tor-dev/2017-December/012721.html>`_, which adds *nickname* and *extrainfo* * Added the *orport_v6* attribute to the :class:`~stem.directory.Authority` class * Added server descriptor's new is_hidden_service_dir attribute - * Added the network status vote's new bandwidth_file attribute (:spec:`84591df`) + * Added the network status vote's new bandwidth_file_headers attribute (:spec:`84591df`) * Added the microdescriptor router status entry's new or_addresses attribute (:trac:`26405`, :spec:`fdc8f3e8`) * Don't retry downloading descriptors when we've timed out * Don't download from tor26, an authority that frequently timeout diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 6c14097f..bc34f5b4 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -135,6 +135,7 @@ HEADER_STATUS_DOCUMENT_FIELDS = ( ('shared-rand-previous-value', True, True, False), ('shared-rand-current-value', True, True, False), ('bandwidth-file-headers', True, False, False), + ('bandwidth-file-digest', True, False, False), ('recommended-client-protocols', True, True, False), ('recommended-relay-protocols', True, True, False), ('required-client-protocols', True, True, False), @@ -796,6 +797,18 @@ def _parse_bandwidth_file_headers(descriptor, entries): descriptor.bandwidth_file_headers = results +def _parse_bandwidth_file_digest(descriptor, entries): + # "bandwidth-file-digest" 1*(SP algorithm "=" digest) + + value = _value('bandwidth-file-digest', entries) + results = {} + + for key, val in _mappings_for('bandwidth-file-digest', value): + results[key] = val + + descriptor.bandwidth_file_digest = results + + _parse_header_valid_after_line = _parse_timestamp_line('valid-after', 'valid_after') _parse_header_fresh_until_line = _parse_timestamp_line('fresh-until', 'fresh_until') _parse_header_valid_until_line = _parse_timestamp_line('valid-until', 'valid_until') @@ -867,6 +880,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var dict required_relay_protocols: required protocols for relays :var dict bandwidth_file_headers: headers from the bandwidth authority that generated this vote + :var dict bandwidth_file_digest: hashes of the bandwidth authority file used + to generate this vote, this is a mapping of hash functions to their resulting + digest value **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined @@ -898,6 +914,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): .. versionchanged:: 1.7.0 Added the bandwidth_file_headers attributbute. + + .. versionchanged:: 1.8.0 + Added the bandwidth_file_digest attributbute. """ ATTRIBUTES = { @@ -929,6 +948,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared_randomness_current_reveal_count': (None, _parse_shared_rand_current_value), 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), 'bandwidth_file_headers': ({}, _parse_bandwidth_file_headers), + 'bandwidth_file_digest': ({}, _parse_bandwidth_file_digest), 'signatures': ([], _parse_footer_directory_signature_line), 'bandwidth_weights': ({}, _parse_footer_bandwidth_weights_line), @@ -957,6 +977,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'shared-rand-previous-value': _parse_shared_rand_previous_value, 'shared-rand-current-value': _parse_shared_rand_current_value, 'bandwidth-file-headers': _parse_bandwidth_file_headers, + 'bandwidth-file-digest': _parse_bandwidth_file_digest, } FOOTER_PARSER_FOR_LINE = { diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index a9e5f35b..92100141 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -1312,6 +1312,31 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= document = NetworkStatusDocumentV3(content, False) self.assertEqual({}, document.bandwidth_file_headers) + def test_bandwidth_file_digest(self): + """ + Parses a 'bandwidth-file-digest' line of votes. + """ + + test_values = { + '': {}, + 'sha1=': {'sha1': ''}, + 'sha1=abc=def': {'sha1': 'abc=def'}, + 'sha1=123': {'sha1': '123'}, + 'sha1=123 sha256=456': {'sha1': '123', 'sha256': '456'}, + } + + for test_value, expected_value in test_values.items(): + document = NetworkStatusDocumentV3.create({'vote-status': 'vote', 'bandwidth-file-digest': test_value}) + self.assertEqual(expected_value, document.bandwidth_file_digest) + + # field must be key=value mappings + + content = NetworkStatusDocumentV3.content({'vote-status': 'vote', 'bandwidth-file-digest': 'key_without_value'}) + self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) + + document = NetworkStatusDocumentV3(content, False) + self.assertEqual({}, document.bandwidth_file_digest) + def test_with_legacy_directory_authorities(self): """ Includes both normal authorities and those following the '-legacy' format.

1 0

[torspec/master] dir-spec: add bandwidth-file item to the vote
by nickm＠torproject.org 19 Nov '18

19 Nov '18

commit 1b686efc101cffb95cec4d75a954c0f6fd7a105e Author: juga0 <juga(a)riseup.net> Date: Thu Nov 8 10:12:41 2018 +0000 dir-spec: add bandwidth-file item to the vote --- dir-spec.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 8da28c4..3058180 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2125,6 +2125,24 @@ to read. First-appeared: Tor 0.3.5.1-alpha. + "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL + + [At most once for votes; does not occur in consensuses.] + + A digest of the bandwidth file used to generate this vote. + "algorithm" is the name of the hash algorithm producing "digest", + which can be "sha256" or another algorithm. "digest" is the + base64 encoding of the hash of the bandwidth file, with trailing =s + omitted. + + If an authority is not configured with a V3BandwidthsFile, this line + SHOULD NOT appear in its vote. + + If an authority is configured with a V3BandwidthsFile, but parsing + fails, this line SHOULD appear in its vote, with the digest(s) of the + unparseable file. + First-appeared: Tor 0.4.0.1-alpha + The authority section of a vote contains the following items, followed in turn by the authority's current key certificate:

1 0