tor-commits August 2013

tor-commits@lists.torproject.org

19 participants
1224 discussions

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '13

04 Aug '13

commit 5bb944c4359218fb4320e31dd97ad63a8944220d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 4 20:46:17 2013 +0000 Update translations for https_everywhere --- bg/https-everywhere.dtd | 2 +- bg/ssl-observatory.dtd | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd index fe8a230..026af87 100644 --- a/bg/https-everywhere.dtd +++ b/bg/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "За HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Шифрирайте мрежата! Използвайте автоматично HTTPS защита на много страници."> +<!ENTITY https-everywhere.about.ext_description "Шифрирайте мрежата! Използвайте автоматична HTTPS защита на много страници."> <!ENTITY https-everywhere.about.version "Версия"> <!ENTITY https-everywhere.about.created_by "Създадено от"> <!ENTITY https-everywhere.about.librarians "Библиотеки с правила"> diff --git a/bg/ssl-observatory.dtd b/bg/ssl-observatory.dtd index b05fa0a..74aeed2 100644 --- a/bg/ssl-observatory.dtd +++ b/bg/ssl-observatory.dtd @@ -28,7 +28,7 @@ to turn it on?">--> "Предаване и проверка на сертификати подписани от нестандартизиран Certificate Authority"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"Безопасно е (и е добра идея) да включите тази опция, освен ако използвате натрапчива корпоративна мрежа или антивирусен софтуер на Касперски, който следи вашата работа в мрежата с помощта на TLS прокси и частни Certificate Authority. Ако е разрешена на такава мрежа, тази опция може да публикува данни за това, какви https:// домейни били посетени чрез това прокси, вследствие на уникалния сертификат, който предоставят. Така че, я оставяме изключена по подразбиране."> <!ENTITY ssl-observatory.prefs.anonymous "Проверка на сертификати чрез използване на Tor анонимност"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable @@ -45,9 +45,9 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "Готово"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere може да използва SSL Observatory на EFF. Това означават две неща: -(1) изпращане на копия от HTTPS сертификати към SSL Observatory, за да ни помогнат да определим "man in the middle (човек в средата)" атаки и подобрим уеб сигурността; -(2) позволява ни да ви предупредим за несигурни връзки или атаки на вашия браузър."> +"HTTPS Everywhere може да използва SSL Observatory на EFF. Това означава две неща: (1) +Изпращане на копия от HTTPS сертификати към SSL Observatory, за да ни помогнат да определим 'man in the middle' атаки и да подобрим уеб сигурността; +(2) Позволява ни да ви предупредим за несигурни връзки или атаки над вашия браузър."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '13

04 Aug '13

commit 5791799b03f010af803f4f0f27a212b27ff4db9d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 4 20:16:20 2013 +0000 Update translations for https_everywhere --- bg/ssl-observatory.dtd | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/bg/ssl-observatory.dtd b/bg/ssl-observatory.dtd index 5d7cc10..b05fa0a 100644 --- a/bg/ssl-observatory.dtd +++ b/bg/ssl-observatory.dtd @@ -3,9 +3,8 @@ <!ENTITY ssl-observatory.popup.later "Питане по-късно"> <!ENTITY ssl-observatory.popup.no "Не"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere може да засече атаки -срещу вашият браузър като изпраща сертификатите, които получавате към -SSL Observatory. Включване на тази опция?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere може да засече атаки срещу вашият браузър като изпраща сертификатите, които получавате към SSL Observatory. +Включване на тази опция?">  <!ENTITY ssl-observatory.popup.title -"HTTPS Everywhere да използва ли SSL Observatory?"> +"Да използва ли HTTPS Everywhere SSL Observatory?"> <!ENTITY ssl-observatory.popup.yes "Да">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"Безопастно е да влючеш това, освен ако ползваш много шпионска връска:"> +"Включването на тази опция е безопасно, освен ако използвате много натрапчива корпоративна мрежа:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Безопасно, освен когато използвате корпоративна мрежа със секретни имена на сървърите:"> +"Безопасно, освен ако използвате корпоративна мрежа със секретни имена на сървърите:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Предаване и проверка на сертификати подписани от нестандартизирани Certificate Authority"> +"Предаване и проверка на сертификати подписани от нестандартизиран Certificate Authority"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip ""> @@ -38,15 +37,17 @@ to turn it on?">--> "Тази опция изисква Tor и Torbutton да бъдат инсталирани"> <!ENTITY ssl-observatory.prefs.asn -"При получаване на нов сертификат, съобщете на SSL Observatory към кой интернет доставчик сте свързан"> +"Когато получите нов сертификат, съобщете на SSL Observatory към кой интернет доставчик сте свързан"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"Ще получите и изпратите "Номер на автономна система" на вашата мрежа. Това ще ни помогне да локализираме атаките срещу HTTPS и да определим дали имаме наблюдения от мрежи на места като Иран и Сирия, където атаките са сравнително чести."> <!ENTITY ssl-observatory.prefs.done "Готово"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere може да използва SSL Observatory на EFF. Това означават две неща: +(1) изпращане на копия от HTTPS сертификати към SSL Observatory, за да ни помогнат да определим "man in the middle (човек в средата)" атаки и подобрим уеб сигурността; +(2) позволява ни да ви предупредим за несигурни връзки или атаки на вашия браузър."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Aug '13

04 Aug '13

commit bd78ddb77ce6f5066183c9b4db7e7b4dfe604007 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 4 20:15:11 2013 +0000 Update translations for orbot --- values-da/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/values-da/strings.xml b/values-da/strings.xml index 5d2b23f..11d2ff5 100644 --- a/values-da/strings.xml +++ b/values-da/strings.xml @@ -107,6 +107,10 @@ <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string> <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande og adresser for første hop</string> <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string> + <string name="pref_proxy_type_summary">Protokol til proxy serveren: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Indtast proxy type</string> + <string name="pref_proxy_host_dialog">Indtast proxy vært</string> + <string name="pref_proxy_port_dialog">Indtast proxy port</string> <string name="status">Status</string> <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string> <string name="error">Fejl</string>

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '13

04 Aug '13

commit 7e94e473efea6be19cdf56efdfe6c6a1e431125f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 4 19:46:25 2013 +0000 Update translations for https_everywhere --- bg/ssl-observatory.dtd | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/bg/ssl-observatory.dtd b/bg/ssl-observatory.dtd index 4e9df8e..5d7cc10 100644 --- a/bg/ssl-observatory.dtd +++ b/bg/ssl-observatory.dtd @@ -26,7 +26,7 @@ to turn it on?">--> "Безопасно, освен когато използвате корпоративна мрежа със секретни имена на сървърите:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Приемане и проверка на сертификати подписани от нестандартизирани Certificate Authority"> +"Предаване и проверка на сертификати подписани от нестандартизирани Certificate Authority"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip ""> @@ -55,32 +55,35 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -""> +"Например, когато посетите https://www.something.com, сертификата +получен от SSL Observatory ще означи, че някой е посетил +www.something.com, но не кой е неговият посетител или коя точно страница +се преглежда. Задръжте мишката върху опцията за допълнителна информация:"> -<!ENTITY ssl-observatory.prefs.hide "Скрий разширени настройки"> +<!ENTITY ssl-observatory.prefs.hide "Скриване на разширените опции"> <!ENTITY ssl-observatory.prefs.nonanon -"Проверявай сертификати даье ако Tor ние свободен"> +"Проверка на сертификати дори ако Tor не е наличен"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"Все още ше опитаме да пазим данните анонимни, но тази настройка е по малко сигорна"> +"Все пак ще се опитаме да запазим данните анонимни, но тази опция е по-малко сигурна"> <!ENTITY ssl-observatory.prefs.priv_dns -"Вкараи и провери сертификати за частни DNS имена"> +"Предаване и проверка на сертификати за не-публични DNS имена"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"Докато тази опция е избрана, SSL Observatory няма да регистрира сертификати за имена, които не могат да се разрешат през DNS системата."> -<!ENTITY ssl-observatory.prefs.show "Покажи разширени настройки"> +<!ENTITY ssl-observatory.prefs.show "Показване на разширени опции"> -<!ENTITY ssl-observatory.prefs.title "SSL Обсержатория Nастроики"> +<!ENTITY ssl-observatory.prefs.title "Настройки на SSL Observatory"> -<!ENTITY ssl-observatory.prefs.use "Използвай Observatory?"> -<!ENTITY ssl-observatory.warning.title "ВНИМАНИЕ от SSL обсерваторята на ЕФФ"> -<!ENTITY ssl-observatory.warning.showcert "Покажи веригата на сертификата"> +<!ENTITY ssl-observatory.prefs.use "Използване на SSL Observatory?"> +<!ENTITY ssl-observatory.warning.title "ПРЕДУПРЕЖДЕНИЕ от SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Показване веригата на сертификата"> <!ENTITY ssl-observatory.warning.okay "Разбирам"> -<!ENTITY ssl-observatory.warning.text "SSL Обсерваторята на ЕФФ е дала признак за HTTPS сертификат(и) на тази страница:"> -<!ENTITY ssl-observatory.warning.defense "Ако си влязал в тази страница, предложено е да смениш паролата когато имаш безопастна връска."> +<!ENTITY ssl-observatory.warning.text "SSL Observatory е издала предупреждение за HTTPS сертификат(и) за този сайт:"> +<!ENTITY ssl-observatory.warning.defense "Ако сте вписани в тази страница, може да е препоръчително да смените паролата си, след установяване на безопасна връзка."> <!ENTITY ssl-observatory.prefs.self_signed "Приемане и проверка на самоподписани сертификати">

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Aug '13

04 Aug '13

commit ed63cb83a2643e9b61a9b34a6d7987acbf12156a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 4 19:45:13 2013 +0000 Update translations for orbot --- values-da/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/values-da/strings.xml b/values-da/strings.xml index a84354a..5d2b23f 100644 --- a/values-da/strings.xml +++ b/values-da/strings.xml @@ -37,8 +37,12 @@ <string name="pref_transparent_all_title">Brug Tor til alt</string> <string name="pref_transparent_all_summary">Proxy-trafik for alle programmer gennem Tor</string> <string name="pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string> + <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår almindelige porte (80, 443, osv). Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string> <string name="pref_transparent_port_title">Portliste</string> + <string name="pref_transparent_port_summary">Liste af porte der skal filtreres gennem proxyen. Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string> + <string name="pref_transparent_port_dialog">Indtast porte der skal filtreres gennem proxyen.</string> <string name="pref_has_root">Forespørg om Root-adgang</string> + <string name="pref_has_root_summary">Kræver root privilegier for gennemsigtig proxy.</string> <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string> <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants(a)torproject.org</string> <string name="title_error">Programfejl</string> @@ -51,6 +55,7 @@ <string name="btn_cancel">Fortryd</string>  <string name="wizard_details">Nogle Orbot detaljer</string> + <string name="wizard_details_msg">Orbot er et program med åben kildekode der indeholder Tor, LibEvent og Privoxy. Orbot sørger for en lokal HTTP proxy (8118) og en SOCKS proxy (9050) til Tor netværket. Orbot har også mulighed for at sende al internet-trafik gennem Tor-netværket, hvis der er root-adgang på enheden.</string> <string name="wizard_permissions_root">Tilladelse givet</string> <string name="wizard_permissions_stock">Orbot tilladelser</string> <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string> @@ -60,6 +65,7 @@ <string name="wizard_permission_enable_root">Tillad root for Orbot</string> <string name="wizard_configure">Indstil Torifikation</string> <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string> + <string name="wizard_configure_all">Kør alle programmers trafik gennem Tor proxyen</string> <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string> <string name="wizard_tips_tricks">Orbot-aktiverede apps</string> <string name="wizard_tips_otrchat">Gibberbot - Sikker instant messaging klient til Android</string> @@ -81,6 +87,7 @@ <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>  <string name="wizard_tips_title">Orbot-aktiverede apps</string> + <string name="wizard_tips_gibberbot">Gibberbot: Sikker chat klient med Off-the-Record kryptering</string> <string name="wizard_tips_orweb">Orweb: Privatlivs-forbedret browser der virker gennem Tor</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> @@ -91,9 +98,15 @@ <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string> <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string> <string name="wizard_transproxy_none">Ingen</string> + <string name="pref_transparent_tethering_title">Tor internet-hotspot</string> <string name="button_grant_superuser">Anmod om Superuser adgang</string> <string name="pref_select_apps">Vælg apps</string> <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string> + <string name="pref_node_configuration">Konfiguration af Tor node</string> + <string name="pref_node_configuration_summary">Avancerede indstillinger, der kan reducere anonymiteten</string> + <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string> + <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande og adresser for første hop</string> + <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string> <string name="status">Status</string> <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string> <string name="error">Fejl</string>

1 0

[stem/master] Style correction for event listing tutorial
by atagar＠torproject.org 04 Aug '13

04 Aug '13

commit 539cd19919a3f5fe0e5ab39259441f736c1a8579 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 28 13:34:23 2013 -0700 Style correction for event listing tutorial Oops, minor PEP8 correction for one of our tutorial examples. Not sure why I did camel case for this function... --- docs/tutorials/tortoise_and_the_hare.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorials/tortoise_and_the_hare.rst b/docs/tutorials/tortoise_and_the_hare.rst index a791103..d313b62 100644 --- a/docs/tutorials/tortoise_and_the_hare.rst +++ b/docs/tutorials/tortoise_and_the_hare.rst @@ -60,15 +60,15 @@ uploaded. controller.authenticate() try: - # This makes curses initialize and call drawBandwidthGraph() with a + # This makes curses initialize and call draw_bandwidth_graph() with a # reference to the screen, followed by additional arguments (in this # case just the controller). - curses.wrapper(drawBandwidthGraph, controller) + curses.wrapper(draw_bandwidth_graph, controller) except KeyboardInterrupt: pass # the user hit ctrl+c - def drawBandwidthGraph(stdscr, controller): + def draw_bandwidth_graph(stdscr, controller): window = Window(stdscr) # (downloaded, uploaded) tuples for the last 40 seconds

1 0

[stem/master] Defaulting Query's fall_back_to_authority to False
by atagar＠torproject.org 04 Aug '13

04 Aug '13

commit cf0a4b2f7cff17ff6f819c91e35b2a86ffcb6a81 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 4 11:21:22 2013 -0700 Defaulting Query's fall_back_to_authority to False When a user opts to use the Query class direcly they're doing so to use specific endpoints. We'll probably cause more confusion then help by falling back to the authorities here. We'll still fall back by default in the downloader, though. This also includes a tweak so users can override the downloader's endpoints. --- stem/descriptor/remote.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 8b6497f..698e141 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -218,7 +218,7 @@ class Query(object): :param bool start: start making the request when constructed (default is **True**) """ - def __init__(self, resource, descriptor_type = None, endpoints = None, retries = 2, fall_back_to_authority = True, timeout = None, start = True, validate = True, document_handler = stem.descriptor.DocumentHandler.ENTRIES): + def __init__(self, resource, descriptor_type = None, endpoints = None, retries = 2, fall_back_to_authority = False, timeout = None, start = True, validate = True, document_handler = stem.descriptor.DocumentHandler.ENTRIES): if not resource.startswith('/'): raise ValueError("Resources should start with a '/': %s" % resource) @@ -581,8 +581,13 @@ class DescriptorDownloader(object): args = dict(self._default_args) args.update(query_args) + if not 'endpoints' in args: + args['endpoints'] = self._endpoints + + if not 'fall_back_to_authority' in args: + args['fall_back_to_authority'] = True + return Query( resource, - endpoints = self._endpoints, **args )

1 0

[stem/master] Query's run() method didn't block
by atagar＠torproject.org 04 Aug '13

04 Aug '13

commit faae224eb833d7612e2779e34d0f1010f8cb2d08 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 4 11:31:05 2013 -0700 Query's run() method didn't block Well, that was confusing as hell. Say you wrote the following script... query = stem.descriptor.remote.Query( '/tor/server/all.z', timeout = 60, ) query.run(True) if not query.error: print "Results downloaded: %i" % len(list(query)) else: print "Got an error: %s" % query.error You'd expect run() to block, right? You should - that's what it was documented as doing. Instead it returned an iterator and we don't block until the list(query) call. This means that we would *never* report an error. This has been causing stacktraces for my monitors every time it encountered an error. --- stem/descriptor/remote.py | 7 +++++-- test/unit/descriptor/remote.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 698e141..30ac578 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -275,7 +275,7 @@ class Query(object): :param bool suppress: avoids raising exceptions if **True** - :returns: iterator for the requested :class:`~stem.descriptor.__init__.Descriptor` instances + :returns: list for the requested :class:`~stem.descriptor.__init__.Descriptor` instances :raises: Using the iterator can fail with the following if **suppress** is @@ -289,6 +289,9 @@ class Query(object): which case we'll pass it along. """ + return list(self._run(suppress)) + + def _run(self, suppress): with self._downloader_thread_lock: self.start() self._downloader_thread.join() @@ -317,7 +320,7 @@ class Query(object): raise self.error def __iter__(self): - for desc in self.run(True): + for desc in self._run(True): yield desc def _pick_url(self, use_authority = False): diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 3ea303b..0d57dc3 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -103,7 +103,7 @@ class TestDescriptorDownloader(unittest.TestCase): # check via the run() method - self.assertRaises(ValueError, list, query.run()) + self.assertRaises(ValueError, query.run) @patch('urllib2.urlopen') def test_query_with_timeout(self, urlopen_mock): @@ -117,7 +117,7 @@ class TestDescriptorDownloader(unittest.TestCase): timeout = 5, ) - self.assertRaises(socket.timeout, list, query.run()) + self.assertRaises(socket.timeout, query.run) urlopen_mock.assert_called_with( 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…', timeout = 5,

1 0

[stem/master] Adding a 'block' argument to the Query class
by atagar＠torproject.org 04 Aug '13

04 Aug '13

commit 5c5c59f1e7b16ed1f7a5131ec072e5646d086e44 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 4 11:38:28 2013 -0700 Adding a 'block' argument to the Query class I'm finding it to be pretty common to run... query = Query(my_resource) query.run(True) if not query.error: # do something else: # report error Adding an argument to the Query constructor so we can drop the following run(). --- stem/descriptor/remote.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 30ac578..23a1f8c 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -143,17 +143,17 @@ class Query(object): query = Query( '/tor/server/all.z', - descriptor_type = 'server-descriptor 1.0', + block = True, timeout = 30, ) print "Current relays:" - try: - for desc in query.run(): + if not query.error: + for desc in query: print desc.fingerprint - except Exception as exc: - print "Unable to retrieve the server descriptors: %s" % exc + else: + print "Unable to retrieve the server descriptors: %s" % query.error ... while iterating fails silently... @@ -216,9 +216,11 @@ class Query(object): which to parse a :class:`~stem.descriptor.networkstatus.NetworkStatusDocument` :param bool start: start making the request when constructed (default is **True**) + :param bool block: only return after the request has been completed, this is + the same as running **query.run(True)** (default is **False**) """ - def __init__(self, resource, descriptor_type = None, endpoints = None, retries = 2, fall_back_to_authority = False, timeout = None, start = True, validate = True, document_handler = stem.descriptor.DocumentHandler.ENTRIES): + def __init__(self, resource, descriptor_type = None, endpoints = None, retries = 2, fall_back_to_authority = False, timeout = None, start = True, block = False, validate = True, document_handler = stem.descriptor.DocumentHandler.ENTRIES): if not resource.startswith('/'): raise ValueError("Resources should start with a '/': %s" % resource) @@ -252,6 +254,9 @@ class Query(object): if start: self.start() + if block: + self.run(True) + def start(self): """ Starts downloading the scriptors if we haven't started already.

1 0

[stem/master] Adding a 'content' attribute to the Query class
by atagar＠torproject.org 04 Aug '13

04 Aug '13

commit e7c165ca7122a12fd5baade33221887176de3fe7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 4 12:04:22 2013 -0700 Adding a 'content' attribute to the Query class Including a Query attribute so the caller can get our raw descriptor content. I'm actually doing this to simplify the run() method's usage. It had provided an iterator so... query = Query(my_resource) print list(query) # this would print the ist of descriptors print list(query) # this would be an empty list The reason the second call is an empty list is because we already iterated over the query. This is confusing, especially since... query = Query(my_resource) query.run(True) print list(query) # also an empty list ... due to run() returning a list under the covers. By making run() provide a fresh iterator each time I also now had the downloaded content handy so making it public made sense (it'll commonly be wanted by our callers). --- stem/descriptor/remote.py | 22 ++++++++++++---------- test/unit/descriptor/remote.py | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 23a1f8c..95934e1 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -200,6 +200,7 @@ class Query(object): :var bool fall_back_to_authority: when retrying request issues the last request to a directory authority if **True** + :var str content: downloaded descriptor content :var Exception error: exception if a problem occured :var bool is_done: flag that indicates if our request has finished :var str download_url: last url used to download the descriptor, this is @@ -235,6 +236,7 @@ class Query(object): self.retries = retries self.fall_back_to_authority = fall_back_to_authority + self.content = None self.error = None self.is_done = False self.download_url = None @@ -249,8 +251,6 @@ class Query(object): self._downloader_thread = None self._downloader_thread_lock = threading.RLock() - self._results = None # descriptor iterator - if start: self.start() @@ -307,14 +307,21 @@ class Query(object): raise self.error else: - if self._results is None: + if self.content is None: if suppress: return raise ValueError('BUG: _download_descriptors() finished without either results or an error') try: - for desc in self._results: + results = stem.descriptor.parse_file( + io.BytesIO(self.content), + self.descriptor_type, + validate = self.validate, + document_handler = self.document_handler, + ) + + for desc in results: yield desc except ValueError as exc: self.error = exc # encountered a parsing error @@ -357,12 +364,7 @@ class Query(object): if self.download_url.endswith('.z'): response = zlib.decompress(response) - self._results = stem.descriptor.parse_file( - io.BytesIO(response.strip()), - self.descriptor_type, - validate = self.validate, - document_handler = self.document_handler, - ) + self.content = response.strip() self.runtime = time.time() - self.start_time log.trace("Descriptors retrieved from '%s' in %0.2fs" % (self.download_url, self.runtime)) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 0d57dc3..e20dd06 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -123,3 +123,19 @@ class TestDescriptorDownloader(unittest.TestCase): timeout = 5, ) self.assertEqual(3, urlopen_mock.call_count) + + @patch('urllib2.urlopen') + def test_can_iterate_multiple_times(self, urlopen_mock): + urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR) + + query = stem.descriptor.remote.Query( + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + endpoints = [('128.31.0.39', 9131)], + ) + + # check that iterating over the query provides the descriptors each time + + self.assertEqual(1, len(list(query))) + self.assertEqual(1, len(list(query))) + self.assertEqual(1, len(list(query)))

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2013