July 2013 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit 0407cf9d8c1a3f6764732ef4b8f87fd18663eb6c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 12:45:11 2013 +0000 Update translations for orbot --- values-it/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/values-it/strings.xml b/values-it/strings.xml index dc4fd2e..2746cf4 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -140,6 +140,11 @@ <string name="pref_proxy_port_summary">Porta del server proxy</string> <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string> <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string> + <string name="pref_proxy_username_summary">Nome Utente del Proxy (Facoltativo)</string> + <string name="pref_proxy_username_dialog">Inserisci Nome Utente del Proxy</string> + <string name="pref_proxy_password_title">Password del Proxy in Uscita</string> + <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string> + <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string> <string name="status">Stato</string> <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string> <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string> @@ -220,4 +225,5 @@ <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string> <string name="powered_by">powered by the Tor Project</string> <string name="btn_save_settings">Salva impostazioni</string> + <string name="no_internet_connection_tor">Nessuna connessione internet; Tor è in standby...</string> </resources>

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit c2cd4e88a992f749a529e4dee08dc804514a4e50 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 12:16:45 2013 +0000 Update translations for mat-gui --- it.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/it.po b/it.po index 246ee99..ae08cc5 100644 --- a/it.po +++ b/it.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-18 09:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-22 12:10+0000\n" +"Last-Translator: Random_R <rand(a)yopmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "File supportati" #: mat-gui:164 msgid "No metadata found" -msgstr "" +msgstr "Nessun metadata trovato" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" @@ -50,11 +50,11 @@ msgstr "Sporco" #: mat-gui:172 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "Metadati di %s" #: mat-gui:183 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Butta i tuoi meta, tieni i tuoi dati" #: mat-gui:188 msgid "Website" @@ -90,7 +90,7 @@ msgstr "Non-supportato" #: mat-gui:347 msgid "Unknown mimetype" -msgstr "" +msgstr "Mimetype sconosciuto" #: mat-gui:354 data/mat.ui:291 msgid "Filename" @@ -103,20 +103,20 @@ msgstr "Tipo Mime" #: mat-gui:366 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Controllo %s" #: mat-gui:381 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Pulitura %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_File" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Modifica" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" @@ -128,7 +128,7 @@ msgstr "" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Aiuto" #: data/mat.ui:214 msgid "Add" @@ -144,7 +144,7 @@ msgstr "Stato" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" -msgstr "" +msgstr "Metadati" #: data/mat.ui:400 msgid "Name" @@ -152,7 +152,7 @@ msgstr "Nome" #: data/mat.ui:414 msgid "Content" -msgstr "" +msgstr "Contenuto" #: data/mat.ui:448 msgid "Supported formats" @@ -160,16 +160,16 @@ msgstr "Formati supportati" #: data/mat.ui:482 msgid "Support" -msgstr "" +msgstr "Supporto" #: data/mat.ui:508 msgid "Method" -msgstr "" +msgstr "Metodo" #: data/mat.ui:521 msgid "Remaining" -msgstr "" +msgstr "Rimanente" #: data/mat.ui:556 msgid "Fileformat" -msgstr "" +msgstr "Formato file"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit b5ac822d343e2108fcbfd9db6d15b565b6467bd4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 12:15:12 2013 +0000 Update translations for orbot --- values-it/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/values-it/strings.xml b/values-it/strings.xml index 89fc856..dc4fd2e 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -129,13 +129,17 @@ <string name="pref_entrance_node">Nodi di entrata</string> <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string> <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string> + <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string> <string name="pref_proxy_type_title">Tipo proxy</string> <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string> <string name="pref_proxy_host_title">Host proxy</string> + <string name="pref_proxy_host_summary">Hostname server proxy</string> <string name="pref_proxy_host_dialog">Inserire l\'host del proxy</string> <string name="pref_proxy_port_title">Porta proxy</string> + <string name="pref_proxy_port_summary">Porta del server proxy</string> <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string> + <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string> <string name="status">Stato</string> <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string> <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string>

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit 5c323755d2c9fae3bfcd24741e8524bb74525a87 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 05:46:46 2013 +0000 Update translations for mat-gui_completed --- eu.po | 239 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 118 insertions(+), 121 deletions(-) diff --git a/eu.po b/eu.po index 3c4658c..2b0e9cf 100644 --- a/eu.po +++ b/eu.po @@ -4,12 +4,13 @@ # # Translators: # Antxon Baldarra <baldarra(a)lavabit.com>, 2013 +# Antxon Baldarra <baldarra(a)lavabit.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-06-24 22:53+0000\n" +"POT-Creation-Date: 2013-07-01 19:26+0200\n" +"PO-Revision-Date: 2013-07-22 05:30+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)lavabit.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" @@ -18,161 +19,157 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:95 mat-gui:563 mat-gui:579 +#: mat-gui:65 mat-gui:375 mat-gui:387 msgid "Ready" msgstr "Prest" -#: mat-gui:107 -msgid "Add" -msgstr "Gehitu" +#: mat-gui:134 +msgid "Choose files" +msgstr "Hautatu fitxategiak" -#: mat-gui:109 mat-gui:183 -msgid "Add files" -msgstr "Fitxategiak gehitu" +#: mat-gui:141 +msgid "All files" +msgstr "Fitxategi guztiak" -#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 -#: mat-gui:573 mat-gui:575 -msgid "Clean" -msgstr "Garbitu" +#: mat-gui:148 +msgid "Supported files" +msgstr "Onartutako fitxategiak" -#: mat-gui:115 -msgid "Clean selected files" -msgstr "Garbitu hautatutako fitxategiak" +#: mat-gui:164 +msgid "No metadata found" +msgstr "Ez da metadaturik aurkitu" -#: mat-gui:119 mat-gui:214 -msgid "Check" -msgstr "Egiaztatu" +#: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 +msgid "Clean" +msgstr "Garbitu" -#: mat-gui:121 -msgid "Check selected files for harmful meta" -msgstr "Egiaztatu hautatutako fitxategiak meta kaltegarriren bila" +#: mat-gui:167 mat-gui:372 +msgid "Dirty" +msgstr "Zikina" -#: mat-gui:125 mat-gui:185 -msgid "Quit" -msgstr "Irten" +#: mat-gui:172 +#, python-format +msgid "%s's metadata" +msgstr "%sren metadatuak" -#: mat-gui:137 -msgid "Path" -msgstr "Bidea" +#: mat-gui:183 +msgid "Trash your meta, keep your data" +msgstr "Zaborrara bota zure meta, gorde zure datuak" -#: mat-gui:137 mat-gui:363 -msgid "Filename" -msgstr "Fitxategi izena" - -#: mat-gui:137 mat-gui:365 -msgid "Mimetype" -msgstr "MIME mota" +#: mat-gui:188 +msgid "Website" +msgstr "Webgunea" -#: mat-gui:137 -msgid "State" -msgstr "Egoera" +#: mat-gui:214 data/mat.ui:107 +msgid "Preferences" +msgstr "Hobespenak" -#: mat-gui:138 -msgid "Cleaned file" -msgstr "Garbitutako fitxategia" +#: mat-gui:228 +msgid "Reduce PDF quality" +msgstr "PDF kalitatea murriztu" -#: mat-gui:182 -msgid "Files" -msgstr "Fitxategiak" +#: mat-gui:231 +msgid "Reduce the produced PDF size and quality" +msgstr "Sortutako PDFaren neurri eta kalitatea murriztu" -#: mat-gui:188 -msgid "Edit" -msgstr "Editatu" +#: mat-gui:234 +msgid "Add unsupported file to archives" +msgstr "Gehitu fitxategi ez onartua artxiboetara" -#: mat-gui:189 -msgid "Clear the filelist" -msgstr "Garbitu fitxategi zerrenda" +#: mat-gui:238 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Gehitu fitxategi ez onartua (eta baita anonimotu gabekoa) irteera artxibora" -#: mat-gui:192 mat-gui:447 -msgid "Preferences" -msgstr "Hobespenak" +#: mat-gui:283 +msgid "Unknown" +msgstr "Ezezaguna" -#: mat-gui:195 -msgid "Process" -msgstr "Prozesua" +#: mat-gui:330 +msgid "Not-supported" +msgstr "Ez onartuak" -#: mat-gui:218 -msgid "Help" -msgstr "Laguntza" +#: mat-gui:347 +msgid "Unknown mimetype" +msgstr "Mime-mota ezezaguna" -#: mat-gui:219 mat-gui:395 -msgid "Supported formats" -msgstr "Onartutako formatuak" +#: mat-gui:354 data/mat.ui:291 +msgid "Filename" +msgstr "Fitxategi izena" -#: mat-gui:220 -msgid "About" -msgstr "Honi buruz" +#: mat-gui:356 +msgid "Mimetype" +msgstr "MIME mota" -#: mat-gui:241 -msgid "Choose files" -msgstr "Hautatu fitxategiak" +#: mat-gui:366 +#, python-format +msgid "Checking %s" +msgstr "%s egiaztatzen" -#: mat-gui:248 -msgid "All files" -msgstr "Fitxategi guztiak" +#: mat-gui:381 +#, python-format +msgid "Cleaning %s" +msgstr "%s garbitzen" -#: mat-gui:255 -msgid "Supported files" -msgstr "Onartutako fitxategiak" +#: data/mat.ui:63 +msgid "_File" +msgstr "_Fitxategia" -#: mat-gui:297 -msgid "unknow" -msgstr "ezezaguna" +#: data/mat.ui:99 +msgid "_Edit" +msgstr "_Editatu" -#: mat-gui:313 mat-gui:559 -msgid "Dirty" -msgstr "Zikina" +#: data/mat.ui:118 data/mat.ui:253 +msgid "Clear" +msgstr "Garbitu" -#: mat-gui:343 -msgid "Not-supported" -msgstr "Onartugabeak" +#: data/mat.ui:134 +msgid "_Process" +msgstr "_Prozesatu" -#: mat-gui:381 -msgid "This software was coded during the GSoC 2011" -msgstr "Software hau GSoC 2011ean kodeatua izan zen" +#: data/mat.ui:168 +msgid "_Help" +msgstr "_Laguntza" -#: mat-gui:386 -msgid "Website" -msgstr "Webgunea" +#: data/mat.ui:214 +msgid "Add" +msgstr "Gehitu" -#: mat-gui:461 -msgid "Force Clean" -msgstr "Garbiketa behartu" +#: data/mat.ui:240 +msgid "Check" +msgstr "Egiaztatu" -#: mat-gui:464 -msgid "Do not check if already clean before cleaning" -msgstr "Ez egiaztatu garbitu aurretik garbi badago" +#: data/mat.ui:308 +msgid "State" +msgstr "Egoera" -#: mat-gui:468 -msgid "Backup" -msgstr "Babeskopia" +#: data/mat.ui:346 data/mat.ui:495 +msgid "Metadata" +msgstr "Metadatuak" -#: mat-gui:471 -msgid "Keep a backup copy" -msgstr "Babeskopia bat gorde" +#: data/mat.ui:400 +msgid "Name" +msgstr "Izena" -#: mat-gui:474 -msgid "Reduce PDF quality" -msgstr "PDF kalitatea murriztu" +#: data/mat.ui:414 +msgid "Content" +msgstr "Edukia" -#: mat-gui:477 -msgid "Reduce the produced PDF size and quality" -msgstr "Sortutako PDFaren neurri eta kalitatea murriztu" +#: data/mat.ui:448 +msgid "Supported formats" +msgstr "Onartutako formatuak" -#: mat-gui:480 -msgid "Add unsupported file to archives" -msgstr "Gehitu onartugabeko fitxategia artxiboetara" +#: data/mat.ui:482 +msgid "Support" +msgstr "Onartu" -#: mat-gui:484 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Gehitu onartugabeko (eta baita anonimotu gabeko) fitxategia irteera artxibora" +#: data/mat.ui:508 +msgid "Method" +msgstr "Metodoa" -#: mat-gui:554 -#, python-format -msgid "Checking %s..." -msgstr "%s egiaztatzen..." +#: data/mat.ui:521 +msgid "Remaining" +msgstr "Faltan" -#: mat-gui:572 -#, python-format -msgid "Cleaning %s..." -msgstr "%s garbitzen..." +#: data/mat.ui:556 +msgid "Fileformat" +msgstr "Fitxategi-formatua"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit c45ffa51c5a05839f0b39e35dfb00efa8de0ce80 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 05:46:42 2013 +0000 Update translations for mat-gui --- eu.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eu.po b/eu.po index 0d64648..2b0e9cf 100644 --- a/eu.po +++ b/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-22 05:15+0000\n" +"PO-Revision-Date: 2013-07-22 05:30+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)lavabit.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,11 @@ msgstr "Sortutako PDFaren neurri eta kalitatea murriztu" #: mat-gui:234 msgid "Add unsupported file to archives" -msgstr "Gehitu onartugabeko fitxategia artxiboetara" +msgstr "Gehitu fitxategi ez onartua artxiboetara" #: mat-gui:238 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Gehitu onartugabeko (eta baita anonimotu gabeko) fitxategia irteera artxibora" +msgstr "Gehitu fitxategi ez onartua (eta baita anonimotu gabekoa) irteera artxibora" #: mat-gui:283 msgid "Unknown" @@ -86,7 +86,7 @@ msgstr "Ezezaguna" #: mat-gui:330 msgid "Not-supported" -msgstr "Onartugabeak" +msgstr "Ez onartuak" #: mat-gui:347 msgid "Unknown mimetype" @@ -124,11 +124,11 @@ msgstr "Garbitu" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Prozesatu" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Laguntza" #: data/mat.ui:214 msgid "Add" @@ -144,7 +144,7 @@ msgstr "Egoera" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" -msgstr "" +msgstr "Metadatuak" #: data/mat.ui:400 msgid "Name" @@ -152,7 +152,7 @@ msgstr "Izena" #: data/mat.ui:414 msgid "Content" -msgstr "" +msgstr "Edukia" #: data/mat.ui:448 msgid "Supported formats" @@ -160,16 +160,16 @@ msgstr "Onartutako formatuak" #: data/mat.ui:482 msgid "Support" -msgstr "" +msgstr "Onartu" #: data/mat.ui:508 msgid "Method" -msgstr "" +msgstr "Metodoa" #: data/mat.ui:521 msgid "Remaining" -msgstr "" +msgstr "Faltan" #: data/mat.ui:556 msgid "Fileformat" -msgstr "" +msgstr "Fitxategi-formatua"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit 732470dcec0910d3f2e2a0581ee1d3becb959e7b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 05:16:40 2013 +0000 Update translations for mat-gui --- eu.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/eu.po b/eu.po index ffb0775..0d64648 100644 --- a/eu.po +++ b/eu.po @@ -4,13 +4,14 @@ # # Translators: # Antxon Baldarra <baldarra(a)lavabit.com>, 2013 +# Antxon Baldarra <baldarra(a)lavabit.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-18 09:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-22 05:15+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)lavabit.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "Onartutako fitxategiak" #: mat-gui:164 msgid "No metadata found" -msgstr "" +msgstr "Ez da metadaturik aurkitu" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" @@ -49,11 +50,11 @@ msgstr "Zikina" #: mat-gui:172 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "%sren metadatuak" #: mat-gui:183 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Zaborrara bota zure meta, gorde zure datuak" #: mat-gui:188 msgid "Website" @@ -89,7 +90,7 @@ msgstr "Onartugabeak" #: mat-gui:347 msgid "Unknown mimetype" -msgstr "" +msgstr "Mime-mota ezezaguna" #: mat-gui:354 data/mat.ui:291 msgid "Filename" @@ -102,20 +103,20 @@ msgstr "MIME mota" #: mat-gui:366 #, python-format msgid "Checking %s" -msgstr "" +msgstr "%s egiaztatzen" #: mat-gui:381 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "%s garbitzen" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Fitxategia" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Editatu" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear"

1 0

[stem/master] Class for issuing remote descriptor queries
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 762f0ad396dd752f0f807871e0715c142cdbf475 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 5 19:18:02 2013 -0700 Class for issuing remote descriptor queries Adding a Query class which does most of the heavy lifting for downloading descriptors. --- stem/control.py | 4 +- stem/descriptor/__init__.py | 1 + stem/descriptor/remote.py | 174 ++++++++++++++++++++++++++++- stem/descriptor/server_descriptor.py | 3 + test/settings.cfg | 1 + test/unit/descriptor/remote.py | 126 +++++++++++++++++++++ test/unit/descriptor/server_descriptor.py | 8 +- 7 files changed, 308 insertions(+), 9 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8a8f410..0f589e1 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1255,8 +1255,8 @@ class Controller(BaseController): :raises: * :class:`stem.ControllerError` if unable to query the descriptor - * **ValueError** if **relay** doesn't conform with the patter for being a - fingerprint or nickname + * **ValueError** if **relay** doesn't conform with the pattern for being + a fingerprint or nickname An exception is only raised if we weren't provided a default response. """ diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index dc982f4..a527329 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -137,6 +137,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen :returns: iterator for :class:`~stem.descriptor.__init__.Descriptor` instances in the file :raises: + * **ValueError** if the contents is malformed and validate is True * **TypeError** if we can't match the contents of the file to a descriptor type * **IOError** if unable to read from the descriptor_file """ diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ea8dbb3..1f28bbd 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -4,8 +4,9 @@ """ Utilities for retrieving descriptors from directory authorities and mirrors. This is mostly done through the -:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues the -requests and provides back parsed content. For example... +:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues +:class:`~stem.descriptor.remote.Query` to get descriptor content. For +example... :: @@ -14,13 +15,174 @@ requests and provides back parsed content. For example... use_mirrors = True, ) + query = downloader.get_server_descriptors() + + print "Exit Relays:" + try: - for desc in downloader.get_server_descriptors(): + for desc in query.run(): if desc.exit_policy.is_exiting_allowed(): - print "%s (%s)" % (desc.nickname, desc.fingerprint) - except IOError, exc: - print "Unable to query the server descriptors: %s" % exc + print " %s (%s)" % (desc.nickname, desc.fingerprint) + + print + print "Query took %0.2f seconds" % query.runtime + except Exception as exc: + print "Unable to query the server descriptors: %s" % query.error + +If you don't care about errors then you can also simply iterate over the query +itself... + +:: + + for desc in downloader.get_server_descriptors(): + if desc.exit_policy.is_exiting_allowed(): + print " %s (%s)" % (desc.nickname, desc.fingerprint) """ +import sys +import threading +import time +import urllib2 + +import stem.descriptor + +# Tor directory authorities as of commit f631b73 (7/4/13): +# https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816 + +DIRECTORY_AUTHORITIES = { + 'moria1': ('128.31.0.39', 9131), + 'tor26': ('86.59.21.38', 80), + 'dizum': ('194.109.206.212', 80), + 'Tonga': ('82.94.251.203', 80), + 'turtles': ('76.73.17.194', 9030), + 'gabelmoo': ('212.112.245.170', 80), + 'dannenberg': ('193.23.244.244', 80), + 'urras': ('208.83.223.34', 443), + 'maatuska': ('171.25.193.9', 443), + 'Faravahar': ('154.35.32.5', 80), +} + + +class Query(object): + """ + Asynchronous request for descriptor content from a directory authority or + mirror. The caller can block on the response by either calling + :func:~stem.descriptor.remote.run: or iterating over our descriptor content. + + :var str address: address of the authority or mirror we're querying + :var int port: directory port we're querying + :var str resource: resource being fetched, such as '/tor/status-vote/current/consensus.z' + + :var Exception error: exception if a problem occured + :var bool is_done: flag that indicates if our request has finished + :var str descriptor_type: type of descriptors being fetched, see :func:`~stem.descriptor.__init__.parse_file` + + :var float start_time: unix timestamp when we first started running + :var float timeout: duration before we'll time out our request + :var float runtime: time our query took, this is **None** if it's not yet finished + """ + + def __init__(self, address, port, resource, descriptor_type, timeout = None, start = True): + self.address = address + self.port = port + self.resource = resource + + self.error = None + self.is_done = False + self.descriptor_type = descriptor_type + + self.start_time = None + self.timeout = timeout + self.runtime = None + + self._downloader_thread = None + self._downloader_thread_lock = threading.RLock() + + self._results = None # descriptor iterator + + if start: + self.start() + + def get_url(self): + """ + Provides the url being queried. + + :returns: **str** for the url being queried by this request + """ + + return "http://%s:%i/%s" % (self.address, self.port, self.resource.lstrip('/')) + + def start(self): + """ + Starts downloading the scriptors if we haven't started already. + """ + + with self._downloader_thread_lock: + if self._downloader_thread is None: + self._downloader_thread = threading.Thread(target = self._download_descriptors, name="Descriptor Query") + self._downloader_thread.setDaemon(True) + self._downloader_thread.start() + + def run(self, suppress = False): + """ + Blocks until our request is complete then provides the descriptors. If we + haven't yet started our request then this does so. + + :param bool suppress: avoids raising exceptions if **True** + + :returns: iterator for the requested :class:`~stem.descriptor.__init__.Descriptor` instances + + :raises: + Using the iterator can fail with the following if **suppress** is + **False**... + + * **ValueError** if the descriptor contents is malformed + * **socket.timeout** if our request timed out + * **urllib2.URLError** for most request failures + + Note that the urllib2 module may fail with other exception types, in + which case we'll pass it along. + """ + + with self._downloader_thread_lock: + self.start() + self._downloader_thread.join() + + if self.error: + if not suppress: + raise self.error + else: + if self._results is None: + if not suppress: + raise ValueError('BUG: _download_descriptors() finished without either results or an error') + + return + + try: + for desc in self._results: + yield desc + except ValueError as exc: + self.error = exc + + if not suppress: + raise self.error + + def __iter__(self): + for desc in self.run(True): + yield desc + + def _download_descriptors(self): + try: + self.start_time = time.time() + response = urllib2.urlopen(self.get_url(), timeout = self.timeout) + self.runtime = time.time() - self.start_time + + self._results = stem.descriptor.parse_file(response, self.descriptor_type) + except: + self.error = sys.exc_info()[1] + finally: + self.is_done = True + + class DescriptorDownloader(object): pass diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4af4976..d23f41e 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -136,6 +136,9 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True): else: yield RelayDescriptor(descriptor_text, validate, annotations) else: + if validate and annotations: + raise ValueError('Content conform to being a server descriptor:\n%s' % '\n'.join(annotations)) + break # done parsing descriptors diff --git a/test/settings.cfg b/test/settings.cfg index d5c0997..68b120d 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -156,6 +156,7 @@ test.unit_tests |test.unit.util.tor_tools.TestTorTools |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader +|test.unit.descriptor.remote.TestDescriptorDownloader |test.unit.descriptor.server_descriptor.TestServerDescriptor |test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.unit.descriptor.microdescriptor.TestMicrodescriptor diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py new file mode 100644 index 0000000..9e8b5cc --- /dev/null +++ b/test/unit/descriptor/remote.py @@ -0,0 +1,126 @@ +""" +Unit tests for stem.descriptor.remote. +""" + +import io +import socket +import unittest + +import stem.descriptor.remote + +from mock import patch + +# Output from requesting moria1's descriptor from itself... +# % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C… + +TEST_DESCRIPTOR = b"""\ +router moria1 128.31.0.34 9101 0 9131 +platform Tor 0.2.5.0-alpha-dev on Linux +protocols Link 1 2 Circuit 1 +published 2013-07-05 23:48:52 +fingerprint 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31 +uptime 1818933 +bandwidth 512000 62914560 1307929 +extra-info-digest 17D0142F6EBCDF60160EB1794FA6C9717D581F8C +caches-extra-info +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALzd4bhz1usB7wpoaAvP+BBOnNIk7mByAKV6zvyQ0p1M09oEmxPMc3qD +AAm276oJNf0eq6KWC6YprzPWFsXEIdXSqA6RWXCII1JG/jOoy6nt478BkB8TS9I9 +1MJW27ppRaqnLiTmBmM+qzrsgJGwf+onAgUKKH2GxlVgahqz8x6xAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALtJ9uD7cD7iHjqNA3AgsX9prES5QN+yFQyr2uOkxzhvunnaf6SNhzWW +bkfylnMrRm/qCz/czcjZO6N6EKHcXmypehvP566B7gAQ9vDsb+l7VZVWgXvzNc2s +tl3P7qpC08rgyJh1GqmtQTCesIDqkEyWxwToympCt09ZQRq+fIttAgMBAAE= +-----END RSA PUBLIC KEY----- +hidden-service-dir +contact 1024D/28988BF5 arma mit edu +ntor-onion-key 9ZVjNkf/iLEnD685SpC5kcDytQ7u5ViiI9JOftdbE0k= +reject *:* +router-signature +-----BEGIN SIGNATURE----- +Y8Tj2e7mPbFJbguulkPEBVYzyO57p4btpWEXvRMD6vxIh/eyn25pehg5dUVBtZlL +iO3EUE0AEYah2W9gdz8t+i3Dtr0zgqLS841GC/TyDKCm+MKmN8d098qnwK0NGF9q +01NZPuSqXM1b6hnl2espFzL7XL8XEGRU+aeg+f/ukw4= +-----END SIGNATURE----- +""" + + +class TestDescriptorDownloader(unittest.TestCase): + @patch('urllib2.urlopen') + def test_query_download(self, urlopen_mock): + """ + Check Query functionality when we successfully download a descriptor. + """ + + urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR) + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + ) + + expeced_url = 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…' + self.assertEqual(expeced_url, query.get_url()) + + descriptors = list(query) + self.assertEqual(1, len(descriptors)) + desc = descriptors[0] + + self.assertEqual('moria1', desc.nickname) + self.assertEqual('128.31.0.34', desc.address) + self.assertEqual('9695DFC35FFEB861329B9F1AB04C46397020CE31', desc.fingerprint) + self.assertEqual(TEST_DESCRIPTOR, desc.get_bytes()) + + urlopen_mock.assert_called_once_with(expeced_url, timeout = None) + + @patch('urllib2.urlopen') + def test_query_with_malformed_content(self, urlopen_mock): + """ + Query with malformed descriptor content. + """ + + descriptor_content = b'some malformed stuff' + urlopen_mock.return_value = io.BytesIO(descriptor_content) + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + ) + + # checking via the iterator + + expected_error_msg = 'Content conform to being a server descriptor:\nsome malformed stuff' + + descriptors = list(query) + self.assertEqual(0, len(descriptors)) + self.assertEqual(ValueError, type(query.error)) + self.assertEqual(expected_error_msg, str(query.error)) + + # check via the run() method + + self.assertRaises(ValueError, list, query.run()) + + @patch('urllib2.urlopen') + def test_query_with_timeout(self, urlopen_mock): + urlopen_mock.side_effect = socket.timeout('connection timed out') + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + 5, + ) + + self.assertRaises(socket.timeout, list, query.run()) + urlopen_mock.assert_called_once_with( + 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…', + timeout = 5, + ) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index c679588..50f27f6 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -213,10 +213,16 @@ class TestServerDescriptor(unittest.TestCase): desc_text = b"@pepperjack very tasty\n@mushrooms not so much\n" desc_text += get_relay_server_descriptor(content = True) - desc_text += b"\ntrailing text that should be ignored, ho hum" + desc_text += b"\ntrailing text that should be invalid, ho hum" # running _parse_file should provide an iterator with a single descriptor desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) + self.assertRaises(ValueError, list, desc_iter) + + desc_text = b"@pepperjack very tasty\n@mushrooms not so much\n" + desc_text += get_relay_server_descriptor(content = True) + desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) + desc_entries = list(desc_iter) self.assertEquals(1, len(desc_entries)) desc = desc_entries[0]

1 0

[stem/master] Stub for a remote descriptor fetching module
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 65924aff93ef70c879175510e9cd2307e8507a9e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 20 08:57:36 2013 -0700 Stub for a remote descriptor fetching module Starting a module for remote descriptor fetching. Presently this just includes a no-op DescriptorDownloader class. Guts of this sucker are coming soon! --- stem/descriptor/__init__.py | 1 + stem/descriptor/remote.py | 26 ++++++++++++++++++++++++++ test/settings.cfg | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 7252e6a..dc982f4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -40,6 +40,7 @@ Package for parsing and processing descriptor data. __all__ = [ "export", "reader", + "remote", "extrainfo_descriptor", "server_descriptor", "microdescriptor", diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py new file mode 100644 index 0000000..ea8dbb3 --- /dev/null +++ b/stem/descriptor/remote.py @@ -0,0 +1,26 @@ +# Copyright 2013, Damian Johnson +# See LICENSE for licensing information + +""" +Utilities for retrieving descriptors from directory authorities and mirrors. +This is mostly done through the +:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues the +requests and provides back parsed content. For example... + +:: + + downloader = DescriptorDownloader( + cache = '/tmp/descriptor_cache', + use_mirrors = True, + ) + + try: + for desc in downloader.get_server_descriptors(): + if desc.exit_policy.is_exiting_allowed(): + print "%s (%s)" % (desc.nickname, desc.fingerprint) + except IOError, exc: + print "Unable to query the server descriptors: %s" % exc +""" + +class DescriptorDownloader(object): + pass diff --git a/test/settings.cfg b/test/settings.cfg index 16d8c8b..d5c0997 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -134,7 +134,7 @@ pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'mock' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 61 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 62 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes_impl' from line 51 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_impl' from line 57 pyflakes.ignore test/mocking.py => undefined name 'builtins'

1 0

[stem/master] Integ test to exercise each of the authorities
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit dc6632b5afba37111b9b2d6fb0c316cca1d9e046 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 14 11:44:57 2013 -0700 Integ test to exercise each of the authorities Adding an integration test that fetches moria1's descriptor from each of the directory authorities. This obviously requires network activity so it's run via the ONLINE target. This uncovered a couple interesting finds... * This is our first time actually using urllib2 (it was mocked previously), and its 'file like object' is incomplete. It lacks tell() and seek() which means that our parsers don't have random access. As such we need to read this all into memory and use a BytesIO.... damn. * The moria1 authority has an extra newline in its descriptor content. Why? Haven't a clue. Maybe it's running a different version of tor or maybe this is an artifact of fetching its own descriptor. Whatever it is, it's the only authority to do so. Simply stripping the content to avoid having our parser complain about this. --- stem/descriptor/remote.py | 8 +++++++ test/integ/descriptor/remote.py | 44 +++++++++++++++++++++++++++++++++++++++ test/settings.cfg | 1 + 3 files changed, 53 insertions(+) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ed86eda..3db72ea 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -39,6 +39,7 @@ itself... print " %s (%s)" % (desc.nickname, desc.fingerprint) """ +import io import sys import threading import time @@ -178,6 +179,13 @@ class Query(object): response = urllib2.urlopen(self.get_url(), timeout = self.timeout) self.runtime = time.time() - self.start_time + # This sucks. We need to read the full response into memory before + # processing the content. This is because urllib2 returns a 'file like' + # object that lacks tell() or seek(). Hence we need to read it into our + # own buffer that does support these. + + response = io.BytesIO(response.read().strip()) + self._results = stem.descriptor.parse_file(response, self.descriptor_type) except: self.error = sys.exc_info()[1] diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py new file mode 100644 index 0000000..7ac6757 --- /dev/null +++ b/test/integ/descriptor/remote.py @@ -0,0 +1,44 @@ +""" +Integration tests for stem.descriptor.remote. +""" + +import unittest + +import stem.descriptor.remote +import test.runner + +# Required to prevent unmarshal error when running this test alone. + +import stem.descriptor.networkstatus + +class TestDescriptorReader(unittest.TestCase): + def test_using_authorities(self): + """ + Fetches a descriptor from each of the directory authorities. This is + intended to check that DIRECTORY_AUTHORITIES is still up to date (that + addresses and ports haven't changed). + + This is hardcoded to fetch moria1's descriptor. If its fingerprint changes + then this test will need to be updated. + """ + + if test.runner.require_online(self): + return + + for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): + query = stem.descriptor.remote.Query( + address, + dirport, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + 30, + ) + + try: + descriptors = list(query.run()) + except Exception, exc: + self.fail("Unable to use %s (%s:%s, %s): %s" % (authority, address, dirport, type(exc), exc)) + + self.assertEqual(1, len(descriptors)) + self.assertEqual('moria1', descriptors[0].nickname) + diff --git a/test/settings.cfg b/test/settings.cfg index 68b120d..d0fd5b0 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -187,6 +187,7 @@ test.integ_tests |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem |test.integ.descriptor.reader.TestDescriptorReader +|test.integ.descriptor.remote.TestDescriptorReader |test.integ.descriptor.server_descriptor.TestServerDescriptor |test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.integ.descriptor.microdescriptor.TestMicrodescriptor

1 0

[stem/master] Workaround for screwy RuntimeError related to mock causing imports
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 762b7239e4866ba1b98212259e9751723e0865df Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 6 10:54:58 2013 -0700 Workaround for screwy RuntimeError related to mock causing imports The following isn't used by this directly, but we're still importing it due to a screwy aspect of how mock works. If patched() results in an import that we haven't done before then we can fail with... ====================================================================== ERROR: test_query_download ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/mock.py", line 1201, in patched return func(*args, **keywargs) ... File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 156, in parse_file import stem.descriptor.networkstatus RuntimeError: cannot unmarshal code objects in restricted execution mode I've only seen this arise when running this test directly (without the rest of the unit tests, some of which import networkstatus on their own). --- test/unit/descriptor/remote.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 9e8b5cc..079937b 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -10,6 +10,13 @@ import stem.descriptor.remote from mock import patch +# The following isn't used by this directly, but we're still importing it due +# to a screwy aspect of how mock works. If patched() results in an import that +# we haven't done before then we can fail with a RuntimeError. In practice this +# just arises if we run this unit test on its own. + +import stem.descriptor.networkstatus + # Output from requesting moria1's descriptor from itself... # % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…

1 0