tor-commits July 2013

tor-commits@lists.torproject.org

19 participants
1044 discussions

[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] Implementing a get_key_certificates() method
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 4d122b1a417fe318f0bb3d169688d25f3e749754 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 21 17:10:26 2013 -0700 Implementing a get_key_certificates() method Method for fetching key certificates for the authorities. This included a little work so parse_file() could return multiple certificates when they're concatenated together. --- stem/descriptor/__init__.py | 3 ++- stem/descriptor/networkstatus.py | 31 +++++++++++++++++++++++++++++++ stem/descriptor/remote.py | 36 ++++++++++++++++++++++++++++++++++++ test/integ/descriptor/remote.py | 30 ++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index e3b5a8b..14b29d1 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -237,7 +237,8 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto for desc in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type, validate = validate, document_handler = document_handler): yield desc elif descriptor_type == "dir-key-certificate-3" and major_version == 1: - yield stem.descriptor.networkstatus.KeyCertificate(descriptor_file.read(), validate = validate) + for desc in stem.descriptor.networkstatus._parse_file_key_certs(descriptor_file, validate = validate): + yield desc elif descriptor_type in ("network-status-consensus-3", "network-status-vote-3") and major_version == 1: document_type = stem.descriptor.networkstatus.NetworkStatusDocumentV3 diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index baf7f0a..ec21304 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -55,6 +55,7 @@ import stem.util.tor_tools import stem.version from stem.descriptor import ( + PGP_BLOCK_END, Descriptor, DocumentHandler, _get_descriptor_components, @@ -220,6 +221,36 @@ def _parse_file(document_file, document_type = None, validate = True, is_microde raise ValueError("Unrecognized document_handler: %s" % document_handler) +def _parse_file_key_certs(certificate_file, validate = True): + """ + Parses a file containing one or more authority key certificates. + + :param file certificate_file: file with key certificates + :param bool validate: checks the validity of the certificate's contents if + **True**, skips these checks otherwise + + :returns: iterator for :class:`stem.descriptor.networkstatus.KeyCertificate` + instance in the file + + :raises: + * **ValueError** if the key certificate content is invalid and validate is + **True** + * **IOError** if the file can't be read + """ + + while True: + keycert_content = _read_until_keywords("dir-key-certification", certificate_file) + + # we've reached the 'router-signature', now include the pgp style block + block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] + keycert_content += _read_until_keywords(block_end_prefix, certificate_file, True) + + if keycert_content: + yield stem.descriptor.networkstatus.KeyCertificate(bytes.join(b"", keycert_content), validate = validate) + else: + break # done parsing file + + class NetworkStatusDocument(Descriptor): """ Common parent for network status documents. diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index a009078..0aabd74 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -52,6 +52,7 @@ itself... |- get_extrainfo_descriptors - provides present :class:`~stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor` |- get_microdescriptors - provides present :class:`~stem.descriptor.microdescriptor.Microdescriptor` |- get_consensus - provides present :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` + |- get_key_certificates - provides present :class:`~stem.descriptor.networkstatus.KeyCertificate` +- query - request an arbitrary descriptor resource .. data:: MAX_DESCRIPTOR_BATCH_SIZE @@ -118,6 +119,8 @@ def _guess_descriptor_type(resource): return 'microdescriptor 1.0' elif resource.startswith('/tor/status-vote/'): return 'network-status-consensus-3 1.0' + elif resource.startswith('/tor/keys/'): + return 'dir-key-certificate-3 1.0' else: raise ValueError("Unable to determine the descriptor type for '%s'" % resource) @@ -517,6 +520,39 @@ class DescriptorDownloader(object): return self.query(resource + '.z', document_handler = document_handler, **query_args) + def get_key_certificates(self, authority_v3idents = None, **query_args): + """ + Provides the key certificates for authorities with the given fingerprints. + If no fingerprints are provided then this returns all present key + certificates. + + :param str authority_v3idents: fingerprint or list of fingerprints of the + authority keys, see `'v3ident' in tor's config.c + <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ + for the values. + :param query_args: additional arguments for the + :class:`~stem.descriptor.remote.Query` constructor + + :returns: :class:`~stem.descriptor.remote.Query` for the key certificates + + :raises: **ValueError** if we request more than 96 key certificates by + their identity fingerprints (this is due to a limit on the url length by + squid proxies). + """ + + resource = '/tor/keys/all.z' + + if isinstance(authority_v3idents, str): + authority_v3idents = [authority_v3idents] + + if authority_v3idents: + if len(authority_v3idents) > MAX_DESCRIPTOR_BATCH_SIZE: + raise ValueError("Unable to request more than %i key certificates at a time by their identity fingerprints" % MAX_DESCRIPTOR_BATCH_SIZE) + + resource = '/tor/keys/fp/%s.z' % '+'.join(authority_v3idents) + + return self.query(resource, **query_args) + def query(self, resource, **query_args): """ Issues a request for the given resource. diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index b3c549d..d11a4ae 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -6,6 +6,7 @@ import unittest import stem.descriptor.extrainfo_descriptor import stem.descriptor.microdescriptor +import stem.descriptor.networkstatus import stem.descriptor.remote import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor @@ -178,3 +179,32 @@ class TestDescriptorDownloader(unittest.TestCase): consensus = list(consensus_query) self.assertTrue(len(consensus) > 50) self.assertTrue(isinstance(consensus[0], stem.descriptor.router_status_entry.RouterStatusEntryV3)) + + def test_get_key_certificates(self): + """ + Exercises the downloader's get_key_certificates() method. + """ + + if test.runner.require_online(self): + return + elif test.runner.only_run_once(self, "test_get_key_certificates"): + return + + downloader = stem.descriptor.remote.DescriptorDownloader() + + single_query = downloader.get_key_certificates('D586D18309DED4CD6D57C18FDB97EFA96D330566') + + multiple_query = downloader.get_key_certificates([ + 'D586D18309DED4CD6D57C18FDB97EFA96D330566', + '14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4', + ]) + + single_query.run() + multiple_query.run() + + single_query_results = list(single_query) + self.assertEqual(1, len(single_query_results)) + self.assertEqual('D586D18309DED4CD6D57C18FDB97EFA96D330566', single_query_results[0].fingerprint) + self.assertTrue(isinstance(single_query_results[0], stem.descriptor.networkstatus.KeyCertificate)) + + self.assertEqual(2, len(list(multiple_query)))

1 0

[stem/master] Fixing "cannot unmarshal code" errors
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit d5b3ec93f44de01b21b27264e761fe8f09ec8012 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 21 10:45:56 2013 -0700 Fixing "cannot unmarshal code" errors Damnit python, your import scheme is stupidly confusing. The descriptor's __init__ module has a circular dependency with its contents. This is because the parse_file() function calls the constituent modules, while those modules need the Descriptor class from __init__. So far so good. Only trouble is that python's support for circular dependencies sucks. To address this I did lazy imports in __init__, so we imported within the parse_file() function. On the surface this seemed to work. All the tests certainly passed. The trouble is that this style of python import is buggy as hell. Turns out that lazy imports leave the module in question in a unexecutable state so this *only* works if you've also imported the module another time during the interpretor execution. Our tests did this, hence passing tests. I first encuntered "cannot unmarshal code" while writing the remote descritpor tests (both unit and integ). I was content to hack around this with superfluous import statements while this only manifested within the tests, but now I'm seeing it during general usage too... >>> from stem.descriptor.remote import DescriptorDownloader >>> list(DescriptorDownloader().get_microdescriptors('jzcx+1fHsi47Tu+vQIcyItgn4lKs6aKnFshQ0lZ2JTg')) Traceback (most recent call last): File "<stdin>", line 1, in <module> File "stem/descriptor/remote.py", line 311, in __iter__ for desc in self.run(True): File "stem/descriptor/remote.py", line 300, in run for desc in self._results: File "stem/descriptor/__init__.py", line 154, in parse_file import stem.descriptor.server_descriptor RuntimeError: cannot unmarshal code objects in restricted execution mode Joy. After much head scratching and forum reading it sounds like there's something magical about 'from' imports so switching the descriptor modules to that, and moving the __init__ imports to the end. I'm not entirely clear on the magic going on here, but its elmiminated the errors. --- stem/descriptor/__init__.py | 15 ++++++------ stem/descriptor/extrainfo_descriptor.py | 18 +++++++++----- stem/descriptor/microdescriptor.py | 13 ++++++---- stem/descriptor/networkstatus.py | 40 ++++++++++++++++++------------- stem/descriptor/router_status_entry.py | 16 +++++++++---- stem/descriptor/server_descriptor.py | 26 ++++++++++++-------- test/integ/descriptor/remote.py | 4 ---- test/unit/descriptor/remote.py | 7 ------ 8 files changed, 78 insertions(+), 61 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f1fdee4..e3b5a8b 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -151,11 +151,6 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen return - import stem.descriptor.server_descriptor - import stem.descriptor.extrainfo_descriptor - import stem.descriptor.networkstatus - import stem.descriptor.microdescriptor - # The tor descriptor specifications do not provide a reliable method for # identifying a descriptor file's type and version so we need to guess # based on its filename. Metrics descriptors, however, can be identified @@ -217,9 +212,6 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen def _parse_metrics_file(descriptor_type, major_version, minor_version, descriptor_file, validate, document_handler): # Parses descriptor files from metrics, yielding individual descriptors. This # throws a TypeError if the descriptor_type or version isn't recognized. - import stem.descriptor.server_descriptor - import stem.descriptor.extrainfo_descriptor - import stem.descriptor.networkstatus if descriptor_type == "server-descriptor" and major_version == 1: for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, is_bridge = False, validate = validate): @@ -541,3 +533,10 @@ def _get_descriptor_components(raw_contents, validate, extra_keywords = ()): return entries, extra_entries else: return entries + +# importing at the end to avoid circular dependencies on our Descriptor class + +import stem.descriptor.server_descriptor +import stem.descriptor.extrainfo_descriptor +import stem.descriptor.networkstatus +import stem.descriptor.microdescriptor diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index e9aea30..fac0991 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -72,11 +72,17 @@ import datetime import hashlib import re -import stem.descriptor import stem.util.connection import stem.util.enum import stem.util.str_tools +from stem.descriptor import ( + PGP_BLOCK_END, + Descriptor, + _read_until_keywords, + _get_descriptor_components, +) + # known statuses for dirreq-v2-resp and dirreq-v3-resp... DirResponse = stem.util.enum.Enum( ("OK", "ok"), @@ -156,11 +162,11 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True): """ while True: - extrainfo_content = stem.descriptor._read_until_keywords("router-signature", descriptor_file) + extrainfo_content = _read_until_keywords("router-signature", descriptor_file) # we've reached the 'router-signature', now include the pgp style block - block_end_prefix = stem.descriptor.PGP_BLOCK_END.split(' ', 1)[0] - extrainfo_content += stem.descriptor._read_until_keywords(block_end_prefix, descriptor_file, True) + block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] + extrainfo_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if extrainfo_content: if is_bridge: @@ -205,7 +211,7 @@ def _parse_timestamp_and_interval(keyword, content): raise ValueError("%s line's timestamp wasn't parsable: %s" % (keyword, line)) -class ExtraInfoDescriptor(stem.descriptor.Descriptor): +class ExtraInfoDescriptor(Descriptor): """ Extra-info descriptor document. @@ -400,7 +406,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): self._unrecognized_lines = [] - entries = stem.descriptor._get_descriptor_components(raw_contents, validate) + entries = _get_descriptor_components(raw_contents, validate) if validate: for keyword in self._required_fields(): diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 499e170..5834e18 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -66,10 +66,15 @@ Doing the same is trivial with server descriptors... import hashlib -import stem.descriptor import stem.descriptor.router_status_entry import stem.exit_policy +from stem.descriptor import ( + Descriptor, + _get_descriptor_components, + _read_until_keywords, +) + REQUIRED_FIELDS = ( "onion-key", ) @@ -99,7 +104,7 @@ def _parse_file(descriptor_file, validate = True): """ while True: - annotations = stem.descriptor._read_until_keywords("onion-key", descriptor_file) + annotations = _read_until_keywords("onion-key", descriptor_file) # read until we reach an annotation or onion-key line descriptor_lines = [] @@ -136,7 +141,7 @@ def _parse_file(descriptor_file, validate = True): break # done parsing descriptors -class Microdescriptor(stem.descriptor.Descriptor): +class Microdescriptor(Descriptor): """ Microdescriptor (`descriptor specification <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_) @@ -174,7 +179,7 @@ class Microdescriptor(stem.descriptor.Descriptor): self._annotation_lines = annotations if annotations else [] self._annotation_dict = None # cached breakdown of key/value mappings - entries = stem.descriptor._get_descriptor_components(raw_contents, validate) + entries = _get_descriptor_components(raw_contents, validate) self._parse(entries, validate) if validate: diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index f65c7dc..baf7f0a 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -49,12 +49,18 @@ For more information see :func:`~stem.descriptor.__init__.DocumentHandler`... import datetime import io -import stem.descriptor import stem.descriptor.router_status_entry import stem.util.str_tools import stem.util.tor_tools import stem.version +from stem.descriptor import ( + Descriptor, + DocumentHandler, + _get_descriptor_components, + _read_until_keywords, +) + # Version 2 network status document fields, tuples of the form... # (keyword, is_mandatory) @@ -138,7 +144,7 @@ KEY_CERTIFICATE_PARAMS = ( ) -def _parse_file(document_file, document_type = None, validate = True, is_microdescriptor = False, document_handler = stem.descriptor.DocumentHandler.ENTRIES): +def _parse_file(document_file, document_type = None, validate = True, is_microdescriptor = False, document_handler = DocumentHandler.ENTRIES): """ Parses a network status and iterates over the RouterStatusEntry in it. The document that these instances reference have an empty 'routers' attribute to @@ -180,24 +186,24 @@ def _parse_file(document_file, document_type = None, validate = True, is_microde else: raise ValueError("Document type %i isn't recognized (only able to parse v2, v3, and bridge)" % document_type) - if document_handler == stem.descriptor.DocumentHandler.DOCUMENT: + if document_handler == DocumentHandler.DOCUMENT: yield document_type(document_file.read(), validate) return # getting the document without the routers section - header = stem.descriptor._read_until_keywords((ROUTERS_START, FOOTER_START, V2_FOOTER_START), document_file) + header = _read_until_keywords((ROUTERS_START, FOOTER_START, V2_FOOTER_START), document_file) routers_start = document_file.tell() - stem.descriptor._read_until_keywords((FOOTER_START, V2_FOOTER_START), document_file, skip = True) + _read_until_keywords((FOOTER_START, V2_FOOTER_START), document_file, skip = True) routers_end = document_file.tell() footer = document_file.readlines() document_content = bytes.join(b"", header + footer) - if document_handler == stem.descriptor.DocumentHandler.BARE_DOCUMENT: + if document_handler == DocumentHandler.BARE_DOCUMENT: yield document_type(document_content, validate) - elif document_handler == stem.descriptor.DocumentHandler.ENTRIES: + elif document_handler == DocumentHandler.ENTRIES: desc_iterator = stem.descriptor.router_status_entry._parse_file( document_file, validate, @@ -214,7 +220,7 @@ def _parse_file(document_file, document_type = None, validate = True, is_microde raise ValueError("Unrecognized document_handler: %s" % document_handler) -class NetworkStatusDocument(stem.descriptor.Descriptor): +class NetworkStatusDocument(Descriptor): """ Common parent for network status documents. """ @@ -281,7 +287,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): # deprecated descriptor type - patches welcome if you want those checks. document_file = io.BytesIO(raw_content) - document_content = bytes.join(b"", stem.descriptor._read_until_keywords((ROUTERS_START, V2_FOOTER_START), document_file)) + document_content = bytes.join(b"", _read_until_keywords((ROUTERS_START, V2_FOOTER_START), document_file)) router_iter = stem.descriptor.router_status_entry._parse_file( document_file, @@ -297,7 +303,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): document_content += b"\n" + document_file.read() document_content = stem.util.str_tools._to_unicode(document_content) - entries = stem.descriptor._get_descriptor_components(document_content, validate) + entries = _get_descriptor_components(document_content, validate) if validate: self._check_constraints(entries) @@ -556,9 +562,9 @@ class _DocumentHeader(object): self._unrecognized_lines = [] - content = bytes.join(b"", stem.descriptor._read_until_keywords((AUTH_START, ROUTERS_START, FOOTER_START), document_file)) + content = bytes.join(b"", _read_until_keywords((AUTH_START, ROUTERS_START, FOOTER_START), document_file)) content = stem.util.str_tools._to_unicode(content) - entries = stem.descriptor._get_descriptor_components(content, validate) + entries = _get_descriptor_components(content, validate) self._parse(entries, validate) # doing this validation afterward so we know our 'is_consensus' and @@ -792,7 +798,7 @@ class _DocumentFooter(object): if not content: return # footer is optional and there's nothing to parse - entries = stem.descriptor._get_descriptor_components(content, validate) + entries = _get_descriptor_components(content, validate) self._parse(entries, validate, header) if validate: @@ -948,7 +954,7 @@ def _parse_int_mappings(keyword, value, validate): return results -class DirectoryAuthority(stem.descriptor.Descriptor): +class DirectoryAuthority(Descriptor): """ Directory authority information obtained from a v3 network status document. @@ -1034,7 +1040,7 @@ class DirectoryAuthority(stem.descriptor.Descriptor): else: key_cert_content = None - entries = stem.descriptor._get_descriptor_components(content, validate) + entries = _get_descriptor_components(content, validate) if validate and 'dir-source' != entries.keys()[0]: raise ValueError("Authority entries are expected to start with a 'dir-source' line:\n%s" % (content)) @@ -1168,7 +1174,7 @@ class DirectoryAuthority(stem.descriptor.Descriptor): return self._compare(other, lambda s, o: s <= o) -class KeyCertificate(stem.descriptor.Descriptor): +class KeyCertificate(Descriptor): """ Directory key certificate for a v3 network status document. @@ -1216,7 +1222,7 @@ class KeyCertificate(stem.descriptor.Descriptor): :raises: **ValueError** if a validity check fails """ - entries = stem.descriptor._get_descriptor_components(content, validate) + entries = _get_descriptor_components(content, validate) if validate: if 'dir-key-certificate-version' != entries.keys()[0]: diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 076baab..80b6623 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -23,10 +23,16 @@ import base64 import binascii import datetime -import stem.descriptor import stem.exit_policy import stem.util.str_tools +from stem.descriptor import ( + KEYWORD_LINE, + Descriptor, + _get_descriptor_components, + _read_until_keywords, +) + def _parse_file(document_file, validate, entry_class, entry_keyword = "r", start_position = None, end_position = None, section_end_keywords = (), extra_args = ()): """ @@ -64,7 +70,7 @@ def _parse_file(document_file, validate, entry_class, entry_keyword = "r", start # check if we're starting at the end of the section (ie, there's no entries to read) if section_end_keywords: first_keyword = None - line_match = stem.descriptor.KEYWORD_LINE.match(stem.util.str_tools._to_unicode(document_file.readline())) + line_match = KEYWORD_LINE.match(stem.util.str_tools._to_unicode(document_file.readline())) if line_match: first_keyword = line_match.groups()[0] @@ -75,7 +81,7 @@ def _parse_file(document_file, validate, entry_class, entry_keyword = "r", start return while end_position is None or document_file.tell() < end_position: - desc_lines, ending_keyword = stem.descriptor._read_until_keywords( + desc_lines, ending_keyword = _read_until_keywords( (entry_keyword,) + section_end_keywords, document_file, ignore_first = True, @@ -95,7 +101,7 @@ def _parse_file(document_file, validate, entry_class, entry_keyword = "r", start break -class RouterStatusEntry(stem.descriptor.Descriptor): +class RouterStatusEntry(Descriptor): """ Information about an individual router stored within a network status document. This is the common parent for concrete status entry types. @@ -147,7 +153,7 @@ class RouterStatusEntry(stem.descriptor.Descriptor): self._unrecognized_lines = [] - entries = stem.descriptor._get_descriptor_components(content, validate) + entries = _get_descriptor_components(content, validate) if validate: self._check_constraints(entries) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d23f41e..39d4645 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -34,7 +34,6 @@ import datetime import hashlib import re -import stem.descriptor import stem.descriptor.extrainfo_descriptor import stem.exit_policy import stem.prereq @@ -45,6 +44,14 @@ import stem.version from stem.util import log +from stem.descriptor import ( + PGP_BLOCK_END, + Descriptor, + _get_bytes_field, + _get_descriptor_components, + _read_until_keywords, +) + # relay descriptors must have exactly one of the following REQUIRED_FIELDS = ( "router", @@ -118,12 +125,12 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True): # to the caller). while True: - annotations = stem.descriptor._read_until_keywords("router", descriptor_file) - descriptor_content = stem.descriptor._read_until_keywords("router-signature", descriptor_file) + annotations = _read_until_keywords("router", descriptor_file) + descriptor_content = _read_until_keywords("router-signature", descriptor_file) # we've reached the 'router-signature', now include the pgp style block - block_end_prefix = stem.descriptor.PGP_BLOCK_END.split(' ', 1)[0] - descriptor_content += stem.descriptor._read_until_keywords(block_end_prefix, descriptor_file, True) + block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] + descriptor_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if descriptor_content: # strip newlines from annotations @@ -142,7 +149,7 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True): break # done parsing descriptors -class ServerDescriptor(stem.descriptor.Descriptor): +class ServerDescriptor(Descriptor): """ Common parent for server descriptors. @@ -216,8 +223,8 @@ class ServerDescriptor(stem.descriptor.Descriptor): # Only a few things can be arbitrary bytes according to the dir-spec, so # parsing them separately. - self.platform = stem.descriptor._get_bytes_field("platform", raw_contents) - self.contact = stem.descriptor._get_bytes_field("contact", raw_contents) + self.platform = _get_bytes_field("platform", raw_contents) + self.contact = _get_bytes_field("contact", raw_contents) raw_contents = stem.util.str_tools._to_unicode(raw_contents) @@ -272,8 +279,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): # influences the resulting exit policy, but for everything else the order # does not matter so breaking it into key / value pairs. - entries, policy = \ - stem.descriptor._get_descriptor_components(raw_contents, validate, ("accept", "reject")) + entries, policy = _get_descriptor_components(raw_contents, validate, ("accept", "reject")) self.exit_policy = stem.exit_policy.ExitPolicy(*policy) self._parse(entries, validate) diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 7c45118..b3c549d 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -11,10 +11,6 @@ import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor import test.runner -# Required to prevent unmarshal error when running this test alone. - -import stem.descriptor.networkstatus - class TestDescriptorDownloader(unittest.TestCase): def test_using_authorities(self): diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index fb2e3f0..3ea303b 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -10,13 +10,6 @@ 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

[stem/master] Adding remote descriptor sphinx docs to site
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 713b04632e6ca1120c6d5c2661206fd84c01904b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 21 18:37:48 2013 -0700 Adding remote descriptor sphinx docs to site Tidying up our pydocs and including it in our site. --- docs/api.rst | 5 +++- docs/api/descriptor/remote.rst | 5 ++++ docs/contents.rst | 1 + stem/descriptor/remote.py | 62 +++++++++++++++++++++------------------- 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 92eb200..b6a5d8f 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -22,7 +22,9 @@ Descriptors To read descriptors from disk use :func:`~stem.descriptor.__init__.parse_file` for individual files and `stem.descriptor.reader -<api/descriptor/reader.html>`_ for batches. +<api/descriptor/reader.html>`_ for batches. You can also use +`stem.descriptor.remote <api/descriptor/remote.html>`_ to download descriptors +remotely like tor does. * **Classes** @@ -34,6 +36,7 @@ individual files and `stem.descriptor.reader * `stem.descriptor.router_status_entry <api/descriptor/router_status_entry.html>`_ - Relay entries within a network status document. * `stem.descriptor.reader <api/descriptor/reader.html>`_ - Reads and parses descriptor files from disk. +* `stem.descriptor.remote <api/descriptor/remote.html>`_ - Downloads descriptors from directory mirrors and authorities. * `stem.descriptor.export <api/descriptor/export.html>`_ - Exports descriptors to other formats. Utilities diff --git a/docs/api/descriptor/remote.rst b/docs/api/descriptor/remote.rst new file mode 100644 index 0000000..eb0d30a --- /dev/null +++ b/docs/api/descriptor/remote.rst @@ -0,0 +1,5 @@ +Descriptor Remote +================= + +.. automodule:: stem.descriptor.remote + diff --git a/docs/contents.rst b/docs/contents.rst index 834ce0a..7c9720b 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -35,6 +35,7 @@ Contents api/descriptor/export api/descriptor/reader + api/descriptor/remote api/util/conf api/util/connection diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 0aabd74..da1df63 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -13,8 +13,8 @@ content. For example... from stem.descriptor.remote import DescriptorDownloader downloader = DescriptorDownloader( - cache = '/tmp/descriptor_cache', use_mirrors = True, + timeout = 10, ) query = downloader.get_server_descriptors() @@ -48,19 +48,19 @@ itself... DescriptorDownloader - Configurable class for issuing queries |- use_directory_mirrors - use directory mirrors to download future descriptors - |- get_server_descriptors - provides present :class:`~stem.descriptor.stem.descriptor.server_descriptor.ServerDescriptor` - |- get_extrainfo_descriptors - provides present :class:`~stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor` - |- get_microdescriptors - provides present :class:`~stem.descriptor.microdescriptor.Microdescriptor` - |- get_consensus - provides present :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` - |- get_key_certificates - provides present :class:`~stem.descriptor.networkstatus.KeyCertificate` + |- get_server_descriptors - provides present server descriptors + |- get_extrainfo_descriptors - provides present extrainfo descriptors + |- get_microdescriptors - provides present microdescriptors + |- get_consensus - provides the present consensus or router status entries + |- get_key_certificates - provides present authority key certificates +- query - request an arbitrary descriptor resource -.. data:: MAX_DESCRIPTOR_BATCH_SIZE +.. data:: MAX_FINGERPRINTS - Maximum number of server or extrainfo descriptors that can requested at a - time by their fingerprints. + Maximum number of descriptors that can requested at a time by their + fingerprints. -.. data:: MAX_MICRODESCRIPTOR_BATCH_SIZE +.. data:: MAX_MICRODESCRIPTOR_HASHES Maximum number of microdescriptors that can requested at a time by their hashes. @@ -86,8 +86,8 @@ from stem.util import log # Tor has a limited number of descriptors we can fetch explicitly by their # fingerprint or hashes due to a limit on the url length by squid proxies. -MAX_DESCRIPTOR_BATCH_SIZE = 96 -MAX_MICRODESCRIPTOR_BATCH_SIZE = 92 +MAX_FINGERPRINTS = 96 +MAX_MICRODESCRIPTOR_HASHES = 92 # Tor directory authorities as of commit f631b73 (7/4/13). This should only # include authorities with 'v3ident': @@ -134,7 +134,7 @@ class Query(object): To block on the response and get results either call :func:`~stem.descriptor.remote.Query.run` or iterate over the Query. The - :func:`~stem.descriptor.remote.run` method pass along any errors that + :func:`~stem.descriptor.remote.Query.run` method pass along any errors that arise... :: @@ -143,7 +143,7 @@ class Query(object): query = Query( '/tor/server/all.z', - 'server-descriptor 1.0', + descriptor_type = 'server-descriptor 1.0', timeout = 30, ) @@ -171,16 +171,18 @@ class Query(object): <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_). Commonly useful ones include... - ======== =========== + ===================================== =========== Resource Description - ======== =========== + ===================================== =========== /tor/server/all.z all present server descriptors /tor/server/fp/<fp1>+<fp2>+<fp3>.z server descriptors with the given fingerprints /tor/extra/all.z all present extrainfo descriptors /tor/extra/fp/<fp1>+<fp2>+<fp3>.z extrainfo descriptors with the given fingerprints /tor/micro/d/<hash1>-<hash2>.z microdescriptors with the given hashes /tor/status-vote/current/consensus.z present consensus - ======== =========== + /tor/keys/all.z key certificates for the authorities + /tor/keys/fp/<v3ident1>+<v3ident2>.z key certificates for specific authorities + ===================================== =========== The '.z' suffix can be excluded to get a plaintext rather than compressed response. Compression is handled transparently, so this shouldn't matter to @@ -211,7 +213,9 @@ class Query(object): :var bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise :var stem.descriptor.__init__.DocumentHandler document_handler: method in - which to parse the :class:`~stem.descriptor.networkstatus.NetworkStatusDocument` + which to parse a :class:`~stem.descriptor.networkstatus.NetworkStatusDocument` + + :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): @@ -432,8 +436,8 @@ class DescriptorDownloader(object): fingerprints = [fingerprints] if fingerprints: - if len(fingerprints) > MAX_DESCRIPTOR_BATCH_SIZE: - raise ValueError("Unable to request more than %i descriptors at a time by their fingerprints" % MAX_DESCRIPTOR_BATCH_SIZE) + if len(fingerprints) > MAX_FINGERPRINTS: + raise ValueError("Unable to request more than %i descriptors at a time by their fingerprints" % MAX_FINGERPRINTS) resource = '/tor/server/fp/%s.z' % '+'.join(fingerprints) @@ -462,8 +466,8 @@ class DescriptorDownloader(object): fingerprints = [fingerprints] if fingerprints: - if len(fingerprints) > MAX_DESCRIPTOR_BATCH_SIZE: - raise ValueError("Unable to request more than %i descriptors at a time by their fingerprints" % MAX_DESCRIPTOR_BATCH_SIZE) + if len(fingerprints) > MAX_FINGERPRINTS: + raise ValueError("Unable to request more than %i descriptors at a time by their fingerprints" % MAX_FINGERPRINTS) resource = '/tor/extra/fp/%s.z' % '+'.join(fingerprints) @@ -491,21 +495,21 @@ class DescriptorDownloader(object): if isinstance(hashes, str): hashes = [hashes] - if len(hashes) > MAX_MICRODESCRIPTOR_BATCH_SIZE: - raise ValueError("Unable to request more than %i microdescriptors at a time by their hashes" % MAX_MICRODESCRIPTOR_BATCH_SIZE) + if len(hashes) > MAX_MICRODESCRIPTOR_HASHES: + raise ValueError("Unable to request more than %i microdescriptors at a time by their hashes" % MAX_MICRODESCRIPTOR_HASHES) return self.query('/tor/micro/d/%s.z' % '-'.join(hashes), **query_args) - def get_consensus(self, document_handler = stem.descriptor.DocumentHandler.ENTRIES, authority_v3ident = None, **query_args): + def get_consensus(self, authority_v3ident = None, document_handler = stem.descriptor.DocumentHandler.ENTRIES, **query_args): """ Provides the present router status entries. - :param stem.descriptor.__init__.DocumentHandler document_handler: method in - which to parse the :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3` :param str authority_v3ident: fingerprint of the authority key for which to get the consensus, see `'v3ident' in tor's config.c <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ for the values. + :param stem.descriptor.__init__.DocumentHandler document_handler: method in + which to parse the :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3` :param query_args: additional arguments for the :class:`~stem.descriptor.remote.Query` constructor @@ -546,8 +550,8 @@ class DescriptorDownloader(object): authority_v3idents = [authority_v3idents] if authority_v3idents: - if len(authority_v3idents) > MAX_DESCRIPTOR_BATCH_SIZE: - raise ValueError("Unable to request more than %i key certificates at a time by their identity fingerprints" % MAX_DESCRIPTOR_BATCH_SIZE) + if len(authority_v3idents) > MAX_FINGERPRINTS: + raise ValueError("Unable to request more than %i key certificates at a time by their identity fingerprints" % MAX_FINGERPRINTS) resource = '/tor/keys/fp/%s.z' % '+'.join(authority_v3idents)

1 0

[stem/master] Remote descriptor fetching module
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 7f050ebfa475aeb39f6b1b4a0f7ad53620931646 Merge: b6c23b0 713b046 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 21 18:39:17 2013 -0700 Remote descriptor fetching module What started as a tor-dev@ thread has finally accumulated in a surprisingly simple module. This provides the ability to download tor descriptors from directory mirrors or authorities, and is made of up of two classes... * Query The core of the module. This is a request to download a given descriptor resource from a pool of authorities and/or mirrors. This retries failed requests and can be iterated over to get the descriptor results. * DescriptorDownloader A configurable class for issuing Queries. This provides only two things: simple methods to get common descriptor types, and an easy way of specifying default Query parameters. https://lists.torproject.org/pipermail/tor-dev/2013-May/004924.html https://trac.torproject.org/8257 docs/api.rst | 5 +- docs/api/descriptor/remote.rst | 5 + docs/contents.rst | 1 + stem/control.py | 4 +- stem/descriptor/__init__.py | 21 +- stem/descriptor/extrainfo_descriptor.py | 18 +- stem/descriptor/microdescriptor.py | 13 +- stem/descriptor/networkstatus.py | 71 +++- stem/descriptor/remote.py | 581 +++++++++++++++++++++++++++++ stem/descriptor/router_status_entry.py | 16 +- stem/descriptor/server_descriptor.py | 29 +- test/integ/descriptor/remote.py | 210 +++++++++++ test/runner.py | 1 + test/settings.cfg | 4 +- test/unit/descriptor/remote.py | 125 +++++++ test/unit/descriptor/server_descriptor.py | 8 +- 16 files changed, 1056 insertions(+), 56 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2013