August 2015 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Aug '15

25 Aug '15

commit b74912b912cb0de7b10b239b856fa3bea9c64125 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 25 05:15:19 2015 +0000 Update translations for liveusb-creator --- sv/sv.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index a4d08db..e74bdae 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anders Nilsson <locally(a)devode.se>, 2015 # cryptohead <cryptohead(a)gmail.com>, 2013 # Foorack <maxfaxalv(a)gmail.com>, 2015 # GabSeb, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-04 10:45+0200\n" -"PO-Revision-Date: 2015-08-05 08:28+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2015-08-10 16:01+0200\n" +"PO-Revision-Date: 2015-08-25 05:14+0000\n" +"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,11 +27,11 @@ msgstr "" #: ../liveusb/gui.py:451 msgid "\"Clone & Install\"" -msgstr "" +msgstr "\"Klona & Installera\"" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\"" -msgstr "" +msgstr "\"Installera från ISO\"" #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Aug '15

25 Aug '15

commit bb7a501019b5bdd8208b750724bae65704548441 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 22:15:26 2015 +0000 Update translations for liveusb-creator --- ro/ro.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 24940b3..5bf7fe7 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# axel_89 <axel_rap(a)yahoo.com>, 2015 # icet208 <icet208(a)yahoo.com>, 2014 # Isus Satanescu <isus(a)openmailbox.org>, 2014 # Isus Satanescu <isus(a)openmailbox.org>, 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-04 10:45+0200\n" -"PO-Revision-Date: 2015-08-05 08:28+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2015-08-10 16:01+0200\n" +"PO-Revision-Date: 2015-08-24 22:04+0000\n" +"Last-Translator: axel_89 <axel_rap(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\"" -msgstr "" +msgstr "Instaleaza din ISO" #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 24 Aug '15

24 Aug '15

commit f028849d5163dc645b96bdf2315242d1a5d372a3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 20:45:36 2015 +0000 Update translations for mat-gui_completed --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index e887b3a..33eae2e 100644 --- a/da.po +++ b/da.po @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+0000\n" +"PO-Revision-Date: 2015-08-24 20:18+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" +"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 24 Aug '15

24 Aug '15

commit dbd5df5209ffe0cab06d99fe1b0d9c6c6bb337b2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 24 20:45:30 2015 +0000 Update translations for mat-gui --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index e887b3a..33eae2e 100644 --- a/da.po +++ b/da.po @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+0000\n" +"PO-Revision-Date: 2015-08-24 20:18+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" +"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[stem/master] Bridge extrainfo support for ed25519
by atagar＠torproject.org 24 Aug '15

24 Aug '15

commit 4a504c8922ff66cf414538f4e5cbd84c504ebcce Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 24 09:43:05 2015 -0700 Bridge extrainfo support for ed25519 Accounting for bridge extrainfo descriptor parsing of ed25519. It replaces the two new fields with a couple different ones. Need clarification on the second though. --- stem/descriptor/extrainfo_descriptor.py | 32 +++++++++++++------- .../data/bridge_extrainfo_descriptor_with_ed25519 | 25 +++++++++++++++ test/unit/descriptor/extrainfo_descriptor.py | 17 ++++++++++- 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 7373620..5b986b4 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -535,6 +535,7 @@ def _parse_hs_stats(keyword, stat_attribute, extra_attribute, descriptor, entrie _parse_identity_ed25519_line = _parse_key_block('identity-ed25519', 'ed25519_certificate', 'ED25519 CERT') +_parse_master_key_ed25519_line = _parse_simple_line('master-key-ed25519', 'ed25519_certificate_hash') _parse_geoip_db_digest_line = _parse_forty_character_hex('geoip-db-digest', 'geoip_db_digest') _parse_geoip6_db_digest_line = _parse_forty_character_hex('geoip6-db-digest', 'geoip6_db_digest') _parse_dirreq_v2_resp_line = functools.partial(_parse_dirreq_line, 'dirreq-v2-resp', 'dir_v2_responses', 'dir_v2_responses_unknown') @@ -573,6 +574,7 @@ _parse_geoip_client_origins_line = functools.partial(_parse_geoip_to_count_line, _parse_entry_ips_line = functools.partial(_parse_geoip_to_count_line, 'entry-ips', 'entry_ips') _parse_bridge_ips_line = functools.partial(_parse_geoip_to_count_line, 'bridge-ips', 'bridge_ips') _parse_router_sig_ed25519_line = _parse_simple_line('router-sig-ed25519', 'ed25519_signature') +_parse_router_digest_sha256_line = _parse_simple_line('router-digest-sha256', 'router_digest_sha256') _parse_router_digest_line = _parse_forty_character_hex('router-digest', '_digest') _parse_router_signature_line = _parse_key_block('router-signature', 'signature', 'SIGNATURE') @@ -590,9 +592,6 @@ class ExtraInfoDescriptor(Descriptor): port, args) tuple, these usually appear on bridges in which case all of those are **None** - :var ed25519_certificate str: base64 encoded ed25519 certificate - :var ed25519_signature str: signature of this document using ed25519 - **Bi-directional connection usage:** :var datetime conn_bi_direct_end: end of the sampling interval @@ -695,9 +694,6 @@ class ExtraInfoDescriptor(Descriptor): .. versionchanged:: 1.4.0 Added the hs_stats_end, hs_rend_cells, hs_rend_cells_attr, hs_dir_onions_seen, and hs_dir_onions_seen_attr attributes. - - .. versionchanged:: 1.5.0 - Added the ed25519_certificate and ed25519_signature attributes. """ ATTRIBUTES = { @@ -708,9 +704,6 @@ class ExtraInfoDescriptor(Descriptor): 'geoip6_db_digest': (None, _parse_geoip6_db_digest_line), 'transport': ({}, _parse_transport_line), - 'ed25519_certificate': (None, _parse_identity_ed25519_line), - 'ed25519_signature': (None, _parse_router_sig_ed25519_line), - 'conn_bi_direct_end': (None, _parse_conn_bi_direct_line), 'conn_bi_direct_interval': (None, _parse_conn_bi_direct_line), 'conn_bi_direct_below': (None, _parse_conn_bi_direct_line), @@ -790,8 +783,6 @@ class ExtraInfoDescriptor(Descriptor): PARSER_FOR_LINE = { 'extra-info': _parse_extra_info_line, - 'identity-ed25519': _parse_identity_ed25519_line, - 'router-sig-ed25519': _parse_router_sig_ed25519_line, 'geoip-db-digest': _parse_geoip_db_digest_line, 'geoip6-db-digest': _parse_geoip6_db_digest_line, 'transport': _parse_transport_line, @@ -900,16 +891,25 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): 'GETINFO extra-info/digest/\*', cached descriptors, and metrics (`specification <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_). + :var ed25519_certificate str: base64 encoded ed25519 certificate + :var ed25519_signature str: signature of this document using ed25519 :var str signature: **\*** signature for this extrainfo descriptor **\*** attribute is required when we're parsed with validation + + .. versionchanged:: 1.5.0 + Added the ed25519_certificate and ed25519_signature attributes. """ ATTRIBUTES = dict(ExtraInfoDescriptor.ATTRIBUTES, **{ + 'ed25519_certificate': (None, _parse_identity_ed25519_line), + 'ed25519_signature': (None, _parse_router_sig_ed25519_line), 'signature': (None, _parse_router_signature_line), }) PARSER_FOR_LINE = dict(ExtraInfoDescriptor.PARSER_FOR_LINE, **{ + 'identity-ed25519': _parse_identity_ed25519_line, + 'router-sig-ed25519': _parse_router_sig_ed25519_line, 'router-signature': _parse_router_signature_line, }) @@ -925,13 +925,23 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`bridge descriptor specification <https://collector.torproject.org/formats.html#bridge-descriptors>`_) + + :var str ed25519_certificate_hash: sha256 hash of the original identity-ed25519 + :var str router_digest_sha256: **todo**, needs clarification + + .. versionchanged:: 1.5.0 + Added the ed25519_certificate_hash and router_digest_sha256 attributes. """ ATTRIBUTES = dict(ExtraInfoDescriptor.ATTRIBUTES, **{ + 'ed25519_certificate_hash': (None, _parse_master_key_ed25519_line), + 'router_digest_sha256': (None, _parse_router_digest_sha256_line), '_digest': (None, _parse_router_digest_line), }) PARSER_FOR_LINE = dict(ExtraInfoDescriptor.PARSER_FOR_LINE, **{ + 'master-key-ed25519': _parse_master_key_ed25519_line, + 'router-digest-sha256': _parse_router_digest_sha256_line, 'router-digest': _parse_router_digest_line, }) diff --git a/test/unit/descriptor/data/bridge_extrainfo_descriptor_with_ed25519 b/test/unit/descriptor/data/bridge_extrainfo_descriptor_with_ed25519 new file mode 100644 index 0000000..0030c45 --- /dev/null +++ b/test/unit/descriptor/data/bridge_extrainfo_descriptor_with_ed25519 @@ -0,0 +1,25 @@ +@type bridge-extra-info 1.3 +extra-info Unnamed B8AB331047F1C1637EFE07FB1B94CCC0FE0ABFFA +master-key-ed25519 VigmhxML9uw8CT1XeGqZ8KLMhKk6AOKnChQt24usBbI +published 2015-08-21 16:08:15 +write-history 2015-08-21 12:51:16 (14400 s) 2371584,40206336,45142016,8745984,6049792,1072128 +read-history 2015-08-21 12:51:16 (14400 s) 5175296,43838464,50509824,13580288,8732672,4001792 +dirreq-write-history 2015-08-21 12:51:16 (14400 s) 1630208,565248,29696,28672,1993728,581632 +dirreq-read-history 2015-08-21 12:51:16 (14400 s) 1024,3072,5120,4096,285696,11264 +geoip-db-digest 6882B8663F74C23E26E3C2274C24CAB2E82D67A2 +geoip6-db-digest F063BD5247EB9829E6B9E586393D7036656DAF44 +dirreq-stats-end 2015-08-21 12:51:16 (86400 s) +dirreq-v3-ips ie=8,in=8,kz=8,nl=8,qa=8 +dirreq-v3-reqs ie=8,in=8,kz=8,nl=8,qa=8 +dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=4,timeout=4,running=0 +transport scramblesuit +transport obfs3 +transport obfs4 +bridge-stats-end 2015-08-21 12:51:21 (86400 s) +bridge-ips ie=8,in=8,kz=8,nl=8,qa=8 +bridge-ip-versions v4=8,v6=0 +bridge-ip-transports <OR>=8,obfs3=8,obfs4=8 +router-digest-sha256 7DSOQz9eGgjDX6GT7qcrVViK8yqJD4aoEnuhdAgYtgA +router-digest 3DBE6840376F3EC277002396832788DB2FB38393 diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index b4bc34f..fa68e62 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -143,7 +143,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw """ with open(get_resource('extrainfo_descriptor_with_ed25519'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'extra-info 1.0', validate = True)) + desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)) self.assertEqual('silverfoxden', desc.nickname) self.assertEqual('4970B1DC3DBC8D82D7F1E43FF44B28DBF4765A4E', desc.fingerprint) @@ -151,6 +151,21 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual('g6Zg7Er8K7C1etmt7p20INE1ExIvMRPvhwt6sjbLqEK+EtQq8hT+86hQ1xu7cnz6bHee+Zhhmcc4JamV4eiMAw', desc.ed25519_signature) self.assertEqual([], desc.get_unrecognized_lines()) + def test_bridge_with_ed25519(self): + """ + Parses a bridge descriptor with a ed25519 identity key. + """ + + with open(get_resource('bridge_extrainfo_descriptor_with_ed25519'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)) + + self.assertEqual('Unnamed', desc.nickname) + self.assertEqual('B8AB331047F1C1637EFE07FB1B94CCC0FE0ABFFA', desc.fingerprint) + self.assertFalse(hasattr(desc, 'ed25519_certificate')) + self.assertEqual('VigmhxML9uw8CT1XeGqZ8KLMhKk6AOKnChQt24usBbI', desc.ed25519_certificate_hash) + self.assertEqual('7DSOQz9eGgjDX6GT7qcrVViK8yqJD4aoEnuhdAgYtgA', desc.router_digest_sha256) + self.assertEqual([], desc.get_unrecognized_lines()) + def test_minimal_extrainfo_descriptor(self): """ Basic sanity check that we can parse an extrainfo descriptor with minimal

1 0

[stem/master] Bridge server support for ed25519
by atagar＠torproject.org 24 Aug '15

24 Aug '15

commit 00c4999a5b0f22e4db7c7b3a3b81978495ad5aff Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 24 10:02:18 2015 -0700 Bridge server support for ed25519 Accounting for bridge server descriptor parsing of ed25519. Like the extrainfo descriptors it changes the fields and need clarification on one. Also discovered while doing this that bridge descriptors have ntor-onion-key - didn't expect that. --- stem/descriptor/server_descriptor.py | 75 ++++++++++++-------- .../descriptor/data/bridge_descriptor_with_ed25519 | 17 +++++ test/unit/descriptor/server_descriptor.py | 24 ++++++- 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 872806b..5632140 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -389,6 +389,7 @@ def _parse_exit_policy(descriptor, entries): _parse_identity_ed25519_line = _parse_key_block('identity-ed25519', 'ed25519_certificate', 'ED25519 CERT') _parse_master_key_ed25519_line = _parse_simple_line('master-key-ed25519', 'ed25519_master_key') +_parse_master_key_ed25519_for_hash_line = _parse_simple_line('master-key-ed25519', 'ed25519_certificate_hash') _parse_contact_line = _parse_bytes_line('contact', 'contact') _parse_published_line = _parse_timestamp_line('published', 'published') _parse_read_history_line = functools.partial(_parse_history_line, 'read-history', 'read_history_end', 'read_history_interval', 'read_history_values') @@ -405,6 +406,7 @@ _parse_router_signature_line = _parse_key_block('router-signature', 'signature', _parse_ntor_onion_key_line = _parse_simple_line('ntor-onion-key', 'ntor_onion_key') _parse_ntor_onion_key_crosscert_line = _parse_key_block('ntor-onion-key-crosscert', 'ntor_onion_key_crosscert', 'ED25519 CERT', 'ntor_onion_key_crosscert_sign') _parse_router_sig_ed25519_line = _parse_simple_line('router-sig-ed25519', 'ed25519_signature') +_parse_router_digest_sha256_line = _parse_simple_line('router-digest-sha256', 'router_digest_sha256') _parse_router_digest_line = _parse_forty_character_hex('router-digest', '_digest') @@ -421,10 +423,6 @@ class ServerDescriptor(Descriptor): :var int socks_port: **\*** port used as client (deprecated, always **None**) :var int dir_port: **\*** port used for descriptor mirroring - :var ed25519_certificate str: base64 encoded ed25519 certificate - :var ed25519_master_key str: base64 encoded master key for our ed25519 certificate - :var ed25519_signature str: signature of this document using ed25519 - :var bytes platform: line with operating system and tor version :var stem.version.Version tor_version: version of tor :var str operating_system: operating system @@ -448,9 +446,6 @@ class ServerDescriptor(Descriptor): :var list or_addresses: **\*** alternative for our address/or_port attributes, each entry is a tuple of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) - :var str onion_key_crosscert: signature generated using the onion_key - :var str ntor_onion_key_crosscert: signature generated using the ntor-onion-key - :var str ntor_onion_key_crosscert_sign: sign of the corresponding ed25519 public key Deprecated, moved to extra-info descriptor... @@ -464,11 +459,6 @@ class ServerDescriptor(Descriptor): **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined - - .. versionchanged:: 1.5.0 - Added the ed25519_certificate, ed25519_master_key, ed25519_signature, - onion_key_crosscert, ntor_onion_key_crosscert, and - ntor_onion_key_crosscert_sign attributes. """ ATTRIBUTES = { @@ -483,10 +473,6 @@ class ServerDescriptor(Descriptor): 'socks_port': (None, _parse_router_line), 'dir_port': (None, _parse_router_line), - 'ed25519_certificate': (None, _parse_identity_ed25519_line), - 'ed25519_master_key': (None, _parse_master_key_ed25519_line), - 'ed25519_signature': (None, _parse_router_sig_ed25519_line), - 'platform': (None, _parse_platform_line), 'tor_version': (None, _parse_platform_line), 'operating_system': (None, _parse_platform_line), @@ -507,9 +493,6 @@ class ServerDescriptor(Descriptor): 'hidden_service_dir': (None, _parse_hidden_service_dir_line), 'eventdns': (None, _parse_eventdns_line), 'or_addresses': ([], _parse_or_address_line), - 'onion_key_crosscert': (None, _parse_onion_key_crosscert_line), - 'ntor_onion_key_crosscert': (None, _parse_ntor_onion_key_crosscert_line), - 'ntor_onion_key_crosscert_sign': (None, _parse_ntor_onion_key_crosscert_line), 'read_history_end': (None, _parse_read_history_line), 'read_history_interval': (None, _parse_read_history_line), @@ -522,9 +505,6 @@ class ServerDescriptor(Descriptor): PARSER_FOR_LINE = { 'router': _parse_router_line, - 'identity-ed25519': _parse_identity_ed25519_line, - 'master-key-ed25519': _parse_master_key_ed25519_line, - 'router-sig-ed25519': _parse_router_sig_ed25519_line, 'bandwidth': _parse_bandwidth_line, 'platform': _parse_platform_line, 'published': _parse_published_line, @@ -536,8 +516,6 @@ class ServerDescriptor(Descriptor): 'uptime': _parse_uptime_line, 'protocols': _parse_protocols_line, 'or-address': _parse_or_address_line, - 'onion-key-crosscert': _parse_onion_key_crosscert_line, - 'ntor-onion-key-crosscert': _parse_ntor_onion_key_crosscert_line, 'read-history': _parse_read_history_line, 'write-history': _parse_write_history_line, 'ipv6-policy': _parse_ipv6_policy_line, @@ -670,12 +648,6 @@ class ServerDescriptor(Descriptor): if not self.exit_policy: raise ValueError("Descriptor must have at least one 'accept' or 'reject' entry") - if self.ed25519_certificate: - if not self.onion_key_crosscert: - raise ValueError("Descriptor must have a 'onion-key-crosscert' when identity-ed25519 is present") - elif not self.ed25519_signature: - raise ValueError("Descriptor must have a 'router-sig-ed25519' when identity-ed25519 is present") - # Constraints that the descriptor must meet to be valid. These can be None if # not applicable. @@ -697,24 +669,48 @@ class RelayDescriptor(ServerDescriptor): Server descriptor (`descriptor specification <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_) + :var str ed25519_certificate: base64 encoded ed25519 certificate + :var str ed25519_master_key: base64 encoded master key for our ed25519 certificate + :var str ed25519_signature: signature of this document using ed25519 + :var str onion_key: **\*** key used to encrypt EXTEND cells + :var str onion_key_crosscert: signature generated using the onion_key :var str ntor_onion_key: base64 key used to encrypt EXTEND in the ntor protocol + :var str ntor_onion_key_crosscert: signature generated using the ntor-onion-key + :var str ntor_onion_key_crosscert_sign: sign of the corresponding ed25519 public key :var str signing_key: **\*** relay's long-term identity key :var str signature: **\*** signature for this descriptor **\*** attribute is required when we're parsed with validation + + .. versionchanged:: 1.5.0 + Added the ed25519_certificate, ed25519_master_key, ed25519_signature, + onion_key_crosscert, ntor_onion_key_crosscert, and + ntor_onion_key_crosscert_sign attributes. """ ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ + 'ed25519_certificate': (None, _parse_identity_ed25519_line), + 'ed25519_master_key': (None, _parse_master_key_ed25519_line), + 'ed25519_signature': (None, _parse_router_sig_ed25519_line), + 'onion_key': (None, _parse_onion_key_line), + 'onion_key_crosscert': (None, _parse_onion_key_crosscert_line), 'ntor_onion_key': (None, _parse_ntor_onion_key_line), + 'ntor_onion_key_crosscert': (None, _parse_ntor_onion_key_crosscert_line), + 'ntor_onion_key_crosscert_sign': (None, _parse_ntor_onion_key_crosscert_line), 'signing_key': (None, _parse_signing_key_line), 'signature': (None, _parse_router_signature_line), }) PARSER_FOR_LINE = dict(ServerDescriptor.PARSER_FOR_LINE, **{ + 'identity-ed25519': _parse_identity_ed25519_line, + 'master-key-ed25519': _parse_master_key_ed25519_line, + 'router-sig-ed25519': _parse_router_sig_ed25519_line, 'onion-key': _parse_onion_key_line, + 'onion-key-crosscert': _parse_onion_key_crosscert_line, 'ntor-onion-key': _parse_ntor_onion_key_line, + 'ntor-onion-key-crosscert': _parse_ntor_onion_key_crosscert_line, 'signing-key': _parse_signing_key_line, 'router-signature': _parse_router_signature_line, }) @@ -753,6 +749,15 @@ class RelayDescriptor(ServerDescriptor): return method(str(self).strip(), str(other).strip()) + def _check_constraints(self, entries): + super(RelayDescriptor, self)._check_constraints(entries) + + if self.ed25519_certificate: + if not self.onion_key_crosscert: + raise ValueError("Descriptor must have a 'onion-key-crosscert' when identity-ed25519 is present") + elif not self.ed25519_signature: + raise ValueError("Descriptor must have a 'router-sig-ed25519' when identity-ed25519 is present") + def __hash__(self): return hash(str(self).strip()) @@ -770,13 +775,23 @@ class BridgeDescriptor(ServerDescriptor): """ Bridge descriptor (`bridge descriptor specification <https://collector.torproject.org/formats.html#bridge-descriptors>`_) + + :var str ed25519_certificate_hash: sha256 hash of the original identity-ed25519 + :var str router_digest_sha256: **todo**, needs clarification + + .. versionchanged:: 1.5.0 + Added the ed25519_certificate_hash and router_digest_sha256 attributes. """ ATTRIBUTES = dict(ServerDescriptor.ATTRIBUTES, **{ + 'ed25519_certificate_hash': (None, _parse_master_key_ed25519_for_hash_line), + 'router_digest_sha256': (None, _parse_router_digest_sha256_line), '_digest': (None, _parse_router_digest_line), }) PARSER_FOR_LINE = dict(ServerDescriptor.PARSER_FOR_LINE, **{ + 'master-key-ed25519': _parse_master_key_ed25519_for_hash_line, + 'router-digest-sha256': _parse_router_digest_sha256_line, 'router-digest': _parse_router_digest_line, }) diff --git a/test/unit/descriptor/data/bridge_descriptor_with_ed25519 b/test/unit/descriptor/data/bridge_descriptor_with_ed25519 new file mode 100644 index 0000000..6e3320a --- /dev/null +++ b/test/unit/descriptor/data/bridge_descriptor_with_ed25519 @@ -0,0 +1,17 @@ +@type bridge-server-descriptor 1.1 +router ChandlerObfs11 10.162.85.172 443 0 0 +or-address [fd9f:2e19:3bcf::3d:b3f9]:443 +master-key-ed25519 lgIuiAJCoXPRwWoHgG4ZAoKtmrv47aPr4AsbmESj8AA +platform Tor 0.2.7.1-alpha-dev on Linux +protocols Link 1 2 Circuit 1 +published 2015-08-20 20:09:42 +fingerprint 6789 12AB D739 8DF8 EFC8 FA2B C7DE F610 7103 60C4 +uptime 2693146 +bandwidth 1073741824 1073741824 779171 +extra-info-digest 5229E98EAB41A32E83159FA45BED21B5B405BF3B lTSVvW/NMR2HsLaJwhndqTULAtsaaSilmvm/orV9y/s +hidden-service-dir +contact somebody +ntor-onion-key bVvxUCi8drAVRkFPuFQ4DYBsV1m2M+GpHOUReOopXEk= +reject *:* +router-digest-sha256 OB/fqLD8lYmjti09R+xXH/D4S2qlizxdZqtudnsunxE +router-digest 402AC6E2BB371923E637A1D23C2D8EA55D6EB7D5 diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 1218bee..d44a694 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -249,7 +249,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('server_descriptor_with_ed25519'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)) family = set([ '$379FB450010D17078B3766C2273303C358C3A442', @@ -292,8 +292,28 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('0', desc.ntor_onion_key_crosscert_sign) self.assertTrue('MIGJAoGBAOUS7x' in desc.signing_key) self.assertTrue('y72z1dZOYxVQVL' in desc.signature) - self.assertEqual([], desc.get_unrecognized_lines()) self.assertEqual('B5E441051D139CCD84BC765D130B01E44DAC29AD', desc.digest()) + self.assertEqual([], desc.get_unrecognized_lines()) + + def test_bridge_with_ed25519(self): + """ + Parses a bridge descriptor with ed25519. + """ + + with open(get_resource('bridge_descriptor_with_ed25519'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)) + + self.assertEqual('ChandlerObfs11', desc.nickname) + self.assertEqual('678912ABD7398DF8EFC8FA2BC7DEF610710360C4', desc.fingerprint) + self.assertEqual('10.162.85.172', desc.address) + self.assertFalse(hasattr(desc, 'ed25519_certificate')) + self.assertEqual('lgIuiAJCoXPRwWoHgG4ZAoKtmrv47aPr4AsbmESj8AA', desc.ed25519_certificate_hash) + self.assertEqual('OB/fqLD8lYmjti09R+xXH/D4S2qlizxdZqtudnsunxE', desc.router_digest_sha256) + + # TODO: Turns out sanitized descriptors have ntor-onion-key. Need to double + # check this is intended. + # + # self.assertEqual([], desc.get_unrecognized_lines()) def test_cr_in_contact_line(self): """

1 0

[tor-browser-bundle/maint-5.0] Bug 16860: Reuse favorite Tor Browser icon
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit a3473c7b35e83db97df1b39175c1ca4c717e9364 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 09:53:41 2015 +0200 Bug 16860: Reuse favorite Tor Browser icon Adding "StartupWMClass=Tor Browser" makes sure that the favorite Tor Browser icon is reused after Tor Browser got registered. If this property is missing one gets two icons: oe for the favorite and a new icon for the running instance. This impacts at least Gnome3. Thanks to a cypherpunk for the proposed fix. --- RelativeLink/start-tor-browser.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index d6c1c63..9c63466 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -31,3 +31,4 @@ Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser +StartupWMClass=Tor Browser

1 0

[tor-browser-bundle/master] Bug 16860: Reuse favorite Tor Browser icon
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ee2e10d6e038b2b057499034437b4b6a393a4906 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 09:53:41 2015 +0200 Bug 16860: Reuse favorite Tor Browser icon Adding "StartupWMClass=Tor Browser" makes sure that the favorite Tor Browser icon is reused after Tor Browser got registered. If this property is missing one gets two icons: oe for the favorite and a new icon for the running instance. This impacts at least Gnome3. Thanks to a cypherpunk for the proposed fix. --- RelativeLink/start-tor-browser.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index d6c1c63..9c63466 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -31,3 +31,4 @@ Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser +StartupWMClass=Tor Browser

1 0

[metrics-web/master] Unset -e in clients stats script.
by karsten＠torproject.org 24 Aug '15

24 Aug '15

commit 2a68d0616ff55b1e8852163b8bccb656bf8ebdbe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 24 15:16:27 2015 +0200 Unset -e in clients stats script. In theory, it's a fine idea to stop the script if one of its steps fails. But `ant | grep "\[java\]"` returns a non-zero code if there's not a single line of output, which is not a failure. We shouldn't stop in that case. --- shared/bin/80-run-clients-stats.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/bin/80-run-clients-stats.sh b/shared/bin/80-run-clients-stats.sh index 325570c..bdd55c1 100755 --- a/shared/bin/80-run-clients-stats.sh +++ b/shared/bin/80-run-clients-stats.sh @@ -1,5 +1,4 @@ #!/bin/sh -set -e cd modules/clients/

1 0

[metrics-web/master] Also include archived descriptor tarballs, if present.
by karsten＠torproject.org 24 Aug '15

24 Aug '15

commit 80bebf0fff0b11579159042abe2375bd4e8e0550 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 24 15:18:11 2015 +0200 Also include archived descriptor tarballs, if present. --- modules/clients/src/org/torproject/metrics/clients/Main.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/clients/src/org/torproject/metrics/clients/Main.java b/modules/clients/src/org/torproject/metrics/clients/Main.java index 2e6712b..430cb1e 100644 --- a/modules/clients/src/org/torproject/metrics/clients/Main.java +++ b/modules/clients/src/org/torproject/metrics/clients/Main.java @@ -63,6 +63,8 @@ public class Main { "status/relay-descriptors")); descriptorReader.addDirectory(new File( "../../shared/in/recent/relay-descriptors")); + descriptorReader.addDirectory(new File( + "../../shared/in/archive/relay-descriptors")); Iterator<DescriptorFile> descriptorFiles = descriptorReader.readDescriptors(); while (descriptorFiles.hasNext()) { @@ -200,6 +202,8 @@ public class Main { "status/bridge-descriptors")); descriptorReader.addDirectory(new File( "../../shared/in/recent/bridge-descriptors")); + descriptorReader.addDirectory(new File( + "../../shared/in/archive/bridge-descriptors")); Iterator<DescriptorFile> descriptorFiles = descriptorReader.readDescriptors(); while (descriptorFiles.hasNext()) {

1 0