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

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 19 May '15

19 May '15

commit 1eba933634d228c3c1eb0c33b12ea2af87336717 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 12:46:04 2015 +0000 Update translations for torbutton-torbuttonproperties --- ru/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/torbutton.properties b/ru/torbutton.properties index a75acb7..62af84b 100644 --- a/ru/torbutton.properties +++ b/ru/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, и это усложняет возможность отследить Вас в сети. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 19 May '15

19 May '15

commit c644bf330142dc5c9d3d5a0e9b756b6d587ca928 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 19 10:46:08 2015 +0000 Update translations for tor_animation --- fi.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.srt b/fi.srt index 83fd959..5713c7b 100644 --- a/fi.srt +++ b/fi.srt @@ -69,7 +69,7 @@ viestinnän Internetissä. 17 00:00:56,560 --> 00:00:58,280 -Tor also protects our data +Tor myös suojelee tietojasi 18 00:00:58,400 --> 00:01:01,900

1 0

[webwml/master] re-allocate some officer positions
by arma＠torproject.org 18 May '15

18 May '15

commit 1289efa01a9c37aac197cadd0280947bd4a6fd97 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 18 17:20:46 2015 -0400 re-allocate some officer positions --- about/en/board.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/board.wml b/about/en/board.wml index 6987a57..e4f8ade 100644 --- a/about/en/board.wml +++ b/about/en/board.wml @@ -66,7 +66,7 @@ </td> <td class="beige"> <div class="name">Wendy Seltzer</div> - <div class="caps">Director</div> + <div class="caps">Clerk and Director</div> <p> Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>. @@ -76,7 +76,7 @@ <tr> <td class="beige"> <div class="name">Meredith Hoban-Dunn</div> - <div class="caps">Audit Committee Chair</div> + <div class="caps">Treasurer and Audit Committee Chair</div> <p> Meredith is an accomplished accountant, advisor, and banker. Her role is to help us make sure we're able to

1 0

[webwml/master] mention the open position in the sidenav
by arma＠torproject.org 18 May '15

18 May '15

commit fb79365a23e22cd5050a910d0e12453975fcde51 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 18 17:21:00 2015 -0400 mention the open position in the sidenav --- about/en/sidenav.wmi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/about/en/sidenav.wmi b/about/en/sidenav.wmi index 5816b57..a5a1d24 100644 --- a/about/en/sidenav.wmi +++ b/about/en/sidenav.wmi @@ -43,10 +43,10 @@ {'url' => 'about/jobs', 'txt' => 'Jobs', -# 'subelements' => [ -# {'url' => 'about/jobs-projectmanager', -# 'txt' => 'Project manager', -# }] + 'subelements' => [ + {'url' => 'about/jobs-execadmin', + 'txt' => 'Exec administrator', + }] }, {'url' => 'about/sponsors',

1 0

[webwml/master] try to fix the formatting on the exec admin post
by arma＠torproject.org 18 May '15

18 May '15

commit f611624e104566b3d32ef3af26cad3252cab5fd6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 18 17:22:30 2015 -0400 try to fix the formatting on the exec admin post --- about/en/jobs-execadmin.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/jobs-execadmin.wml b/about/en/jobs-execadmin.wml index 071ea59..abf7e4d 100644 --- a/about/en/jobs-execadmin.wml +++ b/about/en/jobs-execadmin.wml @@ -87,6 +87,7 @@ This position will be based in Tor's offices in Cambridge, MA. Initially, we ant <h4>About the company:</h4> +<p> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor network's 6000 volunteer relays carry 48 Gbps for several

1 0

[tor/master] Fix some compilation warnings
by nickm＠torproject.org 18 May '15

18 May '15

commit d5e4a6343694574cebc9f9bd7ea83a168bdad3aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 18 15:57:21 2015 -0400 Fix some compilation warnings --- src/or/control.c | 2 ++ src/or/rendclient.h | 1 - src/or/rendcommon.h | 2 +- src/test/test_hs.c | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index de24294..4eeb897 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2216,6 +2216,8 @@ getinfo_helper_liveness(control_connection_t *control_conn, const char *question, char **answer, const char **errmsg) { + (void)control_conn; + (void)errmsg; if (strcmp(question, "network-liveness") == 0) { if (get_cached_network_liveness()) { *answer = tor_strdup("up"); diff --git a/src/or/rendclient.h b/src/or/rendclient.h index 639ec1e..6118924 100644 --- a/src/or/rendclient.h +++ b/src/or/rendclient.h @@ -52,7 +52,6 @@ int rend_parse_service_authorization(const or_options_t *options, rend_service_authorization_t *rend_client_lookup_service_authorization( const char *onion_address); void rend_service_authorization_free_all(void); -rend_data_t *rend_data_dup(const rend_data_t *request); #endif diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index aacc751..0ed7adc 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -73,7 +73,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *secret_id_part); size_t rend_cache_get_total_allocation(void); -rend_data_t * rend_data_dup(const rend_data_t *data); +rend_data_t *rend_data_dup(const rend_data_t *data); rend_data_t *rend_data_client_create(const char *onion_address, const char *desc_id, const char *cookie, diff --git a/src/test/test_hs.c b/src/test/test_hs.c index a166f2c..dd49cd3 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -310,6 +310,8 @@ test_hs_rend_data(void *arg) char client_cookie[REND_DESC_COOKIE_LEN]; time_t now = time(NULL); + (void)arg; + base32_decode(desc_id, sizeof(desc_id), STR_DESC_ID_BASE32, REND_DESC_ID_V2_LEN_BASE32); memset(client_cookie, 'e', sizeof(client_cookie));

1 0

[stem/master] Link to Jordan Wright's consensus chart from our API docs
by atagar＠torproject.org 18 May '15

18 May '15

commit 1ee755feb205c478fb5d5d63777318f85f6279ab Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 17 12:49:20 2015 -0700 Link to Jordan Wright's consensus chart from our API docs Jordan wrote a great article describing how the consensus is made, and a chard breaking down its sections. This is a perfect fit for our consensus API docs to help it easier to understand. --- stem/descriptor/networkstatus.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index a162e2e..f82e9e8 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -3,12 +3,13 @@ """ Parsing for Tor network status documents. This supports both the v2 and v3 -dir-spec. Documents can be obtained from a few sources... +`dir-spec <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_. +Documents can be obtained from a few sources... * The 'cached-consensus' file in Tor's data directory. -* Archived descriptors provided by CollecTor - (https://collector.torproject.org/) +* Archived descriptors provided by `CollecTor + <https://collector.torproject.org/>`_. * Directory authorities and mirrors via their DirPort. @@ -19,6 +20,10 @@ dir-spec. Documents can be obtained from a few sources... * list of :class:`stem.descriptor.router_status_entry.RouterStatusEntry` * document footer +**For a great graphical overview see** `Jordan Wright's chart describing the +anatomy of the consensus +<https://jordan-wright.github.io/images/blog/how_tor_works/consensus.png>`_. + Of these, the router status entry section can be quite large (on the order of hundreds of kilobytes). As such we provide a couple of methods for reading network status documents through :func:`~stem.descriptor.__init__.parse_file`.

1 0

[stem/master] Descriptors couldn't be pickled
by atagar＠torproject.org 18 May '15

18 May '15

commit cbce47082a9ffb1cab375a6e8307e0eec60775d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 17 13:41:02 2015 -0700 Descriptors couldn't be pickled When being unpickled there's a time when descriptors lack their attributes. This caused an infinite loop where... 1. Try to get an attribute. 2. We call the descriptor's __getattr__() 3. The __getattr__ tries to use _lazy_loading which doesn't exist. 4. We call the descriptor's __getattr__() ... loop 2-5 repeatedly... Adding a hasattr() check to break the cycle, and a unit test for pickleability. This was caught by Tom on... https://trac.torproject.org/projects/tor/ticket/16054 --- stem/descriptor/__init__.py | 2 +- test/unit/descriptor/server_descriptor.py | 48 +++++++++++++++++++---------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 1ebe578..5b07bc4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -596,7 +596,7 @@ class Descriptor(object): def __getattr__(self, name): # If attribute isn't already present we might be lazy loading it... - if self._lazy_loading and name in self.ATTRIBUTES: + if hasattr(self, '_lazy_loading') and self._lazy_loading and name in self.ATTRIBUTES: default, parsing_function = self.ATTRIBUTES[name] try: diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index a0c328b..226cdcd 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -4,6 +4,7 @@ Unit tests for stem.descriptor.server_descriptor. import datetime import io +import pickle import tarfile import unittest @@ -70,8 +71,6 @@ class TestServerDescriptor(unittest.TestCase): Parses and checks our results against a server descriptor from metrics. """ - descriptor_file = open(get_resource('example_descriptor'), 'rb') - expected_family = set([ '$0CE3CFB1E9CC47B63EA8869813BF6FAB7D4540C1', '$1FD187E8F69A9B74C9202DC16A25B9E7744AB9F6', @@ -101,7 +100,9 @@ dskLSPz8beUW7bzwDjR6EVNGpyoZde83Ejvau+5F2c6cGnlu91fiZN3suE88iE6e Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= -----END SIGNATURE-----""" - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0')) + with open(get_resource('example_descriptor'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0')) + self.assertEqual('caerSidi', desc.nickname) self.assertEqual('A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB', desc.fingerprint) self.assertEqual('71.35.133.197', desc.address) @@ -153,9 +154,9 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a relay server descriptor from 2005. """ - descriptor_file = open(get_resource('old_descriptor'), 'rb') + with open(get_resource('old_descriptor'), '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, 'server-descriptor 1.0', validate = True)) self.assertEqual('krypton', desc.nickname) self.assertEqual('3E2F63E2356F52318B536A12B6445373808A5D6C', desc.fingerprint) self.assertEqual('212.37.39.59', desc.address) @@ -199,11 +200,9 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a descriptor with non-ascii content. """ - descriptor_file = open(get_resource('non-ascii_descriptor'), 'rb') - - expected_contact = b'1024D/04D2E818 L\xc3\xa9na\xc3\xafc Huard <lenaic dot huard AT laposte dot net>' + with open(get_resource('non-ascii_descriptor'), '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, 'server-descriptor 1.0', validate = True)) self.assertEqual('Coruscant', desc.nickname) self.assertEqual('0B9821545C48E496AEED9ECC0DB506C49FF8158D', desc.fingerprint) self.assertEqual('88.182.161.122', desc.address) @@ -215,7 +214,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('Linux', desc.operating_system) self.assertEqual(259738, desc.uptime) self.assertEqual(datetime.datetime(2013, 5, 18, 11, 16, 19), desc.published) - self.assertEqual(expected_contact, desc.contact) + self.assertEqual(b'1024D/04D2E818 L\xc3\xa9na\xc3\xafc Huard <lenaic dot huard AT laposte dot net>', desc.contact) self.assertEqual(['1', '2'], desc.link_protocols) self.assertEqual(['1'], desc.circuit_protocols) self.assertEqual(False, desc.hibernating) @@ -243,8 +242,8 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= returns ('\r' entries). """ - descriptor_file = open(get_resource('cr_in_contact_line'), 'rb') - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + with open(get_resource('cr_in_contact_line'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) self.assertEqual('pogonip', desc.nickname) self.assertEqual('6DABD62BC65D4E6FE620293157FC76968DAB9C9B', desc.fingerprint) @@ -265,8 +264,8 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= where we shouldn't be. """ - descriptor_file = open(get_resource('negative_uptime'), 'rb') - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + with open(get_resource('negative_uptime'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) self.assertEqual('TipTor', desc.nickname) self.assertEqual('137962D4931DBF08A24E843288B8A155D6D2AEDD', desc.fingerprint) @@ -283,9 +282,9 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a bridge descriptor. """ - descriptor_file = open(get_resource('bridge_descriptor'), 'rb') + with open(get_resource('bridge_descriptor'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'bridge-server-descriptor 1.0', validate = True)) - desc = next(stem.descriptor.parse_file(descriptor_file, 'bridge-server-descriptor 1.0', validate = True)) self.assertEqual('Unnamed', desc.nickname) self.assertEqual('4ED573582B16ACDAF6E42AA044A038F83A7F6333', desc.fingerprint) self.assertEqual('10.18.111.71', desc.address) @@ -719,3 +718,20 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= else: # check a default attribute self.assertEqual('caerSidi', desc.nickname) + + def test_pickleability(self): + """ + Checks that we can unpickle lazy loaded server descriptors. + """ + + with open(get_resource('example_descriptor'), 'rb') as descriptor_file: + desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0')) + + encoded_desc = pickle.dumps(desc) + restored_desc = pickle.loads(encoded_desc) + + self.assertEqual('caerSidi', restored_desc.nickname) + self.assertEqual('A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB', restored_desc.fingerprint) + self.assertEqual('71.35.133.197', restored_desc.address) + self.assertEqual(9001, restored_desc.or_port) + self.assertEqual(None, restored_desc.socks_port)

1 0

[stem/master] Errors when parsing router status entry's 'w' lines
by atagar＠torproject.org 18 May '15

18 May '15

commit 98d97717486063bb53bb297fde1cb1e9e73d89ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 17 15:18:18 2015 -0700 Errors when parsing router status entry's 'w' lines We didn't properly set a default value when parsing 'w' lines, potentially leading to infinite recursion. Caught by Tom on... https://trac.torproject.org/projects/tor/ticket/16048 --- stem/descriptor/router_status_entry.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 561f855..c33baa3 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -228,6 +228,11 @@ def _parse_w_line(descriptor, entries): elif not w_comp[0].startswith('Bandwidth='): raise ValueError("%s 'w' line needs to start with a 'Bandwidth=' entry: w %s" % (descriptor._name(), value)) + bandwidth = None + measured = None + is_unmeasured = False + unrecognized_bandwidth_entries = [] + for w_entry in w_comp: if '=' in w_entry: w_key, w_value = w_entry.split('=', 1) @@ -238,19 +243,24 @@ def _parse_w_line(descriptor, entries): if not (w_value and w_value.isdigit()): raise ValueError("%s 'Bandwidth=' entry needs to have a numeric value: w %s" % (descriptor._name(), value)) - descriptor.bandwidth = int(w_value) + bandwidth = int(w_value) elif w_key == 'Measured': if not (w_value and w_value.isdigit()): raise ValueError("%s 'Measured=' entry needs to have a numeric value: w %s" % (descriptor._name(), value)) - descriptor.measured = int(w_value) + measured = int(w_value) elif w_key == 'Unmeasured': if w_value != '1': raise ValueError("%s 'Unmeasured=' should only have the value of '1': w %s" % (descriptor._name(), value)) - descriptor.is_unmeasured = True + is_unmeasured = True else: - descriptor.unrecognized_bandwidth_entries.append(w_entry) + unrecognized_bandwidth_entries.append(w_entry) + + descriptor.bandwidth = bandwidth + descriptor.measured = measured + descriptor.is_unmeasured = is_unmeasured + descriptor.unrecognized_bandwidth_entries = unrecognized_bandwidth_entries def _parse_p_line(descriptor, entries):

1 0

[stem/master] Fix unpickling for python3
by atagar＠torproject.org 18 May '15

18 May '15

commit d8e16b765610160260e7e90693ffb2db08bb7dc5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 18 12:11:47 2015 -0700 Fix unpickling for python3 Turns out we can't use hasattr() since that triggers __getattr__() as well under python3 (but not python2). The note about this... "... it must do this by comparing the strings, rather than using hasattr or testing for an AttributeError." https://users.cs.cf.ac.uk/J.P.Giddy/python/gotcha/getattr.html --- stem/descriptor/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 5b07bc4..e8b581e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -594,9 +594,15 @@ class Descriptor(object): return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) def __getattr__(self, name): + # Our constructor sets these, but when unpickling we might lack them. This + # check is needed to avoid an infinite loop in that case. + + if name in ('_lazy_loading', 'ATTRIBUTES'): + return super(Descriptor, self).__getattribute__(name) + # If attribute isn't already present we might be lazy loading it... - if hasattr(self, '_lazy_loading') and self._lazy_loading and name in self.ATTRIBUTES: + if self._lazy_loading and name in self.ATTRIBUTES: default, parsing_function = self.ATTRIBUTES[name] try:

1 0