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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Nov '12

01 Nov '12

commit 3d60b0abee811eade8b446ef8c289666dcd6db77 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 1 12:45:53 2012 +0000 Update translations for liveusb-creator --- es/es.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/es/es.po b/es/es.po index 3b94377..634bc2f 100644 --- a/es/es.po +++ b/es/es.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: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-01 12:13+0000\n" +"PO-Revision-Date: 2012-11-01 12:41+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -91,7 +91,7 @@ msgstr "Instalación completa. Pulsa OK para cerrar este programa." msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se reseteará el MBR de este dispositivo." +msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." #: ../liveusb/gui.py:624 msgid "" @@ -120,7 +120,7 @@ msgstr "Siguiente" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un Sistema Operativo autoarrancable (LiveOS).\nSi continua, se sobreescribirá." +msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continua, se sobreescribirá." #: ../liveusb/gui.py:661 msgid "" @@ -188,36 +188,36 @@ msgstr "Extrayendo imágen autoarrancable (live image) del dispositivo USB..." #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Escrito el dispositivo a %(speed)d MB/sec" +msgstr "Escritura al dispositivo a %(speed)d MB/sec" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." -msgstr "Configurando un archivo OLPC de arranque..." +msgstr "Configurando un archivo de arranque OLPC (One Laptop Per Child)..." #: ../liveusb/creator.py:365 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "Se produjo un error ejecutando el siguiente comando: `%(command)s`.\nUn log más detallado del error ha sido escrito en '%(filename)s'." +msgstr "Hubo un problema ejecutando el siguiente comando: `%(command)s`. \nUn registro (log) más detallado del error ha sido escrito en '%(filename)s'." #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA1 de la imagen del LiveCD..." +msgstr "Verificando el checksum SHA1 de la imagen del CD de arranque (LiveCD)..." #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA256 de la imagen del LiveCD..." +msgstr "Verificando el checksum SHA256 de la imagen del CD de arranque (LiveCD)..." #: ../liveusb/creator.py:404 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "Error: El SHA1 de su CD Vivo es inválido. Debe ejecutar este programa con el argumento --noverify para omitir este chequeo de verificación." +msgstr "Error: El SHA1 de su CD de arranque (Live CD) no es válido. Puede ejecutar este programa con el modificador --noverify para evitar este chequeo de verificación." #: ../liveusb/creator.py:410 msgid "Unknown ISO, skipping checksum verification" -msgstr "ISO desconocido, omitiendo la verificación de suma" +msgstr "ISO desconocida, omitiendo la verificación del checksum" #: ../liveusb/creator.py:421 msgid "Not enough free space on device." @@ -226,7 +226,7 @@ msgstr "No hay suficiente espacio libre en el dispositivo." #: ../liveusb/creator.py:428 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "Creando %s MB de overlay persistente" +msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/creator.py:487 #, python-format @@ -235,22 +235,22 @@ msgstr "No fue posible copiar %(infile)s en %(outfile)s: %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "Eliminando Live OS" +msgstr "Eliminando el sistema operativo autoarracable (Live OS) existente" #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "No se pudo ejecutar chmod %(file)s: %(message)s" +msgstr "No fue posible completar chmod %(file)s: %(message)s" #: ../liveusb/creator.py:510 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "No fue posible eliminar el archivo del anterior LiveOS: %(message)s" +msgstr "No fue posible eliminar el archivo del anterior sistema operativo autoarrancable (LiveOS): %(message)s" #: ../liveusb/creator.py:522 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "No fue posible eliminar la carpeta del anterior LiveOS: %(message)s" +msgstr "No fue posible eliminar la carpeta del anterior sistema operativo autoarracable (LiveOS): %(message)s" #: ../liveusb/creator.py:573 #, python-format @@ -266,7 +266,7 @@ msgstr "Está usando una versión antigua de syslinux-extlinux que no soporta el #: ../liveusb/creator.py:718 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "Imposible escribir en %(device)s, ignorando." +msgstr "No fue posible escribir en %(device)s, omitiendo" #: ../liveusb/creator.py:737 #, python-format @@ -277,7 +277,7 @@ msgstr "Algunas particiones del dispositivo USB %(device)s están montadas. Ser #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "Sistema de ficheros no conocido. Debe reformatearse el dispositivo." +msgstr "Sistema de ficheros desconocido. Su dispositivo podría requerir ser formateado." #: ../liveusb/creator.py:789 #, python-format @@ -317,16 +317,16 @@ msgstr "Mount %s existe después de desmontar" #: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 msgid "Verifying filesystem..." -msgstr "Verificando sistema de archivo..." +msgstr "Verificando sistema de archivos..." #: ../liveusb/creator.py:907 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "Imposible cambiar el nombre del volumen: %(message)s" +msgstr "No fue posible cambiar la etiqueta del volumen: %(message)s" #: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 msgid "Installing bootloader..." -msgstr "Instalando bootloader..." +msgstr "Instalando sistema de arranque (bootloader)..." #: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 #, python-format @@ -336,7 +336,7 @@ msgstr "Eliminando %(file)s" #: ../liveusb/creator.py:1017 #, python-format msgid "%s already bootable" -msgstr "%s ya es de arranque" +msgstr "%s ya es arrancable" #: ../liveusb/creator.py:1037 msgid "Unable to find partition" @@ -350,12 +350,12 @@ msgstr "Formateando %(device)s como FAT32" #: ../liveusb/creator.py:1109 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "Reestableciendo el MBR de %s" +msgstr "Restableciendo Master Boot Record de %s" #: ../liveusb/creator.py:1112 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "No fue posible reiniciar el MBR. Podría no tener instalado el paquete `syslinux`" +msgstr "No fue posible restablecer el MBR. Podría no tener instalado el paquete `syslinux`" #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset" @@ -376,19 +376,19 @@ msgstr "Error probando el dispositivo" #: ../liveusb/creator.py:1197 msgid "Unable to find any removable device" -msgstr "No se pudo encontrar ningún dispositivo extraíble" +msgstr "No fue posible encontrar ningún dispositivo extraíble" #: ../liveusb/creator.py:1207 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "Asegúrese de que su unidad USB está conectado y formateado con el sistema de archivo FAT" +msgstr "Asegúrese de que su unidad USB está conectada y formateada con el sistema de archivos FAT" #: ../liveusb/creator.py:1210 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "Sistema de archivo no soportado: %s\nPor favor, respalde y de formato a su disco USB con el sistema de archivos FAT." +msgstr "Sistema de archivos no soportado: %s\nPor favor, haga copia de respaldo y dé formato a su memoria USB con el sistema de archivos FAT." #: ../liveusb/creator.py:1277 msgid ""

1 0

[ooni-probe/master] * Updated the TODO file.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 049875766cacc75b993ced357fdd5a6cbeb160c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 12:39:23 2012 +0000 * Updated the TODO file. * ...and the Makefile because I moved echo.py and forgot to update its line. --- TODO | 27 ++++++++++----------------- bin/Makefile | 20 ++++++++++++++++---- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/TODO b/TODO index 7f532fd..2686ef7 100644 --- a/TODO +++ b/TODO @@ -9,24 +9,15 @@ Migrate code from old Migrate all the interesting parts of the old code to the new. -It's important to make the new code asych and based on gevent. +It's important to make the new code asych and based on Twisted. It should respect the design goals of the new ooni-probe model. -* All the parts related to HTTP and Squid (old/ooni/http.py) -effort: low, skill: medium - -* Misc scripts to detect censorship that are not written in any - version of OONI (old/ooni/plugins/old_stuff_to_convert/) -effort: low-medium, skill: low-medium - New things to develop --------------------- These are either components specific to the new refactor of ooni or that we haven't yet figured out how they should work. -* Design and implement the Worker and the Unit of Work classes - * Design and implement the Node Factory * Design and implement the Network Node and the Code Exec node classes @@ -34,12 +25,14 @@ or that we haven't yet figured out how they should work. New things to test ------------------ -Please check that the submodules are working correctly. From ../ooni-probe/, -do: - -$ git submodules init && git submodules update +* Some of the tests still give errors. This is top priority. -Make sure that they clone correctly, and run a few ooni tests to make sure -the import statements haven't broken. +* The submit-patch script is still a bit janky, and could use + some sprucing up. -Write unittests for *all of the things*. Can anyone suggest a good framework? \ No newline at end of file +* The Makefile that I made to serve a quick check for whether or not the tests + are broken could use some more tests added to it. One thing is that some + tests take certain types of input files, others take none at all, and + nowhere is this presented to someone trying to run a test. So, the informing + users/testers bit can be worked on, and the testing. Obviously we're going + to want something more robust that a 20 LOC Makefile pretty fast. diff --git a/bin/Makefile b/bin/Makefile index 039f596..307e81f 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -27,10 +27,10 @@ simpled: python -m pdb ../bin/ooniprobe ../nettests/simpletest.py -a ../ooni/assets/hostnames.txt echot: - ../bin/ooniprobe ../ooni/echo.py -f ../ooni/assets/hostnames.txt + ../bin/ooniprobe ../nettests/core/echo.py -f ../ooni/assets/hostnames.txt echod: - python -m pdb ../bin/ooniprobe ../ooni/echo.py -f ../ooni/assets/hostnames.txt + python -m pdb ../bin/ooniprobe ../nettests/core/echo.py -f ../ooni/assets/hostnames.txt captivet: ../bin/ooniprobe ../nettests/core/captiveportal.py -f ../ooni/assets/hostnames.txt @@ -38,5 +38,17 @@ captivet: captived: python -m pdb ../bin/ooniprobe --spew ../nettests/core/captiveportal.py -f ../ooni/assets/hostnames.txt -mvreports: - for $report in `find ../ -name "report*"`; do mv $report test-results ; done +dnst: + ../bin/ooniprobe ../nettests/core/dnstamper.py -f ../ooni/assets/hostnames.txt + +dnsd: + python -m pdb ../bin/ooniprobe --spew ../nettests/core/dnstamper.py -f ../ooni/assets/hostnames.txt + +squidt: + ../bin/ooniprobe ../nettests/core/squid.py -f ../ooni/assets/hostnames.txt + +squidd: + python -m pdb ../bin/ooniprobe --spew ../nettests/core/squid.py -f ../ooni/assets/hostnames.txt + +#mvreports: +# for $report in `find ../ -name "report*"`; do mv $report test-results #; done

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 01 Nov '12

01 Nov '12

commit a471258971437a396a41d52cf6afe49bd5a680cb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 1 12:15:59 2012 +0000 Update translations for liveusb-creator_completed --- es/es.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/es/es.po b/es/es.po index f550a2b..3b94377 100644 --- a/es/es.po +++ b/es/es.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: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-01 11:45+0000\n" +"PO-Revision-Date: 2012-11-01 12:13+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Advertencia: Esta herramienta debe ser ejecutada como Administrador. Para hacer esto, haz clic con el botón secundario en el icono y abre las Propiedades. Bajo la pestaña Compatibilidad, marca la casilla \"Ejecutar este programa como administrador\"." +msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto, haz clic con el botón secundario en el icono y abre las Propiedades. Bajo la pestaña Compatibilidad, marca la casilla \"Ejecutar este programa como un administrador\"." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" @@ -73,7 +73,7 @@ msgstr "No hay espacio libre en el dispositivo %(device)s" #: ../liveusb/gui.py:533 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "La partición es FAT16; Restringiendo el tamaño del overlay a 2G" +msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos a 2G" #: ../liveusb/gui.py:577 msgid "Persistent Storage" @@ -91,7 +91,7 @@ msgstr "Instalación completa. Pulsa OK para cerrar este programa." msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "El registro de arranque principal (MBR) de tu dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se reseteará el MBR de este dispositivo." +msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se reseteará el MBR de este dispositivo." #: ../liveusb/gui.py:624 msgid "" @@ -120,12 +120,12 @@ msgstr "Siguiente" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un SO Vivo.\nSi continua, se sobreescribirá." +msgstr "Su dispositivo ya contiene un Sistema Operativo autoarrancable (LiveOS).\nSi continua, se sobreescribirá." #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Advertencia: La creación de un overlay persistente borrará el actual existente." +msgstr "Advertencia: La creación persistente de un sistema de archivos borrará el existente actualmente." #: ../liveusb/gui.py:717 msgid "Download complete!" @@ -137,28 +137,28 @@ msgstr "Falló la descarga:" #: ../liveusb/gui.py:722 msgid "You can try again to resume your download" -msgstr "Puede intentar de nuevo reasumir la descarga" +msgstr "Puede intentar continuar con la descarga de nuevo" #: ../liveusb/gui.py:728 msgid "Select Live ISO" -msgstr "Seleccione ISO Vivo" +msgstr "Seleccione ISO Autoarrancable (Live ISO)" #: ../liveusb/gui.py:731 msgid "" "The selected file is unreadable.Please fix its permissions or select another" " file." -msgstr "No se puede leer el fichero seleccionado. Por favor, corrige los permisos o elige otro fichero." +msgstr "No se puede leer el archivo seleccionado. Por favor, corrija los permisos o elija otro fichero." #: ../liveusb/gui.py:737 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Imposible utilizar el fichero seleccionado. Puede que tengas más suerte si mueves la ISO a la carpeta raíz de tu unidad (por ejemplo, C:\\)" +msgstr "No fue posible utilizar el fichero seleccionado. Puede que tenga más suerte si mueve la ISO a la carpeta raíz de su unidad (por ejemplo, C:\\)" #: ../liveusb/gui.py:743 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s seleccionados" +msgstr "%(filename)s seleccionado(s)" #: ../liveusb/creator.py:91 msgid "You must run this application as root" @@ -167,11 +167,11 @@ msgstr "Debe ejecutar esta aplicación como root" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "El tipo de fuente no soporta verificación del checksum ISO MD5, omitiendo" +msgstr "El tipo de fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" -msgstr "Verificando la suma MD5 del ISO" +msgstr "Verificando el checksum MD5 de la ISO" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" @@ -179,11 +179,11 @@ msgstr "Falló la verificación ISO MD5" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" -msgstr "Verificación ISO MD5 pasada con éxito" +msgstr "El checksum MD5 de la ISO es correcto" #: ../liveusb/creator.py:144 msgid "Extracting live image to USB device..." -msgstr "Extrayendo la imágen viva en el dispositivo USB..." +msgstr "Extrayendo imágen autoarrancable (live image) del dispositivo USB..." #: ../liveusb/creator.py:151 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Nov '12

01 Nov '12

commit 67eb683e7ab9d5985adf4351e61a322b4bf2ea29 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 1 12:15:56 2012 +0000 Update translations for liveusb-creator --- es/es.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/es/es.po b/es/es.po index f550a2b..3b94377 100644 --- a/es/es.po +++ b/es/es.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: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-11-01 11:45+0000\n" +"PO-Revision-Date: 2012-11-01 12:13+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Advertencia: Esta herramienta debe ser ejecutada como Administrador. Para hacer esto, haz clic con el botón secundario en el icono y abre las Propiedades. Bajo la pestaña Compatibilidad, marca la casilla \"Ejecutar este programa como administrador\"." +msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto, haz clic con el botón secundario en el icono y abre las Propiedades. Bajo la pestaña Compatibilidad, marca la casilla \"Ejecutar este programa como un administrador\"." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" @@ -73,7 +73,7 @@ msgstr "No hay espacio libre en el dispositivo %(device)s" #: ../liveusb/gui.py:533 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "La partición es FAT16; Restringiendo el tamaño del overlay a 2G" +msgstr "La partición es FAT16; Restringiendo el tamaño del sistema de archivos a 2G" #: ../liveusb/gui.py:577 msgid "Persistent Storage" @@ -91,7 +91,7 @@ msgstr "Instalación completa. Pulsa OK para cerrar este programa." msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "El registro de arranque principal (MBR) de tu dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se reseteará el MBR de este dispositivo." +msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se reseteará el MBR de este dispositivo." #: ../liveusb/gui.py:624 msgid "" @@ -120,12 +120,12 @@ msgstr "Siguiente" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un SO Vivo.\nSi continua, se sobreescribirá." +msgstr "Su dispositivo ya contiene un Sistema Operativo autoarrancable (LiveOS).\nSi continua, se sobreescribirá." #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Advertencia: La creación de un overlay persistente borrará el actual existente." +msgstr "Advertencia: La creación persistente de un sistema de archivos borrará el existente actualmente." #: ../liveusb/gui.py:717 msgid "Download complete!" @@ -137,28 +137,28 @@ msgstr "Falló la descarga:" #: ../liveusb/gui.py:722 msgid "You can try again to resume your download" -msgstr "Puede intentar de nuevo reasumir la descarga" +msgstr "Puede intentar continuar con la descarga de nuevo" #: ../liveusb/gui.py:728 msgid "Select Live ISO" -msgstr "Seleccione ISO Vivo" +msgstr "Seleccione ISO Autoarrancable (Live ISO)" #: ../liveusb/gui.py:731 msgid "" "The selected file is unreadable.Please fix its permissions or select another" " file." -msgstr "No se puede leer el fichero seleccionado. Por favor, corrige los permisos o elige otro fichero." +msgstr "No se puede leer el archivo seleccionado. Por favor, corrija los permisos o elija otro fichero." #: ../liveusb/gui.py:737 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Imposible utilizar el fichero seleccionado. Puede que tengas más suerte si mueves la ISO a la carpeta raíz de tu unidad (por ejemplo, C:\\)" +msgstr "No fue posible utilizar el fichero seleccionado. Puede que tenga más suerte si mueve la ISO a la carpeta raíz de su unidad (por ejemplo, C:\\)" #: ../liveusb/gui.py:743 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s seleccionados" +msgstr "%(filename)s seleccionado(s)" #: ../liveusb/creator.py:91 msgid "You must run this application as root" @@ -167,11 +167,11 @@ msgstr "Debe ejecutar esta aplicación como root" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "El tipo de fuente no soporta verificación del checksum ISO MD5, omitiendo" +msgstr "El tipo de fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" -msgstr "Verificando la suma MD5 del ISO" +msgstr "Verificando el checksum MD5 de la ISO" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" @@ -179,11 +179,11 @@ msgstr "Falló la verificación ISO MD5" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" -msgstr "Verificación ISO MD5 pasada con éxito" +msgstr "El checksum MD5 de la ISO es correcto" #: ../liveusb/creator.py:144 msgid "Extracting live image to USB device..." -msgstr "Extrayendo la imágen viva en el dispositivo USB..." +msgstr "Extrayendo imágen autoarrancable (live image) del dispositivo USB..." #: ../liveusb/creator.py:151 #, python-format

1 0

[ooni-probe/master] * Prevent all of the legacy plugins from auto-instantiating though
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 2320c69037cd16baa720ecfe5d1ca57f2be87340 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 08:48:16 2012 +0000 * Prevent all of the legacy plugins from auto-instantiating though getPlugin(). --- ooni/__init__.py | 21 +++++++++++---------- ooni/plugins/__init__.py | 6 +++--- ooni/plugins/blocking.py | 2 +- ooni/plugins/bridget.py | 2 +- ooni/plugins/chinatrigger.py | 2 +- ooni/plugins/daphn3.py | 2 +- ooni/plugins/dnstamper.py | 2 +- ooni/plugins/domclass.py | 2 +- ooni/plugins/tcpconnect.py | 2 +- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 22ffb8b..e85436a 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,3 +1,11 @@ +__all__ = [ + 'config', 'inputunit', 'kit', + 'lib', 'nettest', 'oonicli', 'reporter', + 'runner', 'templates', 'utils', + ## XXX below are legacy related modules + 'ooniprobe', 'plugoo', 'plugins' + ] + from . import config from . import inputunit from . import kit @@ -9,14 +17,7 @@ from . import runner from . import templates from . import utils -# XXX below are legacy related modules +## XXX below are legacy related modules #from . import ooniprobe -#from . import plugoo -#from . import plugins - -__all__ = ['config', 'inputunit', 'kit', - 'lib', 'nettest', 'oonicli', 'reporter', - 'runner', 'templates', 'utils', - # XXX below are legacy related modules - #'ooniprobe', 'plugoo', 'plugins' - ] +from . import plugoo +from . import plugins diff --git a/ooni/plugins/__init__.py b/ooni/plugins/__init__.py index ddb8691..129108c 100644 --- a/ooni/plugins/__init__.py +++ b/ooni/plugins/__init__.py @@ -1,3 +1,3 @@ -from twisted.plugin import pluginPackagePaths -__path__.extend(pluginPackagePaths(__name__)) -__all__ = [] +#from twisted.plugin import pluginPackagePaths +#__path__.extend(pluginPackagePaths(__name__)) +#__all__ = [] diff --git a/ooni/plugins/blocking.py b/ooni/plugins/blocking.py index f3c20e1..4dd2db1 100644 --- a/ooni/plugins/blocking.py +++ b/ooni/plugins/blocking.py @@ -43,4 +43,4 @@ class BlockingTest(OONITest): # We need to instantiate it otherwise getPlugins does not detect it # XXX Find a way to load plugins without instantiating them. -blocking = BlockingTest(None, None, None) +#blocking = BlockingTest(None, None, None) diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index fcb60bb..5ff7b3f 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -484,7 +484,7 @@ class BridgetTest(OONITest): return self.d ## So that getPlugins() can register the Test: -bridget = BridgetTest(None, None, None) +#bridget = BridgetTest(None, None, None) ## ISIS' NOTES diff --git a/ooni/plugins/chinatrigger.py b/ooni/plugins/chinatrigger.py index 9873518..cf4bcb3 100644 --- a/ooni/plugins/chinatrigger.py +++ b/ooni/plugins/chinatrigger.py @@ -136,5 +136,5 @@ class ChinaTriggerTest(ScapyTest): return {} -chinatrigger = ChinaTriggerTest(None, None, None) +#chinatrigger = ChinaTriggerTest(None, None, None) diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index de3df26..bf4d60d 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -149,4 +149,4 @@ class daphn3Test(OONITest): # We need to instantiate it otherwise getPlugins does not detect it # XXX Find a way to load plugins without instantiating them. -daphn3test = daphn3Test(None, None, None) +#daphn3test = daphn3Test(None, None, None) diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py index e762b6c..40df505 100644 --- a/ooni/plugins/dnstamper.py +++ b/ooni/plugins/dnstamper.py @@ -335,4 +335,4 @@ class DNSTamperTest(OONITest): 'control-address': ctrl_address, 'tampering-detected': False} -dnstamper = DNSTamperTest(None, None, None) +#dnstamper = DNSTamperTest(None, None, None) diff --git a/ooni/plugins/domclass.py b/ooni/plugins/domclass.py index 38c03e4..3080c40 100644 --- a/ooni/plugins/domclass.py +++ b/ooni/plugins/domclass.py @@ -213,4 +213,4 @@ class domclassTest(HTTPTest): else: return {} -domclass = domclassTest(None, None, None) +#domclass = domclassTest(None, None, None) diff --git a/ooni/plugins/tcpconnect.py b/ooni/plugins/tcpconnect.py index 6082979..7758a9e 100644 --- a/ooni/plugins/tcpconnect.py +++ b/ooni/plugins/tcpconnect.py @@ -62,4 +62,4 @@ class tcpconnectTest(OONITest): # We need to instantiate it otherwise getPlugins does not detect it # XXX Find a way to load plugins without instantiating them. -tcpconnect = tcpconnectTest(None, None, None) +#tcpconnect = tcpconnectTest(None, None, None)

1 0

[ooni-probe/master] * Removed unused optFlags attribute from nettest.TestCase.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit d5e2a88eaf35283568ac8bd3906c8c3ef6e1e555 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 08:52:40 2012 +0000 * Removed unused optFlags attribute from nettest.TestCase. * Added log.debug statement to figure out where the error is coming from. --- ooni/nettest.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index bb9a404..ff16f0a 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -160,19 +160,17 @@ class TestCase(unittest.TestCase): continue elif attr.name is 'optParameters': cls._optParameters = attr.object - elif attr.name is 'optFlags': - log.debug("Applying %s.%s = %s to data descriptor..." - % (cls.__name__, "_"+attr.name, attr.object)) - cls._optParameters = attr.object else: log.debug("How did we get here? attr.name = %s" % attr.name) ''' + log.debug("Getting options for test") + if self.localOptions: if self.inputs[0] is not None or self.inputFile is not None: self.__get_inputs__() return self.localOptions else: - raise Exception, "could not find cls.localOptions! 234" + log.debug("could not find cls.localOptions!") # if options: # return options

1 0

[ooni-probe/master] * Removed duplicate "log started" statement.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 48f1ea12a07d17a34de23475308a532c57340ff7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 08:55:01 2012 +0000 * Removed duplicate "log started" statement. --- ooni/oonicli.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 9f1ec21..b9f1dee 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -88,7 +88,6 @@ class Options(usage.Options, app.ReactorSelectionMixin): def run(): log.start() - log.debug("Started logging") if len(sys.argv) == 1: sys.argv.append("--help")

1 0

[ooni-probe/master] * Fixed a bug with a statement which was trying to to derive a
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit ad771cd3265a4abfc4786d42ea0e7eb89786a986 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 08:56:31 2012 +0000 * Fixed a bug with a statement which was trying to to derive a key,value pair from a tuple. --- ooni/reporter.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index cedd016..b856948 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -178,10 +178,9 @@ class ReporterFactory(OReporter): @defer.inlineCallbacks def writeHeader(self): self.firstrun = False - options = self.options - log.debug("reporter.ReporterFactory.writeHeader(): options = %s" % options) + (klass, options) = self.options self._writeln("###########################################") - self._writeln("# OONI Probe Report for %s test" % options['name']) + self._writeln("# OONI Probe Report for %s test" % klass.name) self._writeln("# %s" % date.pretty_date()) self._writeln("###########################################") @@ -208,8 +207,8 @@ class ReporterFactory(OReporter): 'probeLocation': {'city': client_geodata['city'], 'countrycode': client_geodata['countrycode']}, - 'testName': options['name'], - 'testVersion': options['version'], + 'testName': klass.name, + 'testVersion': klass.version, } self.writeYamlLine(test_details) self._writeln('')

1 0

[ooni-probe/master] * Fixed whitespace, removed imports, marked another import because
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 22b58cf7279b3516feda1528092575b0c0f87fee Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 08:59:44 2012 +0000 * Fixed whitespace, removed imports, marked another import because it appears to cause errors. --- ooni/plugoo/tests.py | 1 - ooni/runner.py | 4 ++-- ooni/utils/log.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index c47e967..653dd67 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -140,4 +140,3 @@ class OONITest(object): log.msg("Starting test %s" % self.__class__) return self._do_experiment(args) - diff --git a/ooni/runner.py b/ooni/runner.py index e35ee02..36f5b6e 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -18,10 +18,11 @@ from twisted.trial.runner import isTestCase from twisted.trial.runner import filenameToModule from ooni.inputunit import InputUnitFactory -from ooni.nettest import InputTestSuite +from ooni.nettest import InputTestSuite, TestCase from ooni.plugoo import tests as oonitests from ooni.reporter import ReporterFactory from ooni.utils import log, date +from ooni.utils.assertions import isClass from ooni.utils.legacy import LegacyOONITest from ooni.utils.legacy import start_legacy_test, adapt_legacy_test @@ -142,7 +143,6 @@ def processTestOptions(cls, config): if cls.inputFile: cls.inputFile = opts[cls.inputFile[0]] - """ try: log.debug("%s: trying %s.localoptions.getOptions()..." diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 2b5c1ac..6e99dc6 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -11,6 +11,7 @@ from twisted.python import log as txlog from twisted.python.logfile import DailyLogFile from ooni.utils import otime +## error on import with new __init__ file: 31/10/12 from ooni import config # XXX make this a config option

1 0

[ooni-probe/master] * Organising unported code to a single directory.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 4b735fbff7733bd05a0b75f16306147030fd4abb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 1 09:56:10 2012 +0000 * Organising unported code to a single directory. --- ooni/hack_this/TO_BE_PORTED | 14 +++ ooni/hack_this/dnstamper.py | 200 ++++++++++++++++++++++++++++++++++++++++++ ooni/hack_this/tcpscan.py | 84 ++++++++++++++++++ ooni/hack_this/traceroute.py | 108 +++++++++++++++++++++++ 4 files changed, 406 insertions(+), 0 deletions(-) diff --git a/ooni/hack_this/TO_BE_PORTED b/ooni/hack_this/TO_BE_PORTED new file mode 100644 index 0000000..49ce5e0 --- /dev/null +++ b/ooni/hack_this/TO_BE_PORTED @@ -0,0 +1,14 @@ + +The tests in this directory are very old, and have neither been ported to +Twisted, nor to the new twisted.trial API framework. Although, they are not +old in the sense of the *seriously old* OONI code which was written two years +ago. + +These tests should be updated at least to use Twisted. + +If you want to hack on something care free, feel free to mess with these files +because it would be difficult to not improve on them. + +<(A)3 +isis +0x2cdb8b35 diff --git a/ooni/hack_this/dnstamper.py b/ooni/hack_this/dnstamper.py new file mode 100644 index 0000000..d6f87a6 --- /dev/null +++ b/ooni/hack_this/dnstamper.py @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- +""" + dnstamper + ********* + + This test resolves DNS for a list of domain names, one per line, in the + file specified in the ooni-config under the setting "dns_experiment". If + the file is top-1m.txt, the test will be run using Amazon's list of top + one million domains. The experimental dns servers to query should + be specified one per line in assets/dns_servers.txt. + + The test reports censorship if the cardinality of the intersection of + the query result set from the control server and the query result set + from the experimental server is zero, which is to say, if the two sets + have no matching results whatsoever. + + NOTE: This test frequently results in false positives due to GeoIP-based + load balancing on major global sites such as google, facebook, and + youtube, etc. + + :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft + :license: see LICENSE for more details + + TODO: + * Switch to using Twisted's DNS builtins instead of dnspython + * +""" + +import os + +from twisted.names import client +from twisted.internet import reactor +from twisted.internet.protocol import Factory, Protocol +from twisted.python import usage +from twisted.plugin import IPlugin +from zope.interface import implements + +from ooni.plugoo.assets import Asset +from ooni.plugoo.tests import ITest, OONITest +from ooni import log + +class Top1MAsset(Asset): + """ + Class for parsing the Alexa top-1m.txt as an asset. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + def parse_line(self, line): + self = Asset.parse_line(self, line) + return line.split(',')[1].replace('\n','') + +class DNSTamperAsset(Asset): + """ + Creates DNS testing specific Assets. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + +class DNSTamperArgs(usage.Options): + optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], + ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], + ['testservers', 't', None, 'Asset file of the DNS servers to test'], + ['resume', 'r', 0, 'Resume at this index in the asset file']] +''' + def control(self, experiment_result, args): + print "Experiment Result:", experiment_result + print "Args", args + return experiment_result + + def experiment(self, args): +''' + +class DNSTamperTest(OONITest): + implements(IPlugin, ITest) + + shortName = "DNSTamper" + description = "DNS censorship detection test" + requirements = None + options = DNSTamperArgs + blocking = False + + def load_assets(self): + if self.local_options: + if self.local_options['asset']: + assetf = self.local_options['asset'] + if assetf == 'top-1m.txt': + return {'asset': Top1MAsset(assetf)} + else: + return {'asset': DNSTamperAsset(assetf)} + else: + return {} + + def lookup(self, hostname, nameserver): + """ + Resolves a hostname through a DNS nameserver to the corresponding + IP addresses. + """ + def got_result(result): + #self.logger.log(result) + print result + reactor.stop() + + def got_failure(failure): + failure.printTraceback() + reactor.stop() + + res = client.createResolver(servers=[(nameserver, 53)]) + d = res.getHostByName(hostname) + d.addCallbacks(got_result, got_failure) + + ## XXX MAY ALSO BE: + #answer = res.getAddress(servers=[('nameserver', 53)]) + + ret = [] + + for data in answer: + ret.append(data.address) + + return ret + + def reverse_lookup(self, ip, nameserver): + """ + Attempt to do a reverse DNS lookup to determine if the control and exp + sets from a positive result resolve to the same domain, in order to + remove false positives due to GeoIP load balancing. + """ + res = client.createResolver(servers=nameserver) + n = reversename.from_address(ip) + revn = res.query(n, "PTR").__iter__().next().to_text()[:-1] + + return revn + + def experiment(self, *a, **kw): + """ + Compares the lookup() sets of the control and experiment groups. + """ + # this is just a dirty hack + address = kw['data'][0] + ns = kw['data'][1] + + config = self.config + ctrl_ns = config.tests.dns_control_server + + print "ADDRESS: %s" % address + print "NAMESERVER: %s" % ns + + exp = self.lookup(address, ns) + control = self.lookup(address, ctrl_ns) + + result = [] + + if len(set(exp) & set(control)) > 0: + print "Address %s has not tampered with on DNS server %s\n" % (address, ns) + result = (address, ns, exp, control, False) + return result + else: + print "Address %s has possibly been tampered on %s:\nDNS resolution through %s yeilds:\n%s\nAlthough the control group DNS servers resolve to:\n%s" % (address, ns, ns, exp, control) + result = (address, ns, exp, control, True) + + if config.tests.dns_reverse_lookup: + + exprevn = [self.reverse_lookup(ip, ns) for ip in exp] + ctrlrevn = [self.reverse_lookup(ip, ctrl_ns) + for ip in control] + + if len(set(exprevn) & set(ctrlrevn)) > 0: + print "Further testing has eliminated this as a false positive." + else: + print "Reverse DNS on the results returned by %s returned:\n%s\nWhich does not match the expected domainname:\n%s\n" % (ns, exprevn, ctrlrevn) + return result + + else: + print "\n" + return result + +#def run(ooni): +# """ +# Run the test. +# """ +# config = ooni.config +# urls = [] +# +# if (config.tests.dns_experiment == "top-1m.txt"): +# dns_experiment = Top1MAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# else: +# dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment_dns)) +# +# assets = [dns_experiment, dns_experiment_dns] +# +# dnstest = DNST(ooni) +# ooni.logger.info("Beginning dnstamper test...") +# dnstest.run(assets, {'index': 1}) +# ooni.logger.info("Dnstamper test completed!") + +dnstamper = DNSTamperTest(None, None, None) diff --git a/ooni/hack_this/tcpscan.py b/ooni/hack_this/tcpscan.py new file mode 100644 index 0000000..b371c88 --- /dev/null +++ b/ooni/hack_this/tcpscan.py @@ -0,0 +1,84 @@ +""" + TCP Port Scanner + **************** + + Does a TCP connect scan on the IP:port pairs. + +""" +import os +from gevent import socket +from datetime import datetime +import socks + +from plugoo.assets import Asset +from plugoo.tests import Test + +__plugoo__ = "TCP Port Scanner" +__desc__ = "This a test template to be used to build your own tests" + +class TCPScanAsset(Asset): + """ + This is the asset that should be used by the Test. It will + contain all the code responsible for parsing the asset file + and should be passed on instantiation to the test. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + +class TCPScan(Test): + """ + The main Test class + """ + + def experiment(self, *a, **kw): + """ + Fill this up with the tasks that should be performed + on the "dirty" network and should be compared with the + control. + """ + addr = kw['data'] + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + res = False + try: + self.logger.debug('Doing a connection to %s' % addr) + s.connect((addr.split(':')[0], int(addr.split(':')[1]))) + res = True + except socket.error, msg: + self.logger.debug('Connection failed to %s: %s' % (addr, msg)) + + finally: + s.close() + + return {'Time': datetime.now(), + 'Address': addr, + 'Status': res} + + def control(self): + """ + Fill this up with the control related code. + """ + return True + +def run(ooni, asset=None): + """ + This is the function that will be called by OONI + and it is responsible for instantiating and passing + the arguments to the Test class. + """ + config = ooni.config + + # This the assets array to be passed to the run function of + # the test + if asset: + assets = [TCPScanAsset(asset)] + else: + assets = [TCPScanAsset(os.path.join(config.main.assetdir, \ + "tcpscan.txt"))] + + # Instantiate the Test + thetest = TCPScan(ooni) + ooni.logger.info("starting TCP Scan...") + # Run the test with argument assets + thetest.run(assets) + ooni.logger.info("finished.") diff --git a/ooni/hack_this/traceroute.py b/ooni/hack_this/traceroute.py new file mode 100644 index 0000000..e8252c1 --- /dev/null +++ b/ooni/hack_this/traceroute.py @@ -0,0 +1,108 @@ +try: + from dns import resolver +except: + print "Error: dnspython is not installed (http://www.dnspython.org/)" +import gevent +import os +import plugoo + +try: + import scapy +except: + print "Error: traceroute plugin requires scapy to be installed (http://www.secdev.org/projects/scapy)" + +from plugoo.assets import Asset +from plugoo.tests import Test + +import socket + +__plugoo__ = "Traceroute" +__desc__ = "Performs TTL walking tests" + +class TracerouteAsset(Asset): + def __init__(self, file=None): + self = Asset.__init__(self, file) + + +class Traceroute(Test): + """A *very* quick and dirty traceroute implementation, UDP and TCP + """ + def traceroute(self, dst, dst_port=3880, src_port=3000, proto="tcp", max_hops=30): + dest_addr = socket.gethostbyname(dst) + print "Doing traceroute on %s" % dst + + recv = socket.getprotobyname('icmp') + send = socket.getprotobyname(proto) + ttl = 1 + while True: + recv_sock = socket.socket(socket.AF_INET, socket.SOCK_RAW, recv) + if proto == "tcp": + send_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, send) + else: + send_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, send) + recv_sock.settimeout(10) + send_sock.settimeout(10) + + send_sock.setsockopt(socket.SOL_IP, socket.IP_TTL, ttl) + recv_sock.bind(("", src_port)) + if proto == "tcp": + try: + send_sock.settimeout(2) + send_sock.connect((dst, dst_port)) + except socket.timeout: + pass + + except Exception, e: + print "Error doing connect %s" % e + else: + send_sock.sendto("", (dst, dst_port)) + + curr_addr = None + try: + print "receiving data..." + _, curr_addr = recv_sock.recvfrom(512) + curr_addr = curr_addr[0] + + except socket.error, e: + print "SOCKET ERROR: %s" % e + + except Exception, e: + print "ERROR: %s" % e + + finally: + send_sock.close() + recv_sock.close() + + if curr_addr is not None: + curr_host = "%s" % curr_addr + else: + curr_host = "*" + + print "%d\t%s" % (ttl, curr_host) + + if curr_addr == dest_addr or ttl > max_hops: + break + + ttl += 1 + + + def experiment(self, *a, **kw): + # this is just a dirty hack + address = kw['data'][0] + + self.traceroute(address) + +def run(ooni): + """Run the test""" + config = ooni.config + urls = [] + + traceroute_experiment = TracerouteAsset(os.path.join(config.main.assetdir, \ + config.tests.traceroute)) + + assets = [traceroute_experiment] + + traceroute = Traceroute(ooni) + ooni.logger.info("starting traceroute test") + traceroute.run(assets) + ooni.logger.info("finished")

1 0