tor-commits January 2013

tor-commits@lists.torproject.org

19 participants
1125 discussions

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 1b04d0d50ab2b0ec516a6cb30b4cf135d1b75dd9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 16:46:00 2013 +0000 Update translations for liveusb-creator --- es/es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/es.po b/es/es.po index 154fcdb..6647d73 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: 2013-01-16 16:09+0000\n" +"PO-Revision-Date: 2013-01-16 16:44+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" @@ -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 "No fue posible escribir en %(device)s, omitiendo... " +msgstr "No se pudo escribir en %(device)s, omitiendo... " #: ../liveusb/creator.py:737 #, python-format @@ -277,14 +277,14 @@ 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 desconocido. Su dispositivo podría necesitar ser formateado." +msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser formateado." #: ../liveusb/creator.py:789 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone Tails\" action instead." -msgstr "Sistema de archivos no soportado: %s \nEn caso de que esté intentado actualizar la versión de un sistema Tails instalado manualmente (es decir, si fue instalado sin este instalador), esta opción no está soportada: para hacerlo así primero necesíta instalarlo de nuevo, por ejemplo seleccionando la acción \"Clonar Tails\", en lugar de como se hizo cuando se instaló." +msgstr "Sistema de archivos no soportado: %s \nEn caso de que esté intentado actualizar la versión de un sistema Tails instalado manualmente (es decir, si fue instalado con otro instalador), esta opción no está soportada: para hacerlo así primero necesita instalarlo de nuevo, v.g. seleccionando la acción \"Clonar Tails\", en lugar de como se hizo cuando se instaló." #: ../liveusb/creator.py:791 ../liveusb/creator.py:889 #, python-format @@ -299,7 +299,7 @@ msgstr "Excepción dbus desconocida al intentar montar el dispositivo: %(message #: ../liveusb/creator.py:811 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "No fue posible montar el dispositivo: %(message)s" +msgstr "No se pudo montar el dispositivo: %(message)s" #: ../liveusb/creator.py:823 msgid "No mount points found" @@ -313,7 +313,7 @@ msgstr "Desmontando %(device)s" #: ../liveusb/creator.py:846 #, python-format msgid "Mount %s exists after unmounting" -msgstr "El montaje %s existe después de desmontar " +msgstr "El punto de montaje %s sigue existiendo tras desmontar " #: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 msgid "Verifying filesystem..." @@ -322,11 +322,11 @@ msgstr "Verificando el sistema de archivos... " #: ../liveusb/creator.py:907 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "No fue posible cambiar la etiqueta del volumen: %(message)s" +msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s" #: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 msgid "Installing bootloader..." -msgstr "Instalando sistema de arranque (bootloader)... " +msgstr "Instalando gestor de arranque (bootloader)... " #: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 #, python-format @@ -355,7 +355,7 @@ 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 restablecer el MBR. Podría no tener instalado el paquete `syslinux`" +msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `syslinux`" #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset"

1 0

[tor/master] changes file for 7896
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit 7fc91dc274f38dc50f2a6eef2db060c788ef3040 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 11:43:36 2013 -0500 changes file for 7896 --- changes/bug7896 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug7896 b/changes/bug7896 new file mode 100644 index 0000000..9eecaa6 --- /dev/null +++ b/changes/bug7896 @@ -0,0 +1,3 @@ + o Minor features: + - When learning a fingerprint for a bridge, log its corresponding + transport type. Implements ticket 7896.

1 0

[tor/master] Mention name of the transport used when we learn the fpr of a bridge.
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit 50028e4d6809f73194ed32031b3c854623582b26 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 9 15:52:35 2013 +0200 Mention name of the transport used when we learn the fpr of a bridge. --- src/or/entrynodes.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e583b88..bddbd24 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1501,9 +1501,17 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, bridge_info_t *bridge = get_configured_bridge_by_addr_port_digest(addr, port, digest); if (bridge && tor_digest_is_zero(bridge->identity)) { + char *transport_info = NULL; + const char *transport_name = + find_transport_name_by_bridge_addrport(addr, port); + if (transport_name) + tor_asprintf(&transport_info, " (with transport '%s')", transport_name); + memcpy(bridge->identity, digest, DIGEST_LEN); - log_notice(LD_DIR, "Learned fingerprint %s for bridge %s", - hex_str(digest, DIGEST_LEN), fmt_addrport(addr, port)); + log_notice(LD_DIR, "Learned fingerprint %s for bridge %s%s.", + hex_str(digest, DIGEST_LEN), fmt_addrport(addr, port), + transport_info ? transport_info : ""); + tor_free(transport_info); } } @@ -1629,7 +1637,9 @@ find_bridge_by_digest(const char *digest) return NULL; } -/* DOCDOC find_transport_name_by_bridge_addrport */ +/** Given the <b>addr</b> and <b>port</b> of a bridge, if that bridge + * supports a pluggable transport, return its name. Otherwise, return + * NULL. */ const char * find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) {

1 0

[tor/master] Merge remote-tracking branch 'asn/bug7896'
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit 5ed8ac4e57a01f6f29221a795160de302e2f5eee Merge: f57722d 50028e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 11:41:37 2013 -0500 Merge remote-tracking branch 'asn/bug7896' src/or/entrynodes.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 483583825a546787a52bf5d1f6e021f0e06e9e97 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 16:15:57 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/es/es.po b/es/es.po index 9ddcd35..154fcdb 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: 2013-01-16 12:36+0000\n" +"PO-Revision-Date: 2013-01-16 16:09+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" @@ -162,12 +162,12 @@ msgstr "%(filename)s seleccionado(s)" #: ../liveusb/creator.py:91 msgid "You must run this application as root" -msgstr "Debe ejecutar esta aplicación como root" +msgstr "Debe ejecutar esta aplicación como root (superusuario)" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "El tipo de fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." +msgstr "La fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" @@ -175,7 +175,7 @@ msgstr "Verificando el checksum MD5 de la ISO" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" -msgstr "Fallo en la verificación del checksum MD5 de la ISO" +msgstr "Error en la verificación del checksum MD5 de la ISO" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" @@ -188,7 +188,7 @@ msgstr "Extrayendo la imagen autoarrancable (live image) del dispositivo USB..." #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Escritura al dispositivo a %(speed)d MB/sec" +msgstr "Escrito al dispositivo a %(speed)d MB/sec" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." @@ -199,21 +199,21 @@ msgstr "Configurando un archivo de arranque OLPC (One Laptop Per Child)..." msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "Hubo un problema ejecutando el siguiente comando: `%(command)s`. \nSe ha escrito un registro de errores (log) más detallado en '%(filename)s'." +msgstr "Hubo un problema ejecutando el siguiente comando: '%(command)s'. \nSe ha escrito un registro de errores (log) más detallado en '%(filename)s'." #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA1 de la imagen del CD de arranque (LiveCD)... " +msgstr "Verificando el checksum SHA1 de la imagen del CD autoarrancable (LiveCD)... " #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA256 de la imagen del CD de arranque (LiveCD)... " +msgstr "Verificando el checksum SHA256 de la imagen del CD autoarrancable (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 checksum 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." +msgstr "Error: El checksum SHA1 de su CD autoarrancable (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" @@ -231,26 +231,26 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/creator.py:487 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "No fue posible copiar %(infile)s en %(outfile)s: %(message)s" +msgstr "No se pudo copiar %(infile)s en %(outfile)s: %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "Eliminando el sistema operativo autoarracable (Live OS) existente" +msgstr "Eliminando el sistema operativo autoarrancable (Live OS) existente" #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "No fue posible completar chmod %(file)s: %(message)s" +msgstr "No se pudo 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 sistema operativo autoarrancable (LiveOS): %(message)s" +msgstr "No se pudo 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 sistema operativo autoarracable (LiveOS): %(message)s" +msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarracable (LiveOS): %(message)s" #: ../liveusb/creator.py:573 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit d805a75f079ab9ec4cd5d007674ade2304eaedc4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 16:15:55 2013 +0000 Update translations for liveusb-creator --- es/es.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/es/es.po b/es/es.po index 9ddcd35..154fcdb 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: 2013-01-16 12:36+0000\n" +"PO-Revision-Date: 2013-01-16 16:09+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" @@ -162,12 +162,12 @@ msgstr "%(filename)s seleccionado(s)" #: ../liveusb/creator.py:91 msgid "You must run this application as root" -msgstr "Debe ejecutar esta aplicación como root" +msgstr "Debe ejecutar esta aplicación como root (superusuario)" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "El tipo de fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." +msgstr "La fuente no soporta la verificación del checksum MD5 de la ISO, omitiendo..." #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" @@ -175,7 +175,7 @@ msgstr "Verificando el checksum MD5 de la ISO" #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" -msgstr "Fallo en la verificación del checksum MD5 de la ISO" +msgstr "Error en la verificación del checksum MD5 de la ISO" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" @@ -188,7 +188,7 @@ msgstr "Extrayendo la imagen autoarrancable (live image) del dispositivo USB..." #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "Escritura al dispositivo a %(speed)d MB/sec" +msgstr "Escrito al dispositivo a %(speed)d MB/sec" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." @@ -199,21 +199,21 @@ msgstr "Configurando un archivo de arranque OLPC (One Laptop Per Child)..." msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "Hubo un problema ejecutando el siguiente comando: `%(command)s`. \nSe ha escrito un registro de errores (log) más detallado en '%(filename)s'." +msgstr "Hubo un problema ejecutando el siguiente comando: '%(command)s'. \nSe ha escrito un registro de errores (log) más detallado en '%(filename)s'." #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA1 de la imagen del CD de arranque (LiveCD)... " +msgstr "Verificando el checksum SHA1 de la imagen del CD autoarrancable (LiveCD)... " #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "Verificando el checksum SHA256 de la imagen del CD de arranque (LiveCD)... " +msgstr "Verificando el checksum SHA256 de la imagen del CD autoarrancable (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 checksum 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." +msgstr "Error: El checksum SHA1 de su CD autoarrancable (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" @@ -231,26 +231,26 @@ msgstr "Creando sistema de archivos persistente de %s MB" #: ../liveusb/creator.py:487 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "No fue posible copiar %(infile)s en %(outfile)s: %(message)s" +msgstr "No se pudo copiar %(infile)s en %(outfile)s: %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "Eliminando el sistema operativo autoarracable (Live OS) existente" +msgstr "Eliminando el sistema operativo autoarrancable (Live OS) existente" #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "No fue posible completar chmod %(file)s: %(message)s" +msgstr "No se pudo 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 sistema operativo autoarrancable (LiveOS): %(message)s" +msgstr "No se pudo 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 sistema operativo autoarracable (LiveOS): %(message)s" +msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarracable (LiveOS): %(message)s" #: ../liveusb/creator.py:573 #, python-format

1 0

[compass/master] Provided default arguments for all parameters.
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 4a998817a8ca56749d73e5aebeb74e57c130e3c2 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 15:41:56 2013 -0500 Provided default arguments for all parameters. Now a blank request will no longer fail with a server error and will instead return a default set of data. --- app.py | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app.py b/app.py index d68c5b9..73270d7 100644 --- a/app.py +++ b/app.py @@ -8,25 +8,30 @@ from flask import Flask, request, jsonify, render_template,Response app = Flask(__name__) class Opt(object): - request_types = { - 'by_as':Boolean, - 'by_country':Boolean, - 'inactive':Boolean, - 'exits_only':Boolean, - 'guards_only': Boolean, - 'links':Boolean, - 'sort':NullFn, - 'sort_reverse':Boolean, - 'top':Int, - 'family':NullFn, - 'ases':List, - 'country':JSON, - 'exit_filter':NullFn + option_details = { + 'by_as':(Boolean, False), + 'by_country':(Boolean, False), + 'inactive':( Boolean, False ), + 'exits_only':( Boolean, False ), + 'guards_only': ( Boolean, False), + 'links':( Boolean, True ), + 'sort':( NullFn, "cw" ), + 'sort_reverse':( Boolean, True ), + 'top':( Int , 10), + 'family':( NullFn, "" ), + 'ases':( List, [] ), + 'country':( JSON, [] ), + 'exit_filter':( NullFn, "all_relays" ) } + @staticmethod def convert(key,val): - return Opt.request_types[key](val) + return Opt.option_details[key][0](val) + + @staticmethod + def default(key): + return Opt.option_details[key][1] def __str__(self): return repr(self) @@ -35,12 +40,11 @@ class Opt(object): return str(self.__dict__) def __init__(self,request): - - for key in Opt.request_types: + for key in Opt.option_details: if key in request: setattr(self,key,Opt.convert(key,request[key])) else: - setattr(self,key,Opt.convert(key,None)) + setattr(self,key,Opt.default(key)) def parse(output_string, grouping=False, sort_key=None): results = []

1 0

[compass/master] Added testcases to start to address #7924.
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 6beae18d5251b66d2ec4348b157649d90bf885c1 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 15:43:31 2013 -0500 Added testcases to start to address #7924. This bug is really strange. It only occurs when running through Apache. The testcases pass, and the server performs correctly when running under Foreman. --- testing/app_tests.py | 53 ++++ testing/expectations/README | 2 + testing/expectations/noparam.expected | 1 + testing/expectations/top5.expected | 1 + testing/testdata.json | 452 +++++++++++++++++++++++++++++++++ 5 files changed, 509 insertions(+), 0 deletions(-) diff --git a/testing/__init__.py b/testing/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testing/app_tests.py b/testing/app_tests.py new file mode 100644 index 0000000..6248241 --- /dev/null +++ b/testing/app_tests.py @@ -0,0 +1,53 @@ +import unittest +import json +from app import app + +class TestCase(unittest.TestCase): + def setUp(self): + app.config['TESTING'] = True + app.config["TESTING_DATAFILE"] = "testing/testdata.json" + self.app = app.test_client() + + def tearDown(self): + pass + + def test_empty_query(self): + response = self.app.get("/result.json") + expected = json.loads(open("testing/expectations/noparam.expected").read()) + received = json.loads(response.data) + self.assertItemsEqual(received,expected) + + + def test_select_nonexistent_AS(self): + received= json.loads(self.app.get("/result.json?ases=AS3320").data) + expected = json.loads( +""" +{"total": {"fp": "", "index": null, "as_no": "", "nick": "", "cc": "", "p_exit": 0.0, "adv_bw": 0.0, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.0, "exit": "", "as_info": "", "cw": 0.0, "as_name": ""}, "results": [], "excluded": null} +""" + ) + self.assertItemsEqual(received,expected) + + def test_select_AS_by_number(self): + received = json.loads(self.app.get("/result.json?ases=7922").data) + expected = json.loads( + """ + {"total": {"fp": "", "index": null, "as_no": "", "nick": "(total in selection)", "cc": "", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "", "as_info": "", "cw": 0.0017691999999999999, "as_name": ""}, "results": [{"fp": "CE9CC720B9300FC7E041CCC2B749F283AB5EE1C2", "index": 1, "as_no": "AS7922", "nick": "Tornearse", "cc": "US", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "Exit", "as_info": "AS7922 Comcast Cable Communications, Inc.", "cw": 0.0017691999999999999, "as_name": "Comcast Cable Communications, Inc."}], "excluded": null} + """) + self.assertItemsEqual(received,expected) + + def test_select_AS_with_label(self): + received = json.loads(self.app.get("/result.json?ases=AS7922").data) + expected = json.loads( + """ + {"total": {"fp": "", "index": null, "as_no": "", "nick": "(total in selection)", "cc": "", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "", "as_info": "", "cw": 0.0017691999999999999, "as_name": ""}, "results": [{"fp": "CE9CC720B9300FC7E041CCC2B749F283AB5EE1C2", "index": 1, "as_no": "AS7922", "nick": "Tornearse", "cc": "US", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "Exit", "as_info": "AS7922 Comcast Cable Communications, Inc.", "cw": 0.0017691999999999999, "as_name": "Comcast Cable Communications, Inc."}], "excluded": null} + """) + self.assertItemsEqual(received,expected) + + def test_limit_dataset_size(self): + received = json.loads(self.app.get("/result.json?top=5").data) + self.assertEqual(len(received['results']),5) + expected = json.loads(open("testing/expectations/top5.expected").read()) + self.assertItemsEqual(received,expected) + +if __name__ == '__main': + unittest.main() diff --git a/testing/expectations/README b/testing/expectations/README new file mode 100644 index 0000000..41f8681 --- /dev/null +++ b/testing/expectations/README @@ -0,0 +1,2 @@ +A set of datafiles used by the unit tests in the parent directory to validate +responses diff --git a/testing/expectations/noparam.expected b/testing/expectations/noparam.expected new file mode 100644 index 0000000..341ea34 --- /dev/null +++ b/testing/expectations/noparam.expected @@ -0,0 +1 @@ +{"total": {"fp": "", "index": null, "as_no": "", "nick": "(total in selection)", "cc": "", "p_exit": 0.4316067, "adv_bw": 0.506811, "guard": "", "link": true, "p_guard": 0.28806119999999996, "p_middle": 0.7357851999999999, "exit": "", "as_info": "", "cw": 0.4851612000000001, "as_name": ""}, "results": [{"fp": "C3D1F08204E2BF81C6A426F312AE3A2212C78929", "index": 1, "as_no": "AS2914", "nick": "AkamaiTor2", "cc": "US", "p_exit": 0.3723334, "adv_bw": 0.324054, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.7142592, "exit": "Exit", "as_info": "AS2914 NTT America, Inc.", "cw": 0.362209, "as_name": "NTT America, Inc."}, {"fp": "9DD5F90D641D835C4FCA7153148B156E6FD49CEE", "index": 2, "as_no": "AS24940", "nick": "darwinfish", "cc": "DE", "p_exit": 0.0, "adv_bw": 0.11225429999999999, "guard": "Guard", "link": null, "p_guard": 0.27480109999999996, "p_middle": 0.0, "exit": "-", "as_info": "AS24940 Hetzner Online AG RZ", "cw": 0.0915991, "as_name": "Hetzner Online AG RZ"}, {"fp ": "B9CEB5B18C76976F7703C67258D73FD8AB1F5DE6", "index": 3, "as_no": "AS8737", "nick": "rappie", "cc": "NL", "p_exit": 0.0490314, "adv_bw": 0.045077099999999995, "guard": "Guard", "link": null, "p_guard": 0.0116007, "p_middle": 0.0116008, "exit": "Exit", "as_info": "AS8737 KPN Internet Solutions", "cw": 0.0240775, "as_name": "KPN Internet Solutions"}, {"fp": "88F340708E4A44A5207B2133EA3A997D843EE04A", "index": 4, "as_no": "AS30186", "nick": "Greenwald", "cc": "CA", "p_exit": 0.007013599999999999, "adv_bw": 0.0056127, "guard": "Guard", "link": null, "p_guard": 0.0016594000000000001, "p_middle": 0.0016594000000000001, "exit": "Exit", "as_info": "AS30186 Toqen LLC", "cw": 0.0034441, "as_name": "Toqen LLC"}, {"fp": "CE9CC720B9300FC7E041CCC2B749F283AB5EE1C2", "index": 5, "as_no": "AS7922", "nick": "Tornearse", "cc": "US", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "Exit", "as_info": "A S7922 Comcast Cable Communications, Inc.", "cw": 0.0017691999999999999, "as_name": "Comcast Cable Communications, Inc."}, {"fp": "AB41EECA8422F0953BDE0D86AE089CB8D194A369", "index": 6, "as_no": "??", "nick": "Communist", "cc": "RU", "p_exit": 0.0014097, "adv_bw": 0.0113377, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0027042999999999998, "exit": "Exit", "as_info": "?? ??", "cw": 0.0013714, "as_name": "??"}, {"fp": "CD99F2579AEDB38E9A28C448340D502DE4050433", "index": 7, "as_no": "AS21844", "nick": "pillowfight", "cc": "US", "p_exit": 0.0, "adv_bw": 0.0014032, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.000848, "exit": "-", "as_info": "AS21844 ThePlanet.com Internet Services, Inc.", "cw": 0.00028260000000000004, "as_name": "ThePlanet.com Internet Services, Inc."}, {"fp": "015636CF409A1C32A578C0D50E4AC659ABA9E8A3", "index": 8, "as_no": "AS7385", "nick": "nigeria", "cc": "US", "p_exit": 0.0, "adv_bw": 0.0005613, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0006280999999999999, "exit": "-", "as_info": "AS7385 Integra Telecom, Inc.", "cw": 0.00020940000000000002, "as_name": "Integra Telecom, Inc."}, {"fp": "B4D40C3FBCBF65D680D8F99F4F9BAB325D47E7F9", "index": 9, "as_no": "AS16276", "nick": "Unnamed", "cc": "??", "p_exit": 0.0, "adv_bw": 0.0011225, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0005967, "exit": "-", "as_info": "AS16276 OVH Systems", "cw": 0.00019889999999999998, "as_name": "OVH Systems"}], "excluded": null} diff --git a/testing/expectations/top5.expected b/testing/expectations/top5.expected new file mode 100644 index 0000000..e9e742d --- /dev/null +++ b/testing/expectations/top5.expected @@ -0,0 +1 @@ +{"total": {"fp": "", "index": null, "as_no": "", "nick": "(total in selection)", "cc": "", "p_exit": 0.4316067, "adv_bw": 0.506811, "guard": "", "link": true, "p_guard": 0.28806119999999996, "p_middle": 0.7357851999999999, "exit": "", "as_info": "", "cw": 0.4851612000000001, "as_name": ""}, "results": [{"fp": "C3D1F08204E2BF81C6A426F312AE3A2212C78929", "index": 1, "as_no": "AS2914", "nick": "AkamaiTor2", "cc": "US", "p_exit": 0.3723334, "adv_bw": 0.324054, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.7142592, "exit": "Exit", "as_info": "AS2914 NTT America, Inc.", "cw": 0.362209, "as_name": "NTT America, Inc."}, {"fp": "9DD5F90D641D835C4FCA7153148B156E6FD49CEE", "index": 2, "as_no": "AS24940", "nick": "darwinfish", "cc": "DE", "p_exit": 0.0, "adv_bw": 0.11225429999999999, "guard": "Guard", "link": null, "p_guard": 0.27480109999999996, "p_middle": 0.0, "exit": "-", "as_info": "AS24940 Hetzner Online AG RZ", "cw": 0.0915991, "as_name": "Hetzner Online AG RZ"}, {"fp ": "B9CEB5B18C76976F7703C67258D73FD8AB1F5DE6", "index": 3, "as_no": "AS8737", "nick": "rappie", "cc": "NL", "p_exit": 0.0490314, "adv_bw": 0.045077099999999995, "guard": "Guard", "link": null, "p_guard": 0.0116007, "p_middle": 0.0116008, "exit": "Exit", "as_info": "AS8737 KPN Internet Solutions", "cw": 0.0240775, "as_name": "KPN Internet Solutions"}, {"fp": "88F340708E4A44A5207B2133EA3A997D843EE04A", "index": 4, "as_no": "AS30186", "nick": "Greenwald", "cc": "CA", "p_exit": 0.007013599999999999, "adv_bw": 0.0056127, "guard": "Guard", "link": null, "p_guard": 0.0016594000000000001, "p_middle": 0.0016594000000000001, "exit": "Exit", "as_info": "AS30186 Toqen LLC", "cw": 0.0034441, "as_name": "Toqen LLC"}, {"fp": "CE9CC720B9300FC7E041CCC2B749F283AB5EE1C2", "index": 5, "as_no": "AS7922", "nick": "Tornearse", "cc": "US", "p_exit": 0.0018185999999999999, "adv_bw": 0.005388199999999999, "guard": "-", "link": null, "p_guard": 0.0, "p_middle": 0.0034887, "exit": "Exit", "as_info": "A S7922 Comcast Cable Communications, Inc.", "cw": 0.0017691999999999999, "as_name": "Comcast Cable Communications, Inc."}], "excluded": {"fp": "", "index": null, "as_no": "", "nick": "(4 other relays)", "cc": "", "p_exit": 0.0014097, "adv_bw": 0.0144247, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.004777099999999999, "exit": "", "as_info": "", "cw": 0.0020623, "as_name": ""}} diff --git a/testing/testdata.json b/testing/testdata.json new file mode 100644 index 0000000..94f079e --- /dev/null +++ b/testing/testdata.json @@ -0,0 +1,452 @@ +{"relays_published":"2012-11-16 21:00:00", +"relays":[ +{"nickname":"darwinfish", +"fingerprint":"9DD5F90D641D835C4FCA7153148B156E6FD49CEE", +"or_addresses":["46.4.106.18:443"], +"dir_address":"46.4.106.18:9030", +"running":true, +"flags":["Fast","Guard","HSDir","Named","Running","Stable","V2Dir","Valid"], +"country":"de", +"latitude":51.000000, +"longitude":9.000000, +"country_name":"Germany", +"as_number":"AS24940", +"as_name":"Hetzner Online AG RZ", +"consensus_weight":8750, +"host_name":"static.18.106.4.46.clients.your-server.de", +"advertised_bandwidth_fraction":0.001122543, +"consensus_weight_fraction":0.000915991, +"guard_probability":0.002748011, +"middle_probability":0.000000000, +"exit_probability":0.000000000, +"exit_policy_summary":{"reject":["1-65535"]}, +"last_restarted":"2012-10-26 22:15:33", +"bandwidth_rate":4096000, +"bandwidth_burst":9216000, +"observed_bandwidth":5059825, +"advertised_bandwidth":4096000, +"exit_policy":[ + "reject *:*" +], +"contact":"TlpCRm91bmRhdGlvbit0b3JAZ21haWwuY29t", +"platform":"Tor 0.2.3.24-rc on Linux" +}, +{"nickname":"Unnamed", +"fingerprint":"B4D40C3FBCBF65D680D8F99F4F9BAB325D47E7F9", +"or_addresses":["198.245.56.134:9001"], +"running":true, +"flags":["Fast","Running","Valid"], +"as_number":"AS16276", +"as_name":"OVH Systems", +"consensus_weight":19, +"host_name":"vks17782.ip-198-245-56.net", +"advertised_bandwidth_fraction":0.000011225, +"consensus_weight_fraction":0.000001989, +"guard_probability":0.000000000, +"middle_probability":0.000005967, +"exit_probability":0.000000000, +"exit_policy_summary":{"reject":["1-65535"]}, +"last_restarted":"2012-11-12 18:36:07", +"bandwidth_rate":40960, +"bandwidth_burst":81920, +"observed_bandwidth":46146, +"advertised_bandwidth":40960, +"exit_policy":[ + "reject *:*" +], +"platform":"Tor 0.2.2.39 (git-2f7e71c2e896772f) on Linux x86_64" +}, +{"nickname":"AkamaiTor2", +"fingerprint":"C3D1F08204E2BF81C6A426F312AE3A2212C78929", +"or_addresses":["199.239.183.212:9001"], +"dir_address":"199.239.183.212:9030", +"running":true, +"flags":["Exit","Fast","HSDir","Running","V2Dir","Valid"], +"country":"us", +"latitude":39.569000, +"longitude":-104.858200, +"country_name":"United States", +"region_name":"Colorado", +"city_name":"Englewood", +"as_number":"AS2914", +"as_name":"NTT America, Inc.", +"consensus_weight":34600, +"host_name":"199.239.183.212", +"advertised_bandwidth_fraction":0.003240540, +"consensus_weight_fraction":0.003622090, +"guard_probability":0.000000000, +"middle_probability":0.007142592, +"exit_probability":0.003723334, +"exit_policy_summary":{"reject":["25","119","135-139","445","563","1214","4661-4666","6346-6429","6699","6881-6999"]}, +"last_restarted":"2012-11-08 02:16:38", +"bandwidth_rate":52428800, +"bandwidth_burst":104857600, +"observed_bandwidth":11824271, +"advertised_bandwidth":11824271, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 199.239.183.212:*", + "reject *:25", + "reject *:119", + "reject *:135-139", + "reject *:445", + "reject *:563", + "reject *:1214", + "reject *:4661-4666", + "reject *:6346-6429", + "reject *:6699", + "reject *:6881-6999", + "accept *:*" +], +"contact":"4096R\/5B9283CE Akamai Security Team <security AT akamai dot com>", +"platform":"Tor 0.2.3.24-rc on Linux", +"family":[ + "$0BBC720B68D79480B9A47A18E900BE1264B4C2D8", + "$0F89791E1BF91307BD04ACDBD8FF19DCCEFF5807", + "$134603338436CDC861D9D47169336D64776E2E50", + "$2C18D7603EE1DD1935D854158098141086799CDD", + "$54470CF48E3B325E33CD9B8679E07D490B4EE9C3", + "$544F3F675FCDFDD97E11D24F5FF90470693FD843", + "$6BF9EBB43948E045614E9B30A3F5D256B3E12036", + "$91FE1D88B04A0BAFBFD9DBF2A6F9A7672E17693E", + "$9E7D52AB8B4EC778A2B632021A4CC68B295D71F2" +] +}, +{"nickname":"Communist", +"fingerprint":"AB41EECA8422F0953BDE0D86AE089CB8D194A369", +"or_addresses":["92.240.139.103:8080"], +"dir_address":"92.240.139.103:9030", +"running":true, +"flags":["Exit","Fast","Named","Running","V2Dir","Valid"], +"country":"ru", +"latitude":55.752197, +"longitude":37.615601, +"country_name":"Russian Federation", +"region_name":"Moscow City", +"city_name":"Moscow", +"consensus_weight":131, +"host_name":"92.240.139.103", +"advertised_bandwidth_fraction":0.000113377, +"consensus_weight_fraction":0.000013714, +"guard_probability":0.000000000, +"middle_probability":0.000027043, +"exit_probability":0.000014097, +"exit_policy_summary":{"reject":["25","119","135-139","445","563","1214","4661-4666","6346-6429","6699","6881-6999"]}, +"last_restarted":"2012-11-16 07:13:10", +"bandwidth_rate":5242880, +"bandwidth_burst":10485760, +"observed_bandwidth":413696, +"advertised_bandwidth":413696, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 92.240.139.103:*", + "reject *:25", + "reject *:119", + "reject *:135-139", + "reject *:445", + "reject *:563", + "reject *:1214", + "reject *:4661-4666", + "reject *:6346-6429", + "reject *:6699", + "reject *:6881-6999", + "accept *:*" +], +"platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Windows 7 Service Pack 1 [workstation]" +}, +{"nickname":"Greenwald", +"fingerprint":"88F340708E4A44A5207B2133EA3A997D843EE04A", +"or_addresses":["199.36.123.117:9001"], +"dir_address":"199.36.123.117:9030", +"running":true, +"flags":["Exit","Fast","Guard","HSDir","Named","Running","Stable","V2Dir","Valid"], +"country":"ca", +"latitude":49.266693, +"longitude":-122.783295, +"country_name":"Canada", +"region_name":"British Columbia", +"city_name":"Port Coquitlam", +"as_number":"AS30186", +"as_name":"Toqen LLC", +"consensus_weight":329, +"host_name":"199-36-123-117.usadatacenter.net", +"advertised_bandwidth_fraction":0.000056127, +"consensus_weight_fraction":0.000034441, +"guard_probability":0.000016594, +"middle_probability":0.000016594, +"exit_probability":0.000070136, +"exit_policy_summary":{"accept":["20-23","43","53","79-81","88","110","143","194","220","389","443","464","531","543-544","554","563","636","706","749","873","902-904","981","989-995","1194","1220","1293","1500","1533","1677","1723","1755","1863","2082-2083","2086-2087","2095-2096","2102-2104","3128","3389","3690","4321","4643","5050","5190","5222-5223","5228","5900","6660-6669","6679","6697","8000","8008","8074","8080","8087-8088","8332-8333","8443","8888","9418","9999-10000","11371","19294","19638"]}, +"last_restarted":"2012-11-14 05:47:32", +"bandwidth_rate":204800, +"bandwidth_burst":409600, +"observed_bandwidth":271601, +"advertised_bandwidth":204800, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 199.36.123.117:*", + "reject 200.189.113.0/24:*", + "accept *:20-23", + "accept *:43", + "accept *:53", + "accept *:79-81", + "accept *:88", + "accept *:110", + "accept *:143", + "accept *:194", + "accept *:220", + "accept *:389", + "accept *:443", + "accept *:464", + "accept *:531", + "accept *:543-544", + "accept *:554", + "accept *:563", + "accept *:636", + "accept *:706", + "accept *:749", + "accept *:873", + "accept *:902-904", + "accept *:981", + "accept *:989-995", + "accept *:1194", + "accept *:1220", + "accept *:1293", + "accept *:1500", + "accept *:1533", + "accept *:1677", + "accept *:1723", + "accept *:1755", + "accept *:1863", + "accept *:2082", + "accept *:2083", + "accept *:2086-2087", + "accept *:2095-2096", + "accept *:2102-2104", + "accept *:3128", + "accept *:3389", + "accept *:3690", + "accept *:4321", + "accept *:4643", + "accept *:5050", + "accept *:5190", + "accept *:5222-5223", + "accept *:5228", + "accept *:5900", + "accept *:6660-6669", + "accept *:6679", + "accept *:6697", + "accept *:8000", + "accept *:8008", + "accept *:8074", + "accept *:8080", + "accept *:8087-8088", + "accept *:8332-8333", + "accept *:8443", + "accept *:8888", + "accept *:9418", + "accept *:9999", + "accept *:10000", + "accept *:11371", + "accept *:19294", + "accept *:19638", + "reject *:*" +], +"contact":"Warren <whdnsmgr-tor AT yahoo dot com>", +"platform":"Tor 0.2.3.24-rc on Linux" +}, +{"nickname":"nigeria", +"fingerprint":"015636CF409A1C32A578C0D50E4AC659ABA9E8A3", +"or_addresses":["67.136.217.102:56660"], +"running":true, +"flags":["Named","Running","Valid"], +"country":"us", +"latitude":47.449905, +"longitude":-122.358597, +"country_name":"United States", +"region_name":"Washington", +"city_name":"Seattle", +"as_number":"AS7385", +"as_name":"Integra Telecom, Inc.", +"consensus_weight":20, +"host_name":"67.136.217.102", +"advertised_bandwidth_fraction":0.000005613, +"consensus_weight_fraction":0.000002094, +"guard_probability":0.000000000, +"middle_probability":0.000006281, +"exit_probability":0.000000000, +"exit_policy_summary":{"accept":["443"]}, +"last_restarted":"2012-11-15 22:07:44", +"bandwidth_rate":20480, +"bandwidth_burst":20480, +"observed_bandwidth":57330, +"advertised_bandwidth":20480, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 67.136.217.102:*", + "accept *:443", + "reject *:*" +], +"contact":"legal at slimtrader dot com", +"platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Windows 8 [server]" +}, +{"nickname":"pillowfight", +"fingerprint":"CD99F2579AEDB38E9A28C448340D502DE4050433", +"or_addresses":["67.18.186.145:9001"], +"running":true, +"flags":["Fast","Running","Stable","Unnamed","Valid"], +"country":"us", +"latitude":29.752304, +"longitude":-95.366997, +"country_name":"United States", +"region_name":"Texas", +"city_name":"Houston", +"as_number":"AS21844", +"as_name":"ThePlanet.com Internet Services, Inc.", +"consensus_weight":27, +"host_name":"ozeki.trontronic.com", +"advertised_bandwidth_fraction":0.000014032, +"consensus_weight_fraction":0.000002826, +"guard_probability":0.000000000, +"middle_probability":0.000008480, +"exit_probability":0.000000000, +"exit_policy_summary":{"reject":["1-65535"]}, +"last_restarted":"2012-09-26 00:00:00", +"bandwidth_rate":51200, +"bandwidth_burst":102400, +"observed_bandwidth":56588, +"advertised_bandwidth":51200, +"exit_policy":[ + "reject *:*" +], +"contact":"Tor Contact <tor AT trontronic dot com>", +"platform":"Tor 0.2.2.35 (git-73ff13ab3cc9570d) on Linux i686" +}, +{"nickname":"Tornearse", +"fingerprint":"CE9CC720B9300FC7E041CCC2B749F283AB5EE1C2", +"or_addresses":["50.136.10.80:9001"], +"running":true, +"flags":["Exit","Fast","Running","Unnamed","Valid"], +"country":"us", +"latitude":42.169601, +"longitude":-71.060600, +"country_name":"United States", +"region_name":"Massachusetts", +"city_name":"Randolph", +"as_number":"AS7922", +"as_name":"Comcast Cable Communications, Inc.", +"consensus_weight":169, +"host_name":"c-50-136-10-80.hsd1.nh.comcast.net", +"advertised_bandwidth_fraction":0.000053882, +"consensus_weight_fraction":0.000017692, +"guard_probability":0.000000000, +"middle_probability":0.000034887, +"exit_probability":0.000018186, +"exit_policy_summary":{"accept":["80","110","143","443","706","993","995","1863","5050","5190","5222-5223","8300","8888"]}, +"last_restarted":"2012-11-16 18:17:12", +"bandwidth_rate":196608, +"bandwidth_burst":393216, +"observed_bandwidth":221454, +"advertised_bandwidth":196608, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 50.136.10.80:*", + "accept *:80", + "accept *:443", + "accept *:110", + "accept *:143", + "accept *:993", + "accept *:995", + "accept *:706", + "accept *:1863", + "accept *:5050", + "accept *:5190", + "accept *:5222", + "accept *:5223", + "accept *:8300", + "accept *:8888", + "reject *:*" +], +"platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Linux x86_64" +}, +{"nickname":"rappie", +"fingerprint":"B9CEB5B18C76976F7703C67258D73FD8AB1F5DE6", +"or_addresses":["77.168.131.76:7724"], +"dir_address":"77.168.131.76:7725", +"running":true, +"flags":["Exit","Fast","Guard","HSDir","Running","Stable","V2Dir","Valid"], +"country":"nl", +"latitude":52.366699, +"longitude":5.149994, +"country_name":"Netherlands", +"region_name":"Flevoland", +"city_name":"Almere", +"as_number":"AS8737", +"as_name":"KPN Internet Solutions", +"consensus_weight":2300, +"host_name":"ip4da8834c.direct-adsl.nl", +"advertised_bandwidth_fraction":0.000450771, +"consensus_weight_fraction":0.000240775, +"guard_probability":0.000116007, +"middle_probability":0.000116008, +"exit_probability":0.000490314, +"exit_policy_summary":{"accept":["80","110","143","443","706","993","995","1863","5050","5190","5222-5223","6660-6669","6697","7000-7001","8300","8888"]}, +"last_restarted":"2012-11-11 23:13:02", +"bandwidth_rate":2560000, +"bandwidth_burst":5120000, +"observed_bandwidth":1644799, +"advertised_bandwidth":1644799, +"exit_policy":[ + "reject 0.0.0.0/8:*", + "reject 169.254.0.0/16:*", + "reject 127.0.0.0/8:*", + "reject 192.168.0.0/16:*", + "reject 10.0.0.0/8:*", + "reject 172.16.0.0/12:*", + "reject 77.168.131.76:*", + "accept *:80", + "accept *:443", + "accept *:110", + "accept *:143", + "accept *:993", + "accept *:995", + "accept *:6660-6669", + "accept *:6697", + "accept *:7000-7001", + "accept *:706", + "accept *:1863", + "accept *:5050", + "accept *:5190", + "accept *:5222", + "accept *:5223", + "accept *:8300", + "accept *:8888", + "reject *:*" +], +"contact":"r dot p dot j at wxs dot nl", +"platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Windows 7 Service Pack 1 [workstation]" +}]}

1 0

[compass/master] Added support for using a custom named datafile.
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 809e93455d5f80b213d8b2a4fbcf585422f4ecb6 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 15:40:41 2013 -0500 Added support for using a custom named datafile. --- app.py | 6 +++++- compass.py | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index 45217a6..d68c5b9 100644 --- a/app.py +++ b/app.py @@ -120,7 +120,11 @@ def index(): def json_result(): options = Opt(dict(request.args.items())) - stats = compass.RelayStats(options) + if "TESTING_DATAFILE" in app.config and "TESTING" in app.config: + stats = compass.RelayStats(options,app.config['TESTING_DATAFILE']) + else: + stats = compass.RelayStats(options) + results = stats.select_relays(stats.relays, options) relays = stats.sort_and_reduce(results, diff --git a/compass.py b/compass.py index 1f8d171..18e7c8c 100755 --- a/compass.py +++ b/compass.py @@ -184,17 +184,18 @@ class InverseFilter(BaseFilter): return inverse_relays class RelayStats(object): - def __init__(self, options): + def __init__(self, options, custom_datafile="details.json"): self._data = None self._filters = self._create_filters(options) self._get_group = self._get_group_function(options) self._relays = None + self._datafile_name = custom_datafile @property def data(self): - if not self._data: - self._data = json.load(file(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json'))) - return self._data + if not self._data: + self._data = json.load(file(os.path.join(os.path.dirname(os.path.abspath(__file__)), self._datafile_name))) + return self._data @property def relays(self): @@ -495,6 +496,8 @@ def create_option_parser(): help="cut the length of the line output at 70 chars") group.add_option("-j", "--json", action="store_true", help="output in JSON rather than human-readable format") + group.add_option("--datafile", default="details.json", + help="use a custom datafile (Default: 'details.json')") parser.add_option_group(group) return parser @@ -551,7 +554,7 @@ if '__main__' == __name__: if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json')): parser.error("Did not find details.json. Re-run with --download.") - stats = RelayStats(options) + stats = RelayStats(options,options.datafile) results = stats.select_relays(stats.relays,options) sorted_results = stats.sort_and_reduce(results,options)

1 0

[compass/master] Added another testcase to the unit tests. Improved README
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit d8462b4e97b3ea6b0449208c6bb6bc56daf5fdc8 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 16:19:49 2013 -0500 Added another testcase to the unit tests. Improved README --- testing/README | 35 ++++++++++++++++++++++++++++------- testing/app_tests.py | 9 +++++++++ testing/testdata.json | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/testing/README b/testing/README index 9457b1e..7e9c50f 100644 --- a/testing/README +++ b/testing/README @@ -1,13 +1,34 @@ +Testing +======= -These are a set of scripts designed to makes sure that any -changes I have made don't change the behavior of the original -compass.py. test.sh will run a series of command line switches -at compass.py, and save the output in a series of named test +Unit Tests +---------- +I've started writing unit tests when bugs are encountered. +The tests are written using UnitTest, and can be run as follows: + +```python +cd compass +nosetests +``` + +Most of the tests are checking against JSON output. Where +reasonably small I have inlined the expected result in the +testcases, but in certain cases I've included them as files in +the `expectations` directory. + +Regression Tests +---------------- + +These are a set of scripts designed to make sure that changes to +the command line version of `compass.py` don't result in +different output than before. They're not pretty, but they work. + +`test.sh` will run a series of command line switches +at `compass.py`, and save the output in a series of named test files. -check.py will take two test names and compare the output +`check.py` will take two test names and compare the output from those tests to see if they match. - -Note: Sometimes a test will fail even though the output is correct +*Note:* Sometimes a test will fail even though the output is correct because the sorting works differently in my revised version and elements with the same value don't always occur in the same order. diff --git a/testing/app_tests.py b/testing/app_tests.py index 6248241..28eff17 100644 --- a/testing/app_tests.py +++ b/testing/app_tests.py @@ -35,6 +35,15 @@ class TestCase(unittest.TestCase): """) self.assertItemsEqual(received,expected) + def test_select_AS1234567890(self): + received = json.loads(self.app.get("/result.json?ases=AS1234567890").data) + expected = json.loads( +""" +{"total": {"fp": "", "index": null, "as_no": "", "nick": "", "cc": "", "p_exit": 0.0, "adv_bw": 0.0, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.0, "exit": "", "as_info": "", "cw": 0.0, "as_name": ""}, "results": [], "excluded": null} +""" + ) + self.assertItemsEqual(received,expected) + def test_select_AS_with_label(self): received = json.loads(self.app.get("/result.json?ases=AS7922").data) expected = json.loads( diff --git a/testing/testdata.json b/testing/testdata.json index 94f079e..d3a22ac 100644 --- a/testing/testdata.json +++ b/testing/testdata.json @@ -449,4 +449,36 @@ ], "contact":"r dot p dot j at wxs dot nl", "platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Windows 7 Service Pack 1 [workstation]" -}]} +}, +{"nickname":"winner", +"fingerprint":"9DD3F90D641D835C4FCA7153148B156E6FD49CEE", +"or_addresses":["46.4.106.18:443"], +"dir_address":"46.4.106.18:9030", +"running":true, +"flags":["Fast","Guard","HSDir","Named","Running","Stable","V2Dir","Valid"], +"country":"de", +"latitude":51.000000, +"longitude":9.000000, +"country_name":"Germany", +"as_number":"AS3", +"as_name":"Hetzner Online AG RZ", +"consensus_weight":8750, +"host_name":"static.18.106.4.46.clients.your-server.de", +"advertised_bandwidth_fraction":0.001122543, +"consensus_weight_fraction":0.000915991, +"guard_probability":0.002748011, +"middle_probability":0.000000000, +"exit_probability":0.000000000, +"exit_policy_summary":{"reject":["1-65535"]}, +"last_restarted":"2012-10-26 22:15:33", +"bandwidth_rate":4096000, +"bandwidth_burst":9216000, +"observed_bandwidth":5059825, +"advertised_bandwidth":4096000, +"exit_policy":[ + "reject *:*" +], +"contact":"TlpCRm91bmRhdGlvbit0b3JAZ21haWwuY29t", +"platform":"Tor 0.2.3.24-rc on Linux" +} +]}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2013