March 2012 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 03 Mar '12

03 Mar '12

commit 248882f9f96925d4db223aee87ffaf9b76b21222 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 3 10:15:13 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 74 +++++++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index ee71b0e..4aafac0 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-02 21:45+0000\n" +"PO-Revision-Date: 2012-03-03 10:13+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1788,7 +1788,7 @@ msgstr "nedostatočné zdroje" msgctxt "MainWindow" msgid "unknown" -msgstr "neznáme" +msgstr "neznámy" msgctxt "MainWindow" msgid "Tor is not running" @@ -2048,15 +2048,15 @@ msgstr "" msgctxt "MainWindow" msgid "Installation Failed" -msgstr "" +msgstr "Inštalácia zlyhala" msgctxt "MainWindow" msgid "Vidalia was unable to install your software updates." -msgstr "" +msgstr "Vidalia nemohla nainštalovať softvérové aktualizácie" msgctxt "MainWindow" msgid "The following error occurred:" -msgstr "" +msgstr "Vyskytla sa nasledujúca chyba:" msgctxt "MainWindow" msgid "" @@ -2067,7 +2067,7 @@ msgstr "Všetko čo pošlete týmto pripojením môže byť monitorované. Skont msgctxt "MainWindow" msgid "failed (%1)" -msgstr "" +msgstr "zlyhalo (%1)" msgctxt "MainWindow" msgid "" @@ -2145,7 +2145,7 @@ msgstr "Textové súbory (*.txt)" msgctxt "MessageLog" msgid "Vidalia" -msgstr "" +msgstr "Vidalia" msgctxt "MessageLog" msgid "Find in Message Log" @@ -2169,15 +2169,15 @@ msgstr "Protokol správ" msgctxt "MessageLog" msgid "Message Filters..." -msgstr "Filter správ.." +msgstr "Filter správ..." msgctxt "MessageLog" msgid "Set message filters" -msgstr "Nastavenie filtra správ" +msgstr "Nastaviť filter správ" msgctxt "MessageLog" msgid "History Size..." -msgstr "Veľkosť histórie.." +msgstr "Veľkosť histórie..." msgctxt "MessageLog" msgid "Set maximum number of messages to display" @@ -2189,11 +2189,11 @@ msgstr "Vymazať" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" -msgstr "Vymažem všetky správy z protokolu správ (Ctrl+E)" +msgstr "Vymazať všetky správy z protokolu správ (Ctrl+E)" msgctxt "MessageLog" msgid "Ctrl+E" -msgstr "" +msgstr "Ctrl+E" msgctxt "MessageLog" msgid "Copy" @@ -2201,11 +2201,11 @@ msgstr "Kopírovať" msgctxt "MessageLog" msgid "Copy the selected messages to the clipboard (Ctrl+C)" -msgstr "Skopírujem vybrané správy do schránky (Ctrl+C)" +msgstr "Kopírovať vybrané správy do schránky (Ctrl+C)" msgctxt "MessageLog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "MessageLog" msgid "Select All" @@ -2213,11 +2213,11 @@ msgstr "Označiť všetko" msgctxt "MessageLog" msgid "Select all messages (Ctrl+A)" -msgstr "Označím všetky správy (Ctrl+A)" +msgstr "Označiť všetky správy (Ctrl+A)" msgctxt "MessageLog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "MessageLog" msgid "Save All" @@ -2225,7 +2225,7 @@ msgstr "Uložiť všetko" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "Uložím všetky správy do súboru" +msgstr "Uložiť všetky správy do súboru" msgctxt "MessageLog" msgid "Save Selected" @@ -2233,7 +2233,7 @@ msgstr "Uložiť označené" msgctxt "MessageLog" msgid "Save selected messages to a file" -msgstr "Uložím vybrané správy do súboru" +msgstr "Uložiť vybrané správy do súboru" msgctxt "MessageLog" msgid "Settings" @@ -2245,11 +2245,11 @@ msgstr "Otvorím nastavenia protokolu správ" msgctxt "MessageLog" msgid "Ctrl+T" -msgstr "" +msgstr "Ctrl+T" msgctxt "MessageLog" msgid "Help" -msgstr "Pomoc" +msgstr "Pomocník" msgctxt "MessageLog" msgid "Show the help browser" @@ -2265,7 +2265,7 @@ msgstr "Zavrieť" msgctxt "MessageLog" msgid "Close the Message Log" -msgstr "Zavriem protokol správ" +msgstr "Zavrieť protokol správ" msgctxt "MessageLog" msgid "Esc" @@ -2277,7 +2277,7 @@ msgstr "Hľadať" msgctxt "MessageLog" msgid "Find all messages containing the search text (Ctrl+F)" -msgstr "Vyhľadám všetky správy obsahujúce hľadaný text (Ctrl+F)" +msgstr "Vyhľadať všetky správy obsahujúce hľadaný text (Ctrl+F)" msgctxt "MessageLog" msgid "Ctrl+F" @@ -2297,7 +2297,7 @@ msgstr "Správa" msgctxt "MessageLog" msgid "Saves the current Message Log settings" -msgstr "Uložím aktuálne nastavenie protokolu správ" +msgstr "Uložiť aktuálne nastavenie protokolu správ" msgctxt "MessageLog" msgid "Save Settings" @@ -2305,7 +2305,7 @@ msgstr "Uložiť nastavenie" msgctxt "MessageLog" msgid "Cancels changes made to settings" -msgstr "Zruší zmeny vykonané v nastaveniach" +msgstr "Zrušiť zmeny vykonané v nastaveniach" msgctxt "MessageLog" msgid "Cancel" @@ -2321,7 +2321,7 @@ msgstr "Chyba" msgctxt "MessageLog" msgid "Warning" -msgstr "Upozornenie" +msgstr "Varovanie" msgctxt "MessageLog" msgid "Notice" @@ -2412,19 +2412,19 @@ msgid "" "Cannot write file %1\n" "\n" "%2." -msgstr "" +msgstr "Nemôžem zapísať súbor %1\n\n%2" msgctxt "NetViewer" msgid "Tor Network Map" -msgstr "" +msgstr "Mapa siete Tor" msgctxt "NetViewer" msgid "Refresh" -msgstr "" +msgstr "Obnoviť" msgctxt "NetViewer" msgid "Refresh the list of Tor relays and connections" -msgstr "" +msgstr "Obnoviť zoznam Tor relay a pripojení" msgctxt "NetViewer" msgid "Ctrl+R" @@ -2432,7 +2432,7 @@ msgstr "Ctrl+R" msgctxt "NetViewer" msgid "Help" -msgstr "Pomoc" +msgstr "Pomocník" msgctxt "NetViewer" msgid "Show the network map help" @@ -2444,7 +2444,7 @@ msgstr "Zobrazím pomoc mapy siete" msgctxt "NetViewer" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "NetViewer" msgid "Close" @@ -2452,7 +2452,7 @@ msgstr "Zavrieť" msgctxt "NetViewer" msgid "Close the network map" -msgstr "Zavriem mapu siete" +msgstr "Zavrieť mapu siete" msgctxt "NetViewer" msgid "Esc" @@ -2716,11 +2716,11 @@ msgstr "Kopírovať" msgctxt "RouterInfoDialog" msgid "Hibernating" -msgstr "Hybernovať" +msgstr "Uspať" msgctxt "RouterInfoDialog" msgid "Online" -msgstr "Zapojený" +msgstr "Pripojený" msgctxt "RouterInfoDialog" msgid "Offline" @@ -2732,7 +2732,7 @@ msgstr "Neznámy" msgctxt "RouterInfoDialog" msgid "Relay Details" -msgstr "Podrobnosti o relay" +msgstr "Podrobnosti o uzle" msgctxt "RouterInfoDialog" msgid "Summary" @@ -2784,7 +2784,7 @@ msgstr "Odpojený" msgctxt "RouterListItem" msgid "Hibernating" -msgstr "Hybernovať" +msgstr "Uspať" msgctxt "RouterListItem" msgid "%1 KB/s" @@ -2828,7 +2828,7 @@ msgctxt "ServerPage" msgid "" "Please upgrade your Tor software or configure Tor to act as a normal Tor " "relay." -msgstr "" +msgstr "Prosím aktualizujte Váš softvér Tor alebo ho nastavte tak, aby sa choval ako normálny Tor uzol." msgctxt "ServerPage" msgid "Your bridge relay is not running."

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 03 Mar '12

03 Mar '12

commit dfed96e81b24390716b8638f39c90d4c13eedc60 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 3 10:15:08 2012 +0000 Update translations for orbot --- values-es/strings.xml | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 5c9ad1c..63c92bd 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -155,7 +155,7 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="use_only_these_specified_nodes">Usar * sólamente * los nodos especificados</string> <string name="bridges">Puentes/Bridges</string> <string name="use_bridges">Utilizar Puentes/Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="bridges_obfuscated">Puentes ofuscados</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar nodos de entrada alternativos en la red Tor</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">Dirección IP y el puerto del puente/Bridge</string> @@ -201,10 +201,11 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="error_installing_binares">Los binario de Tor no se pudieron instalar o actualizar</string> <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string> <string name="pref_use_persistent_notifications_title">Notificaciones siempre encendidas</string> - <string name="notification_using_bridges">Bridges enabled!</string> + <string name="notification_using_bridges">Puentes activados!</string> <string name="default_bridges"></string> <string name="set_locale_title">Set Locale</string> <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="wizard_locale_title">Escoja lenguaje +</string> + <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string> </resources>

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 03 Mar '12

03 Mar '12

commit 9ebcfaa5f0e5f5ac5b1d425ef41e67091bdb4335 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 3 09:45:28 2012 +0000 Update translations for whisperback --- es/es.po | 73 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 37 insertions(+), 36 deletions(-) diff --git a/es/es.po b/es/es.po index b0d1817..73b54de 100644 --- a/es/es.po +++ b/es/es.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <itacronayu(a)hotmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-02-26 16:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-03-03 09:44+0000\n" +"Last-Translator: cronayu <itacronayu(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,47 +22,47 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "" +msgstr "Correo de contacto inválido: %s" #: ../whisperBack/whisperback.py:80 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "" +msgstr "Clave OpenPGP de contacto inválida: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "" +msgstr "Bloque publico de clave OpenPGP de contacto inválida" #: ../whisperBack/encryption.py:126 msgid "No keys found." -msgstr "" +msgstr "No se encontraron claves" #: ../whisperBack/exceptions.py:41 #, python-format msgid "" "The variable %s was not found in any of the configuation " "files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "La variable %s no se encontró en ninguna configuración de files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:114 msgid "Name of the affected software" -msgstr "" +msgstr "Nombre del software afectado" #: ../whisperBack/gui.py:115 msgid "Exact steps to reproduce the problem" -msgstr "" +msgstr "Pasos exactos para reproducir el problema" #: ../whisperBack/gui.py:116 msgid "Actual result / the problem" -msgstr "" +msgstr "Resultado actual / el problema" #: ../whisperBack/gui.py:117 msgid "Desired result" -msgstr "" +msgstr "Resultado deseado" #: ../whisperBack/gui.py:155 msgid "Unable to load a valid configuration." -msgstr "" +msgstr "No se pudo cargar una configuración valida" #: ../whisperBack/gui.py:177 #, python-format @@ -79,36 +80,36 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "" +msgstr "<h1>Ayudanos a arreglar tu error!</h1>⏎\n<p>Lea<a href=\"%s\"> nuestas instrucciones para reportar errores</a>.</p>⏎ \n<p><strong>No incluya mas informacion personal de la⏎ necesaria </strong></p>⏎ \n<h2>Sobre darnos una direccion de correo</h2>⏎ \n<p>Si no le importa revelar un par de bits de su identidad⏎ a los productores de Tails , puede proveer un correo electronico para⏎ permitirnos preguntar un poco mas sobre el error. Adicionalmente colocando⏎ una clave PGP nos permitira encriptar aquellas futuras⏎ comunicaciones.</p>⏎ \n<p>Cualquiera que lea esta respuesta probablemente inferira que usted es un⏎ usuario de Tails. ¿Es hora de preocuparse de cuanto puede confiar en sus⏎ proveedores de Internet y mensajeria ?</p>⏎\n" #: ../whisperBack/gui.py:229 msgid "Sending mail..." -msgstr "" +msgstr "Enviando correo..." #: ../whisperBack/gui.py:230 msgid "Sending mail" -msgstr "" +msgstr "Enviando correo" #. pylint: disable=C0301 #: ../whisperBack/gui.py:232 msgid "This could take a while..." -msgstr "" +msgstr "Esto podria tomar un momento..." #: ../whisperBack/gui.py:246 msgid "The contact email adress doesn't seem valid." -msgstr "" +msgstr "La direccion de correo de contacto no parece ser valida" #: ../whisperBack/gui.py:263 msgid "Unable to send the mail: SMTP error." -msgstr "" +msgstr "No se puede enviar el correo: error SMTP." #: ../whisperBack/gui.py:265 msgid "Unable to connect to the server." -msgstr "" +msgstr "No se pudo conectar al servidor." #: ../whisperBack/gui.py:267 msgid "Unable to create or to send the mail." -msgstr "" +msgstr "No se pudo crear o enviar el correo" #: ../whisperBack/gui.py:270 msgid "" @@ -117,24 +118,24 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n⏎ \n⏎ \nEl reporte de errores no pudo ser enviado, al parecer por problemas de conexion. Porfavor intente reconectarse a la red y clickear enviar una vez mas.⏎ \n⏎\nSi esto no funciona, le ofrecemos guardar el reporte de errores." #: ../whisperBack/gui.py:283 msgid "Your message has been sent." -msgstr "" +msgstr "Su mensaje ha sido enviado." #: ../whisperBack/gui.py:289 msgid "Unable to find encryption key." -msgstr "" +msgstr "No se pudo encontrar la clave de encripcion" #: ../whisperBack/gui.py:293 msgid "An error occured during encryption." -msgstr "" +msgstr "Ha ocurrido un error durante la encripcion" #: ../whisperBack/gui.py:313 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "No se pudo guardar %s" #. XXX: fix string #: ../whisperBack/gui.py:337 @@ -145,48 +146,48 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "" +msgstr "El reporte de errores no se pudo enviar, al parecer debido a errores de conexion.⏎\n⏎\nComo sugerencia le proponemos guardar el reporte de errores en un archivo en un disco USB e intentar enviarnos %s desde una cuenta de correo usando otro sistema. Notese que su reporte de errores no sera anonimo cuando lo haga a menos que tome las medidas necesarias por cuenta propia (ej: usar Tor con una doble cuenta) ⏎ \n⏎\n¿Quiere guardar el reporte de errores en un archivo?" #: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 msgid "WhisperBack" -msgstr "" +msgstr "Whisperback" #: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 msgid "Send feedback in an encrypted mail." -msgstr "" +msgstr "Enviar feedback en un correo encriptado" #: ../whisperBack/gui.py:405 msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2011 Desarrolladores de Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" -msgstr "" +msgstr "Desarrolladores de Tails <tails(a)boum.org>" #: ../whisperBack/gui.py:407 msgid "translator-credits" -msgstr "" +msgstr "Creditos de traductor" #: ../whisperBack/gui.py:434 msgid "This doesn's seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "Esto no parece ser una URL valida o una clave OpenPGP" #: ../data/whisperback.ui.h:1 msgid "" "Add a PGP key if you want us to encrypt messages when we respond to you." -msgstr "" +msgstr "Añada una clave PGP si quiere que encriptemos los mensajes cuando le respondamos." #: ../data/whisperback.ui.h:2 msgid "Bug description" -msgstr "" +msgstr "Descripcion del error" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2011 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2011 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" -msgstr "" +msgstr "Ayuda." #: ../data/whisperback.ui.h:5 msgid ""

1 0

[gettor/master] More directory moving to make GetTor more standard compliant
by kaner＠torproject.org 03 Mar '12

03 Mar '12

commit fc340152a35c026e73b0336d3d8cc3b0bc2c129e Author: Christian Fromme <kaner(a)strace.org> Date: Sat Mar 3 07:49:07 2012 +0100 More directory moving to make GetTor more standard compliant --- GetTor.py | 5 +++-- lib/gettor/i18n.py | 2 +- lib/gettor/packages.py | 7 ++++--- lib/gettor/responses.py | 21 ++++++++++++++------- lib/gettor/utils.py | 16 ++++++++-------- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/GetTor.py b/GetTor.py index d9c378d..106a2a3 100644 --- a/GetTor.py +++ b/GetTor.py @@ -30,7 +30,7 @@ def initializeLogging(cfg): level = getattr(logging, level) extra = {} logfileName = cfg.LOGFILE + "-" + strftime("%Y-%m-%d") + ".log" - logDir = os.path.join(cfg.BASEDIR, "log") + logDir = os.path.join(cfg.BASEDIR, 'var', 'log') if not gettor.utils.createDir(logDir): # Fall back to /tmp in case of an error logDir="/tmp" @@ -54,7 +54,8 @@ def processFail(conf, rawMessage, failedAction, e=None): if conf.DUMPFILE != "": # Keep a copy of the failed email for later reference logging.info("We'll keep a record of this mail.") - dumpFile = os.path.join(conf.BASEDIR, conf.DUMPFILE) + dumpFile = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', + conf.DUMPFILE) gettor.utils.dumpMessage(dumpFile, rawMessage) def processMail(conf): diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 45b95a5..b88d932 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -10,7 +10,7 @@ def getLang(lang, config): """Return the Translation instance for a given language. If no Translation instance is found, return the one for 'en' """ - localeDir = os.path.join(config.BASEDIR, "i18n") + localeDir = os.path.join(config.BASEDIR, 'share', 'i18n') fallback = config.DEFAULT_LOCALE return gettext.translation("gettor", localedir=localeDir, languages=[lang], fallback=fallback) diff --git a/lib/gettor/packages.py b/lib/gettor/packages.py index 9388361..124c1a5 100644 --- a/lib/gettor/packages.py +++ b/lib/gettor/packages.py @@ -59,9 +59,10 @@ class Packages: def __init__(self, config, silent=False): self.packageList = {} - self.distDir = os.path.join(config.BASEDIR, "dist") - self.packDir = os.path.join(config.BASEDIR, "packages") - self.docDir = os.path.join(config.BASEDIR, "doc") + cache_dir = os.path.join(config.BASEDIR, 'var', 'cache', 'gettor') + self.distDir = os.path.join(cache_dir, 'dist') + self.packDir = os.path.join(cache_dir, 'packages') + self.docDir = os.path.join(cache_dir, 'doc') self.initRsync(config.RSYNC_MIRROR, silent) self.packageList = config.PACKAGES diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index dc3e73f..7ab6704 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -190,8 +190,10 @@ class Response: self.t = i18n.getLang(self.reqInfo['locale'], config) # Init black & whitelists - wlStateDir = os.path.join(self.config.BASEDIR, "wl") - blStateDir = os.path.join(self.config.BASEDIR, "bl") + wlStateDir = os.path.join(self.config.BASEDIR, 'var', 'cache', + 'gettor', 'wl') + blStateDir = os.path.join(self.config.BASEDIR, 'var', 'cache', + 'gettor', 'bl') self.wList = gettor.blacklist.BWList(wlStateDir, config.BLACKLIST_THRES) self.bList = gettor.blacklist.BWList(blStateDir, config.BLACKLIST_THRES) @@ -224,7 +226,8 @@ class Response: return True try: - package_path = os.path.join(self.config.BASEDIR, "packages", package + ".z") + package_path = os.path.join(self.config.BASEDIR, 'var', 'cache', + 'gettor', 'packages', package + ".z") package_size = os.path.getsize(package_path) if package_size <= max_attach: return True @@ -278,7 +281,8 @@ class Response: # Don't send anything return False logging.info("Sending out %s." % (pack)) - f = os.path.join(self.config.BASEDIR, "packages", pack + ".z") + f = os.path.join(self.config.BASEDIR, 'var', 'cache', 'gettor', + 'packages', pack + ".z") txt = getPackageMsg(self.t) msg = self.makeMsg(txt, to, fileName=f) msg = self.addUserManual(msg, self.reqInfo['locale']) @@ -299,7 +303,8 @@ class Response: fwd = self.reqInfo['forward'] to = self.reqInfo['user'] logging.info("Sending out %s." % (pack)) - f = os.path.join(self.config.BASEDIR, "packages", pack + ".z") + f = os.path.join(self.config.BASEDIR, 'var', 'cache', 'gettor', + 'packages', pack + ".z") text = getPackageMsg(self.t) msg = self.makeMsg(text, fwd, fileName=f) try: @@ -339,7 +344,8 @@ class Response: # `package.split' -- this is stupid because we let the user configure # split package names in gettor.conf. splitpack = self.reqInfo['package'] + ".split" - splitDir = os.path.join(self.config.BASEDIR, "packages", splitpack) + splitDir = os.path.join(self.config.BASEDIR, 'var', 'cache', 'gettor', + 'packages', splitpack) fileList = os.listdir(splitDir) # Sort the files, so we can send 01 before 02 and so on.. @@ -468,7 +474,8 @@ class Response: def addUserManual(self, message, lang="en"): """Add the short user manual to an existing message. """ - docDir = os.path.join(self.config.BASEDIR, "doc") + docDir = os.path.join(self.config.BASEDIR, 'var', 'cache', 'gettor', + 'doc') mName = "short-user-manual_" + lang + ".xhtml" docName = os.path.join(docDir, mName) if not os.access(docName, os.R_OK): diff --git a/lib/gettor/utils.py b/lib/gettor/utils.py index cc4cc2f..509f90d 100644 --- a/lib/gettor/utils.py +++ b/lib/gettor/utils.py @@ -110,7 +110,7 @@ def installCron(): def addWhitelistEntry(conf, address): """Add an entry to the global whitelist """ - wlStateDir = conf.BASEDIR + "/wl" + wlStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'wl') logging.debug("Adding address to whitelist: %s" % address) try: whiteList = gettor.blacklist.BWList(wlStateDir, conf.BLACKLIST_THRES) @@ -128,7 +128,7 @@ def addBlacklistEntry(conf, address): """Add an entry to the global blacklist """ logging.debug("Adding address to blacklist: %s" % address) - blStateDir = conf.BASEDIR + "/bl" + blStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'bl') try: blackList = gettor.blacklist.BWList(blStateDir, conf.BLACKLIST_THRES) except IOError, e: @@ -146,8 +146,8 @@ def lookupAddress(conf, address): """ logging.debug("Lookup address: %s" % address) found = False - wlStateDir = conf.BASEDIR + "/wl" - blStateDir = conf.BASEDIR + "/bl" + wlStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'wl') + blStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'bl') try: whiteList = gettor.blacklist.BWList(wlStateDir, conf.BLACKLIST_THRES) blackList = gettor.blacklist.BWList(blStateDir, conf.BLACKLIST_THRES) @@ -170,7 +170,7 @@ def lookupAddress(conf, address): def clearWhitelist(conf): """Delete all entries in the global whitelist """ - wlStateDir = conf.BASEDIR + "/wl" + wlStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'wl') try: whiteList = gettor.blacklist.BWList(wlStateDir, conf.BLACKLIST_THRES) except IOError, e: @@ -189,7 +189,7 @@ def clearBlacklist(conf, olderThanDays): 'olderThanDays' days """ logging.debug("Clearing blacklist..") - blStateDir = conf.BASEDIR + "/bl" + blStateDir = os.path.join(conf.BASEDIR, 'var', 'cache', 'gettor', 'bl') try: blackList = gettor.blacklist.BWList(blStateDir, conf.BLACKLIST_THRES) except IOError, e: @@ -209,7 +209,7 @@ def setCmdPassword(conf, password): logging.debug("Setting command password") passwordHash = str(hashlib.sha1(password).hexdigest()) # Be nice: Create dir if it's not there - passFile = os.path.join(conf.BASEDIR, conf.PASSFILE) + passFile = os.path.join(conf.BASEDIR, 'etc', 'gettor', conf.PASSFILE) try: fd = open(passFile, 'w') fd.write(passwordHash) @@ -227,7 +227,7 @@ def verifyPassword(conf, password): """ candidateHash = str(hashlib.sha1(password).hexdigest()) try: - passFile = os.path.join(conf.BASEDIR, conf.PASSFILE) + passFile = os.path.join(conf.BASEDIR, 'etc', 'gettor', conf.PASSFILE) fd = open(passFile, 'r') passwordHash = fd.read() fd.close

1 0

[gettor/master] Install translations to $BASEDIR/share by default
by kaner＠torproject.org 03 Mar '12

03 Mar '12

commit cb3fb09b303bd9c955f7c5330c2f5f9b2f02f135 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Mar 3 07:20:34 2012 +0100 Install translations to $BASEDIR/share by default --- setup.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 28064ff..890180e 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from distutils.command.install_data import install_data as _install_data CONFIG_DEFAULTS = { - 'BASEDIR': "~/gettor", + 'BASEDIR': "~/", } class Config: @@ -90,7 +90,8 @@ class installData(_install_data): if lang.startswith('.'): continue basedirExpand = os.path.expanduser(config.BASEDIR) - lang_dir = os.path.join(basedirExpand, "i18n", lang, 'LC_MESSAGES') + lang_dir = os.path.join(basedirExpand, 'share', 'i18n', lang, + 'LC_MESSAGES') lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'gettor.mo') self.data_files.append( (lang_dir, [lang_file]) )

1 0

[gettor/master] Make GetTor installation more standard compliant
by kaner＠torproject.org 03 Mar '12

03 Mar '12

commit d24f82f2d8bbb67a965596807831b6455afaaac8 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Mar 3 07:01:15 2012 +0100 Make GetTor installation more standard compliant --- GetTor.py | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README | 58 +++++++++++----------- lib/GetTor.py | 152 --------------------------------------------------------- setup.cfg | 5 +- setup.py | 2 +- 5 files changed, 183 insertions(+), 186 deletions(-) diff --git a/GetTor.py b/GetTor.py new file mode 100644 index 0000000..d9c378d --- /dev/null +++ b/GetTor.py @@ -0,0 +1,152 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +__program__ = 'GetTor.py' +__url__ = 'https://gitweb.torproject.org/gettor.git' +__author__ = 'Jacob Appelbaum <jacob(a)appelbaum.net>, Christian Fromme <kaner(a)strace.org>' +__copyright__ = 'Copyright (c) 2008, The Tor Project' +__license__ = 'See LICENSE for licensing information' + +try: + from future import antigravity +except ImportError: + antigravity = None + +import os +import sys +import logging +import traceback +import gettor.opt +import gettor.config +import gettor.requests +import gettor.responses +import gettor.utils +import gettor.filters +from time import strftime + + +def initializeLogging(cfg): + level = getattr(cfg, 'LOGLEVEL', 'WARNING') + level = getattr(logging, level) + extra = {} + logfileName = cfg.LOGFILE + "-" + strftime("%Y-%m-%d") + ".log" + logDir = os.path.join(cfg.BASEDIR, "log") + if not gettor.utils.createDir(logDir): + # Fall back to /tmp in case of an error + logDir="/tmp" + extra['filename'] = os.path.join(logDir, logfileName) + + print "Logfile is %s" % extra['filename'] + + logging.basicConfig(format='%(asctime)s [%(levelname)s] %(message)s', + datefmt="%Y-%m-%d %H:%M:%S", + level=level, + **extra) + +def processFail(conf, rawMessage, failedAction, e=None): + """This routine gets called when something went wrong with the processing + """ + logging.error("Failed to " + failedAction) + if e is not None: + logging.error("%s" % traceback.format_exc()) + logging.error("Here is the exception I saw: %s" % sys.exc_info()[0]) + logging.error("Detail: %s" %e) + if conf.DUMPFILE != "": + # Keep a copy of the failed email for later reference + logging.info("We'll keep a record of this mail.") + dumpFile = os.path.join(conf.BASEDIR, conf.DUMPFILE) + gettor.utils.dumpMessage(dumpFile, rawMessage) + +def processMail(conf): + """All mail processing happens here. Processing goes as follows: + - Parse request. This means: Find out everything we need to reply in + an appropriate manner. Reply address, language, package name. + Also try to find out if the user wants split packages and if he has + a valid signature on his mail. + - Do some filtering voodoo. + - Send reply. Use all information gathered from the request and pass + it on to the reply class/method to decide what to do. + """ + rawMessage = "" + reqInfo = None + logging.debug("Processing mail..") + # Retrieve request from stdin and parse it + try: + request = gettor.requests.requestMail(conf) + rawMessage = request.getRawMessage() + # reqval contains all important information we need from the request + reqInfo = request.parseMail() + except Exception as e: + processFail(conf, rawMessage, "process request", e) + return False + + # Do some filtering on the request + try: + reqInfo = gettor.filters.doFilter(reqInfo) + except Exception as e: + processFail(conf, rawMessage, "filter request", e) + return False + + # See if the filtering process decided if the request was valid + if reqInfo['valid'] is not True: + logging.error("Invalid request.") + processFail(conf, rawMessage, "send reply") + return False + + # Ok, request information aquired. Make it so. + try: + reply = gettor.responses.Response(conf, reqInfo) + if not reply.sendReply(): + processFail(conf, rawMessage, "send reply") + return False + return True + except Exception as e: + processFail(conf, rawMessage, "send reply (got exception)", e) + return False + +def processOptions(options, conf): + """Do everything that's not part of parsing a mail. Prepare GetTor usage, + install files, fetch packages, do some black/whitelist voodoo and so on + """ + + if options.fetchpackages: + gettor.utils.fetchPackages(conf) + if options.preppackages: + gettor.utils.prepPackages(conf) + if options.installcron: + gettor.utils.installCron() + if options.whitelist: + gettor.utils.addWhitelistEntry(conf, options.whitelist) + if options.blacklist: + gettor.utils.addBlacklistEntry(conf, options.blacklist) + if options.lookup: + gettor.utils.lookupAddress(conf, options.lookup) + if options.clearwl: + gettor.utils.clearWhitelist(conf) + if options.days: + gettor.utils.clearBlacklist(conf, options.days) + if options.cmdpass: + gettor.utils.setCmdPassword(conf, options.cmdpass) + +def main(): + """Parse command line, setup config and logging. + """ + options, arguments = gettor.opt.parseOpts() + config = gettor.config.Config(options.configfile) + initializeLogging(config) + + if sys.stdin.isatty(): + # We separate this because we need a way to know how we reply to the + # caller: Send mail/write log file or just dump to stdout/stderr. + processOptions(options, config) + print "Done." + else: + # We've got mail + if processMail(config): + logging.debug("Processing mail finished") + else: + logging.error("Processing mail failed") + logging.debug("Done.") + +if __name__ == "__main__": + main() diff --git a/README b/README index b7a2084..fc1bbf9 100644 --- a/README +++ b/README @@ -25,24 +25,23 @@ in case you need to. SETUP ----- -This setup descripton presumes that you have access to the latest gettor svn -trunk somewhere in your local file system. +This setup descripton presumes that you have access to the latest gettor source +code. - gettor@hostname:~/tmp$ svn co https://freehaven.net/svn/projects/gettor gettor + gettor@hostname:~/src$ git clone git://git.torproject.org/gettor.git -After checking out the GetTor source code, you will need to install everything -as follows: +After obtaining the GetTor source code, you will need to install it as follows: - gettor@hostname:~/tmp$ cd gettor/ - gettor@hostname:~/tmp/gettor$ python setup.py trans - gettor@hostname:~/tmp/gettor$ python setup.py install_data - gettor@hostname:~/tmp/gettor$ python setup.py install + gettor@hostname:~/src$ cd gettor/ + gettor@hostname:~/src/gettor$ python setup.py trans + gettor@hostname:~/src/gettor$ python setup.py install_data + gettor@hostname:~/src/gettor$ python setup.py install -This will copy necessary files to ~/opt/gettor. +This will copy necessary files to where they're needed. Once you have everything installed, you'll want to initialize the file store: - gettor@hostname:~/opt/gettor$ python GetTor.py -fp + gettor@hostname:~/src/gettor$ GetTor.py -fp You should see an rsync and finally something like: @@ -54,19 +53,19 @@ You should see an rsync and finally something like: Now you'll install the cronjob. This clears the blacklist and updates packages daily: - gettor@hostname:~/opt/gettor$ python GetTor.py -i + gettor@hostname:~/src/gettor$ GetTor.py -i Set up a password for package forwarding commands if you wish to use that feature: - gettor@hostname:~/opt/gettor$ python GetTor.py -s seCreTpAssworD + gettor@hostname:~/src/gettor$ GetTor.py -s seCreTpAssworD -The secret password will be stored in whereever `PASSFILE' is configured in -the configuration. +The secret password will be stored as a hash in whereever `PASSFILE' is +configured in the configuration. Finally, you need to setup email forwarding to the GetTor bot like so: - gettor@hostname:~$ echo "|python /home/g/opt/gettor/GetTor.py" > ~/.forward + gettor@hostname:~$ echo "| /home/gettor/bin/GetTor.py" > ~/.forward Now GetTor is installed, prepared and ready to serve files. Send it email! @@ -75,8 +74,8 @@ TRANSLATION FILES Provided there is a working locale environment, GetTor will compile and setup locale files for you as follows: - gettor@hostname:~/opt/gettor$ python setup.py trans - gettor@hostname:~/opt/gettor$ python setup.py install_data + gettor@hostname:~/src/gettor$ python setup.py trans + gettor@hostname:~/src/gettor$ python setup.py install_data To add a new language to GetTor, one must create a new .po file in subversion in the proper directory. For Korean, one would create po/ko/ and add the @@ -95,7 +94,7 @@ and should look similar to this: MAIL_FROM = "GetTor <gettor(a)torproject.org>" # Where it is all based at. Subdirs for GetTor start from here. - BASEDIR = "/home/gettor/gettor" + BASEDIR = "/home/gettor/run" # Should we send a `Your package will arrive soon, be patient' mail? DELAY_ALERT = True @@ -151,7 +150,7 @@ FILE SIZE ISSUES Some email providers may not be happy with the files GetTor sends. Gmail provides documentation of their incoming and outgoing file sizes. It is -currently 20MB (though we have sent around 21MB without issue): +currently 25MB (though we have sent around 26MB without issue): http://mail.google.com/support/bin/answer.py?hl=en&answer=8770 @@ -177,22 +176,21 @@ unique email address is allowed to mail GetTor the same type of mail once each sendSplitPackage. Blacklists are stored in the form of hashed email files under directories. In reality, that looks as follows: - gettor@hostname:~/opt/gettor$ ls -d /home/gettor/gettor/bl/* - /home/gettor/gettor/bl/general - /home/gettor/gettor/bl/sendPackage - /home/gettor/gettor/bl/sendSplitPackage - /home/gettor/gettor/bl/sendDelayAlert - /home/gettor/gettor/bl/sendPackageHelp + gettor@hostname:~/$ ls -d /home/gettor/run/bl/* + /home/gettor/run/bl/general + /home/gettor/run/bl/sendPackage + /home/gettor/run/bl/sendSplitPackage + /home/gettor/run/bl/sendDelayAlert + /home/gettor/run/bl/sendPackageHelp - gettor@hostname:~/opt/gettor$ ls /home/gettor/gettor/bl/sendDelayAlert \ - | head -n 2 + gettor@hostname:~/$ ls /home/gettor/run/bl/sendDelayAlert | head -n 2 0154d8584c0afa6290e21098e7ab4cc635b7d50a 02a33e16feece8671f1274de62de32068a67cf20 In addition to this automatic blacklisting mechanism, there is the possibility to add blacklist entries by hand as follows: - gettor@hostname:~/opt/gettor$ python GetTor.py -b someone(a)evil.org + gettor@hostname:~/$ GetTor.py -b someone(a)evil.org Email addresses that are added this way, go to the general/ directory in the blacklist directory and will therefore be blocked from using GetTor in any way. @@ -200,7 +198,7 @@ blacklist directory and will therefore be blocked from using GetTor in any way. Besides the blacklisting mechanism, there is a whitelisting mechanism. It works analogous to the manual blacklisting mechanism: - gettor@hostname:~/opt/gettor$ python GetTor.py -w someone(a)heaven.org + gettor@hostname:~/$ GetTor.py -w someone(a)heaven.org Whitelisting wins over blacklisting. If a user if blacklisted for X, but also whitelisted, he will be allowed to do X. diff --git a/lib/GetTor.py b/lib/GetTor.py deleted file mode 100644 index d9c378d..0000000 --- a/lib/GetTor.py +++ /dev/null @@ -1,152 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -__program__ = 'GetTor.py' -__url__ = 'https://gitweb.torproject.org/gettor.git' -__author__ = 'Jacob Appelbaum <jacob(a)appelbaum.net>, Christian Fromme <kaner(a)strace.org>' -__copyright__ = 'Copyright (c) 2008, The Tor Project' -__license__ = 'See LICENSE for licensing information' - -try: - from future import antigravity -except ImportError: - antigravity = None - -import os -import sys -import logging -import traceback -import gettor.opt -import gettor.config -import gettor.requests -import gettor.responses -import gettor.utils -import gettor.filters -from time import strftime - - -def initializeLogging(cfg): - level = getattr(cfg, 'LOGLEVEL', 'WARNING') - level = getattr(logging, level) - extra = {} - logfileName = cfg.LOGFILE + "-" + strftime("%Y-%m-%d") + ".log" - logDir = os.path.join(cfg.BASEDIR, "log") - if not gettor.utils.createDir(logDir): - # Fall back to /tmp in case of an error - logDir="/tmp" - extra['filename'] = os.path.join(logDir, logfileName) - - print "Logfile is %s" % extra['filename'] - - logging.basicConfig(format='%(asctime)s [%(levelname)s] %(message)s', - datefmt="%Y-%m-%d %H:%M:%S", - level=level, - **extra) - -def processFail(conf, rawMessage, failedAction, e=None): - """This routine gets called when something went wrong with the processing - """ - logging.error("Failed to " + failedAction) - if e is not None: - logging.error("%s" % traceback.format_exc()) - logging.error("Here is the exception I saw: %s" % sys.exc_info()[0]) - logging.error("Detail: %s" %e) - if conf.DUMPFILE != "": - # Keep a copy of the failed email for later reference - logging.info("We'll keep a record of this mail.") - dumpFile = os.path.join(conf.BASEDIR, conf.DUMPFILE) - gettor.utils.dumpMessage(dumpFile, rawMessage) - -def processMail(conf): - """All mail processing happens here. Processing goes as follows: - - Parse request. This means: Find out everything we need to reply in - an appropriate manner. Reply address, language, package name. - Also try to find out if the user wants split packages and if he has - a valid signature on his mail. - - Do some filtering voodoo. - - Send reply. Use all information gathered from the request and pass - it on to the reply class/method to decide what to do. - """ - rawMessage = "" - reqInfo = None - logging.debug("Processing mail..") - # Retrieve request from stdin and parse it - try: - request = gettor.requests.requestMail(conf) - rawMessage = request.getRawMessage() - # reqval contains all important information we need from the request - reqInfo = request.parseMail() - except Exception as e: - processFail(conf, rawMessage, "process request", e) - return False - - # Do some filtering on the request - try: - reqInfo = gettor.filters.doFilter(reqInfo) - except Exception as e: - processFail(conf, rawMessage, "filter request", e) - return False - - # See if the filtering process decided if the request was valid - if reqInfo['valid'] is not True: - logging.error("Invalid request.") - processFail(conf, rawMessage, "send reply") - return False - - # Ok, request information aquired. Make it so. - try: - reply = gettor.responses.Response(conf, reqInfo) - if not reply.sendReply(): - processFail(conf, rawMessage, "send reply") - return False - return True - except Exception as e: - processFail(conf, rawMessage, "send reply (got exception)", e) - return False - -def processOptions(options, conf): - """Do everything that's not part of parsing a mail. Prepare GetTor usage, - install files, fetch packages, do some black/whitelist voodoo and so on - """ - - if options.fetchpackages: - gettor.utils.fetchPackages(conf) - if options.preppackages: - gettor.utils.prepPackages(conf) - if options.installcron: - gettor.utils.installCron() - if options.whitelist: - gettor.utils.addWhitelistEntry(conf, options.whitelist) - if options.blacklist: - gettor.utils.addBlacklistEntry(conf, options.blacklist) - if options.lookup: - gettor.utils.lookupAddress(conf, options.lookup) - if options.clearwl: - gettor.utils.clearWhitelist(conf) - if options.days: - gettor.utils.clearBlacklist(conf, options.days) - if options.cmdpass: - gettor.utils.setCmdPassword(conf, options.cmdpass) - -def main(): - """Parse command line, setup config and logging. - """ - options, arguments = gettor.opt.parseOpts() - config = gettor.config.Config(options.configfile) - initializeLogging(config) - - if sys.stdin.isatty(): - # We separate this because we need a way to know how we reply to the - # caller: Send mail/write log file or just dump to stdout/stderr. - processOptions(options, config) - print "Done." - else: - # We've got mail - if processMail(config): - logging.debug("Processing mail finished") - else: - logging.error("Processing mail failed") - logging.debug("Done.") - -if __name__ == "__main__": - main() diff --git a/setup.cfg b/setup.cfg index aa9f4ae..9fa8c68 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,3 @@ [install] -install-purelib=$HOME/opt/gettor -install-scripts=$HOME/opt/gettor -install-data=$HOME/opt/gettor +prefix=$HOME +install-data=$HOME diff --git a/setup.py b/setup.py index a88aed5..28064ff 100644 --- a/setup.py +++ b/setup.py @@ -104,7 +104,7 @@ setup(name='GetTor', url='https://www.torproject.org/gettor/', package_dir={'': 'lib'}, packages=['gettor'], - scripts = ["MakeStat.py"], + scripts = ["GetTor.py", "MakeStat.py"], py_modules=['GetTor'], long_description = """Really long text here.""", cmdclass={'trans': createTrans,

1 0

[ooni-probe/master] remove the antani debug lines
by art＠torproject.org 03 Mar '12

03 Mar '12

commit e8bbe67f3bfccbddceea2e00b71c1a928ecca5a0 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:43:42 2012 -0800 remove the antani debug lines --- tests/bridget.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index b85c112..d3c7158 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -241,8 +241,6 @@ ControlPort %s self.logger.info("Testing bridge: %s" % bridge) while True: - if (time.time() - debugupdate) > 40: - self.logger.debug("ANTANI: %s %s" % (bridge, o)) o = "" try: o = p.stdout.read(4096)

1 0

[ooni-probe/master] Add logging of Tors trackback when a bridge does not work
by art＠torproject.org 03 Mar '12

03 Mar '12

commit 0bfffb1952869b02076fe21641246834ab1b2976 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:59:18 2012 -0800 Add logging of Tors trackback when a bridge does not work --- tests/bridget.py | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index d3c7158..0a2cc4f 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -127,6 +127,12 @@ class BridgeT(Plugoo): return False def writetorrc(self, bridge): + """ + Write the torrc file for the tor process to be used + to test the bridge. + + :bridge the bridge to be tested + """ self.failures = [] prange = (49152, 65535) @@ -152,7 +158,8 @@ Bridge obfs2 %s DataDirectory %s ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed ControlPort %s -""" % (socksport, obfsbridge, datadir, controlport) +Log info file %s +""" % (socksport, obfsbridge, datadir, controlport, os.path.join(datadir,'tor.log')) else: self.logger.debug("Generating torrc file for bridge") if self.tor_greater_than('0.2.3.2'): @@ -163,14 +170,16 @@ bridge %s DataDirectory %s usemicrodescriptors 0 ControlPort %s -""" % (socksport, bridge, datadir, controlport) +Log info file %s +""" % (socksport, bridge, datadir, controlport, os.path.join(datadir,'tor.log')) else: torrc = """SocksPort %s UseBridges 1 bridge %s DataDirectory %s ControlPort %s -""" % (socksport, bridge, datadir, controlport) +Log info file %s +""" % (socksport, bridge, datadir, controlport, os.path.join(datadir,'tor.log')) with open(randomname, "wb") as f: f.write(torrc) @@ -306,6 +315,9 @@ ControlPort %s socket.wait_read(p.stdout.fileno(), timeout=ct) except: + lfh = open(os.path.join(tordir, 'tor.log'), 'r') + log = lfh.readlines() + lfh.close() self.logger.info("%s bridge does not work (%s s timeout)" % (bridge, timeout)) print "%s bridge does not work (%s s timeout)" % (bridge, timeout) self.failures.append(bridge) @@ -317,7 +329,8 @@ ControlPort %s 'Time': datetime.now(), 'Bridge': bridge, 'Working': False, - 'Descriptor': {} + 'Descriptor': {}, + 'Log': log } def experiment(self, *a, **kw):

1 0

[ooni-probe/master] Disable checking for publicness of a bridge
by art＠torproject.org 03 Mar '12

03 Mar '12

commit bd383663eff8703e0a78704703dbfba4dba46992 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:38:31 2012 -0800 Disable checking for publicness of a bridge --- tests/bridget.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index 03cf60c..b85c112 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -260,8 +260,10 @@ ControlPort %s except: self.logger.error("Error in connecting to Tor Control port") - public = self.is_public(bridgeinfo['fingerprint'], socksport) - self.logger.info("Public: %s" % public) + # XXX disable the public checking + #public = self.is_public(bridgeinfo['fingerprint'], socksport) + #self.logger.info("Public: %s" % public) + bandwidth = self.download_file(socksport) self.logger.info("Bandwidth: %s" % bandwidth)

1 0

[ooni-probe/master] Compare against Tor version 0.2.3.2 and fix #5207
by art＠torproject.org 03 Mar '12

03 Mar '12

commit b8d0d4a071c584dbfdf5af942ead18525abe5d41 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Mar 2 16:34:25 2012 -0800 Compare against Tor version 0.2.3.2 and fix #5207 --- tests/bridget.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tests/bridget.py b/tests/bridget.py index 52bff75..86901cd 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -94,6 +94,9 @@ class BridgeT(Plugoo): for i, x in enumerate(v_array): try: + if i > len(v_array_p): + break + if int(x) > int(v_array_p[i]): self.logger.info("The Tor version is greater than %s" % version) return True @@ -152,7 +155,7 @@ ControlPort %s """ % (socksport, obfsbridge, datadir, controlport) else: self.logger.debug("Generating torrc file for bridge") - if self.tor_greater_than('0.2.2'): + if self.tor_greater_than('0.2.3.2'): torrc = """SocksPort %s UseBridges 1

1 0