- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit 0d4157579f5e7496ad6689a2b59c65313050a685 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 11:00:38 2011 +0000 Update translations for vidalia_help --- es/services.po | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/es/services.po b/es/services.po index c8fa6a1..33469bc 100644 --- a/es/services.po +++ b/es/services.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-10-07 08:53+0000\n" +"PO-Revision-Date: 2011-10-07 10:36+0000\n" "Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -29,11 +29,17 @@ msgid "" "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" msgstr "" +"Nota: los servicios ocultos son una novedad en Vidalia. Aún puede tener " +"errores, algunos de los cuales pueden comprometer su configuración de " +"servicios ocultos. Así que no confíe en él y no nos culpe por ello si algo " +"ha ido mal. Si encuentra errores o tiene algún comentario que compartir " +"acerca de esta nueva característica, ¡háganoslo saber! Necesitamos su " +"opinión. <a name=\"about\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "¿Qué es un servicio oculto?" #. type: Content of: <html><body><p> #: en/services.html:28 @@ -43,6 +49,11 @@ msgid "" "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." msgstr "" +"Los servicios ocultos le permitirán ofrecer cualquier tipo de servicio " +"basado en TCP, como por ejemplo un servicio HTTP, sin revelar su dirección " +"IP. El protocolo para proporcionar un servicio oculto está basado en los " +"mismos circuitos que Tor utiliza para la navegación anónima y tiene unas " +"propidades de anonimato similares." #. type: Content of: <html><body><p> #: en/services.html:35

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit ea9ed935b70615063680bb0e2600130168ada6b3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 09:00:37 2011 +0000 Update translations for vidalia_help --- es/log.po | 32 +++++++++++++------------- es/services.po | 68 ++++++++++++++++++++++++------------------------------- 2 files changed, 46 insertions(+), 54 deletions(-) diff --git a/es/log.po b/es/log.po index fd56010..86b9462 100644 --- a/es/log.po +++ b/es/log.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-10-07 08:10+0000\n" +"PO-Revision-Date: 2011-10-07 08:51+0000\n" "Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -32,10 +32,10 @@ msgid "" msgstr "" "El registro de mensajes le permite ver la información de estado acerca de un" " proceso en ejecución de Tor. <a name=\"basic\"/>Cada mensaje tiene un nivel" -" de <i>gravedad</i> asociado a él, que van desde <b>Errorr</b> (lo más " -"importante) a <b>Debug</b> (más detallado). Vea la sección de ayuda en</a> " -"<a href=\"#severities\">gravedad de mensaje</a> para obtener más " -"información." +" de <i>gravedad</i> asociado a él, que van desde <b>Error</b> (más " +"importantes) a <b>Debug</b> (más detallados). Vea la sección de ayuda en<a " +"href=\"#severities\">Gravedad de mensajes de error</a> para obtener más " +"información. <a name=\"severities\"/>" #. type: Content of: <html><body><h3> #: en/log.html:28 @@ -70,8 +70,8 @@ msgid "" "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the " "message log." msgstr "" -"<b>Error:</b> mensajes que aparecen cuando algo ha salido muy mal y Tor no " -"puede continuar. Estos mensajes aparecerán resaltados en <i>rojo</i> en el " +"<b>Error:</b> mensajes que aparecen cuando ha habido un error muy grave y " +"Tor no puede continuar. Estos mensajes aparecerán en <i>rojo</i> en el " "registro de mensajes." #. type: Content of: <html><body><ul><li> @@ -81,8 +81,8 @@ msgid "" " Tor, but are not fatal and Tor will continue running. These messages will " "be highlighted in <i>yellow</i>." msgstr "" -"<b>Aviso:</b> mensajes no fatales que aparecen sólo cuando algo ha ido mal " -"con Tor. Tor seguirá funcionando. Estos mensajes aparecerán resaltados en " +"<b>Aviso:</b> mensajes no fatales que aparecen sólo cuando algo ha ido mal, " +"aunque Tor seguirá funcionando. Estos mensajes aparecerán en " "<i>amarillo.</i>" #. type: Content of: <html><body><ul><li> @@ -112,9 +112,9 @@ msgid "" "developers. You should generally not log debug messages unless you know what" " you are doing." msgstr "" -"<b>Depuración:</b> mensajes muy detallados que van dirigidos principalmente " -"a desarrolladores. Generalmente, no debería registrar mensajes de depuración" -" a no ser que sepa lo que está haciendo." +"<b>Debug:</b> mensajes muy detallados que van dirigidos principalmente a " +"desarrolladores. Generalmente, no debería registrar mensajes de depuración a" +" no ser que tenga conocimientos sobre ello." #. type: Content of: <html><body><p> #: en/log.html:66 @@ -124,7 +124,7 @@ msgid "" msgstr "" "La mayoría de los usuarios sólo deberían guardar el registro de los " "siguientes tipos de mensaje: <i>Error</i>, <i>Advertencia</i> y " -"<i>Aviso.</i>" +"<i>Aviso</i>." #. type: Content of: <html><body><p> #: en/log.html:71 @@ -136,7 +136,7 @@ msgstr "" #. type: Content of: <html><body><ol><li> #: en/log.html:73 en/log.html:92 msgid "Open the message log from the Vidalia tray menu." -msgstr "Abra el registro de mensajes en el menú de la bandeja de Vidalia." +msgstr "Abra el registro de mensajes en el menú de Vidalia." #. type: Content of: <html><body><ol><li> #: en/log.html:74 en/log.html:93 @@ -152,7 +152,7 @@ msgid "" " on the left and uncheck message severities you would like to hide." msgstr "" "En el grupo Filtros de mensaje, marque la casilla de los niveles de gravedad" -" de los mensajes de error que le gustaría ver." +" que desea ver." #. type: Content of: <html><body><p><ol><li> #: en/log.html:79 @@ -197,7 +197,7 @@ msgid "" msgstr "" "Si quiere cambiar el archivo donde se guardan los mensajes de error, escriba" " el destino y el nombre del archivo en el cuadro de texto o haga clic en " -"<i>Explorar</i> para elegir el lugar de guardado de su archivo de registro." +"<i>Explorar</i> para elegir el destino de su archivo de registro." #. type: Content of: <html><body><ol><li> #: en/log.html:100 diff --git a/es/services.po b/es/services.po index 1090190..c8fa6a1 100644 --- a/es/services.po +++ b/es/services.po @@ -1,33 +1,24 @@ # -# $Id$ -# -# This file is part of Vidalia, and is subject to the license terms in -# the LICENSE file, found in the top level directory of this -# distribution. If you did not receive the LICENSE file with this -# file, you may obtain it from the Vidalia source package distributed -# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. -# No part of Vidalia, including this file, may be copied, modified, -# propagated, or distributed except according to the terms described -# in the LICENSE file. -# -#, fuzzy +# Translators: +# Ernesto Bernal <ernesto_pow(a)hotmail.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2011-10-07 08:53+0000\n" +"Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #. type: Content of: <html><body><h1> #: en/services.html:16 msgid "Hidden Services" -msgstr "" +msgstr "Servicios ocultos" #. type: Content of: <html><body> #: en/services.html:19 @@ -93,9 +84,8 @@ msgstr "" #. type: Content of: <html><body><p> #: en/services.html:50 msgid "" -"There is a fine tutorial on the Tor website " -"(https://www.torproject.org/docs/tor-hidden-service.html) that describes " -"these steps in more detail." +"There is a fine tutorial on the Tor website (https://www.torproject.org/docs" +"/tor-hidden-service.html) that describes these steps in more detail." msgstr "" #. type: Content of: <html><body> @@ -119,19 +109,19 @@ msgstr "" #: en/services.html:61 msgid "" "Onion Address (generated): The service (or onion) address is generated by " -"Tor to uniquely identify your service. Give this onion address to the people " -"who shall be able to access your service. You may use the \"Copy to " +"Tor to uniquely identify your service. Give this onion address to the people" +" who shall be able to access your service. You may use the \"Copy to " "clipboard\" button for that to avoid typos. If you have just created a " "hidden service, the field says \"[Created by Tor]\"; in order to make it " -"display the real onion address, you need to save your configuration and " -"re-open the settings window." +"display the real onion address, you need to save your configuration and re-" +"open the settings window." msgstr "" #. type: Content of: <html><body><p><ul><li> #: en/services.html:68 msgid "" -"Virtual Port (required): This is the TCP port that clients will need to know " -"in order to access your service. Typically, you will want to use the " +"Virtual Port (required): This is the TCP port that clients will need to know" +" in order to access your service. Typically, you will want to use the " "service-specific port here, e.g. port 80 for HTTP. Note that the virtual " "port usually has nothing to do with firewall settings, because it is only " "used Tor-internally." @@ -170,9 +160,9 @@ msgstr "" #: en/services.html:95 msgid "" "Enabled: If this checkbox is disabled, Vidalia will not configure the given " -"hidden service in Tor. This can be useful for keeping the configuration of a " -"currently unused service for later use. All non-enabled services are stored " -"in the Vidalia-specific configuration file vidalia.conf." +"hidden service in Tor. This can be useful for keeping the configuration of a" +" currently unused service for later use. All non-enabled services are stored" +" in the Vidalia-specific configuration file vidalia.conf." msgstr "" #. type: Content of: <html><body> @@ -193,8 +183,8 @@ msgstr "" #. type: Content of: <html><body><p><ul><li> #: en/services.html:108 msgid "" -"Remove service: Permanently removes a hidden service configuration. (If you " -"want to temporarily remove a service, uncheck its Enabled checkbox.)" +"Remove service: Permanently removes a hidden service configuration. (If you" +" want to temporarily remove a service, uncheck its Enabled checkbox.)" msgstr "" #. type: Content of: <html><body><p><ul><li> @@ -222,8 +212,8 @@ msgstr "" #. type: Content of: <html><body><p> #: en/services.html:122 msgid "" -"Tor allows configuration of more specific settings for hidden services, " -"e.g. forcing to use (or avoiding) certain nodes as introduction points, or " +"Tor allows configuration of more specific settings for hidden services, e.g." +" forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." msgstr "" @@ -232,9 +222,9 @@ msgstr "" msgid "" "However, we decided to simplify things in Vidalia and provide only the most " "common settings. If you want to configure advanced settings, you need to do " -"so in Tor's torrc file. Vidalia will not remove those settings even when you " -"are editing your hidden services. If you specify more than one virtual port, " -"only the first will be displayed and be editable." +"so in Tor's torrc file. Vidalia will not remove those settings even when you" +" are editing your hidden services. If you specify more than one virtual " +"port, only the first will be displayed and be editable." msgstr "" #. type: Content of: <html><body> @@ -255,3 +245,5 @@ msgid "" "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." msgstr "" + +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit f7c3341957d8a6a2656db642b555a9671a61b133 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 08:16:44 2011 +0000 Update translations for vidalia_help --- es/log.po | 135 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 46 deletions(-) diff --git a/es/log.po b/es/log.po index b5d3761..fd56010 100644 --- a/es/log.po +++ b/es/log.po @@ -1,62 +1,67 @@ # -# $Id$ -# -# This file is part of Vidalia, and is subject to the license terms in -# the LICENSE file, found in the top level directory of this -# distribution. If you did not receive the LICENSE file with this -# file, you may obtain it from the Vidalia source package distributed -# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. -# No part of Vidalia, including this file, may be copied, modified, -# propagated, or distributed except according to the terms described -# in the LICENSE file. -# -#, fuzzy +# Translators: +# Daniel Franganillo <dfranganillo(a)gmail.com>, 2011. +# Ernesto Bernal <ernesto_pow(a)hotmail.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2011-10-07 08:10+0000\n" +"Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #. type: Content of: <html><body><h1> #: en/log.html:16 msgid "Message Log" -msgstr "" +msgstr "Registro de mensajes" #. type: Content of: <html><body> #: en/log.html:19 msgid "" -"The message log lets you see status information about a running Tor " -"process. <a name=\"basic\"/> Each message has a <i>severity</i> associated " -"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most " -"verbose). See the help section on <a href=\"#severities\">message " -"severities</a> for more information. <a name=\"severities\"/>" -msgstr "" +"The message log lets you see status information about a running Tor process." +" <a name=\"basic\"/> Each message has a <i>severity</i> associated with it," +" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). " +"See the help section on <a href=\"#severities\">message severities</a> for " +"more information. <a name=\"severities\"/>" +msgstr "" +"El registro de mensajes le permite ver la información de estado acerca de un" +" proceso en ejecución de Tor. <a name=\"basic\"/>Cada mensaje tiene un nivel" +" de <i>gravedad</i> asociado a él, que van desde <b>Errorr</b> (lo más " +"importante) a <b>Debug</b> (más detallado). Vea la sección de ayuda en</a> " +"<a href=\"#severities\">gravedad de mensaje</a> para obtener más " +"información." #. type: Content of: <html><body><h3> #: en/log.html:28 msgid "Message Severities" -msgstr "" +msgstr "Gravedad de mensajes de error" #. type: Content of: <html><body><p> #: en/log.html:30 msgid "" "A message's severity tells you how important the message is. A higher " -"severity message usually indicates that something has gone wrong with " -"Tor. Lower severity messages appear frequently during normal Tor operations " -"and usually do not need to be logged." +"severity message usually indicates that something has gone wrong with Tor. " +"Lower severity messages appear frequently during normal Tor operations and " +"usually do not need to be logged." msgstr "" +"La gravedad de un mensaje indica el nivel de importancia de un mensaje. Un " +"mensaje de mayor gravedad por lo general indica que algo ha ido mal con Tor." +" Mensajes de menor gravedad aparecen con frecuencia durante las operaciones " +"normales de Tor y por lo general no es necesario registrarlos." #. type: Content of: <html><body><p> #: en/log.html:37 -msgid "The possible message severities, from most severe to least severe, are:" +msgid "" +"The possible message severities, from most severe to least severe, are:" msgstr "" +"La gravedad de mensajes de error posibles, desde los más graves a menos " +"graves, son los siguientes:" #. type: Content of: <html><body><ul><li> #: en/log.html:41 @@ -65,36 +70,51 @@ msgid "" "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the " "message log." msgstr "" +"<b>Error:</b> mensajes que aparecen cuando algo ha salido muy mal y Tor no " +"puede continuar. Estos mensajes aparecerán resaltados en <i>rojo</i> en el " +"registro de mensajes." #. type: Content of: <html><body><ul><li> #: en/log.html:46 msgid "" -"<b>Warning</b>: Messages that only appear when something has gone wrong with " -"Tor, but are not fatal and Tor will continue running. These messages will be " -"highlighted in <i>yellow</i>." +"<b>Warning</b>: Messages that only appear when something has gone wrong with" +" Tor, but are not fatal and Tor will continue running. These messages will " +"be highlighted in <i>yellow</i>." msgstr "" +"<b>Aviso:</b> mensajes no fatales que aparecen sólo cuando algo ha ido mal " +"con Tor. Tor seguirá funcionando. Estos mensajes aparecerán resaltados en " +"<i>amarillo.</i>" #. type: Content of: <html><body><ul><li> #: en/log.html:51 msgid "" -"<b>Notice</b>: Messages that appear infrequently during normal Tor operation " -"and are not considered errors, but you still may care about." +"<b>Notice</b>: Messages that appear infrequently during normal Tor operation" +" and are not considered errors, but you still may care about." msgstr "" +"<b>Aviso:</b> mensajes que aparecen con poca frecuencia durante la operación" +" normal de Tor y no se consideran errores, pero es posible que aún le " +"preocupen." #. type: Content of: <html><body><ul><li> #: en/log.html:55 msgid "" -"<b>Info</b>: Messages that appear frequently during normal Tor operation and " -"are not usually of interest to most users." +"<b>Info</b>: Messages that appear frequently during normal Tor operation and" +" are not usually of interest to most users." msgstr "" +"<b>Información</b>:mensajes que aparecen frecuentemente durante el " +"funcionamiento de Tor y que normalmente no son de interés para la mayoría de" +" usuarios." #. type: Content of: <html><body><ul><li> #: en/log.html:59 msgid "" "<b>Debug</b>: Extremely verbose messages that are primarily of interest to " -"developers. You should generally not log debug messages unless you know what " -"you are doing." +"developers. You should generally not log debug messages unless you know what" +" you are doing." msgstr "" +"<b>Depuración:</b> mensajes muy detallados que van dirigidos principalmente " +"a desarrolladores. Generalmente, no debería registrar mensajes de depuración" +" a no ser que sepa lo que está haciendo." #. type: Content of: <html><body><p> #: en/log.html:66 @@ -102,43 +122,53 @@ msgid "" "Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> " "messages." msgstr "" +"La mayoría de los usuarios sólo deberían guardar el registro de los " +"siguientes tipos de mensaje: <i>Error</i>, <i>Advertencia</i> y " +"<i>Aviso.</i>" #. type: Content of: <html><body><p> #: en/log.html:71 -msgid "To select which message severities you would like to see, do the following:" +msgid "" +"To select which message severities you would like to see, do the following:" msgstr "" +"Para seleccionar los mensajes de error que desea ver, haga lo siguiente:" #. type: Content of: <html><body><ol><li> #: en/log.html:73 en/log.html:92 msgid "Open the message log from the Vidalia tray menu." -msgstr "" +msgstr "Abra el registro de mensajes en el menú de la bandeja de Vidalia." #. type: Content of: <html><body><ol><li> #: en/log.html:74 en/log.html:93 msgid "Click on <i>Settings</i> at the top of the message log window." msgstr "" +"En la parte superior de la ventana de mensajes, haga clic en " +"<i>Configuración</i>." #. type: Content of: <html><body><p><ol><li> #: en/log.html:76 msgid "" -"Check message severities you would like to see from the Message Filter group " -"on the left and uncheck message severities you would like to hide." +"Check message severities you would like to see from the Message Filter group" +" on the left and uncheck message severities you would like to hide." msgstr "" +"En el grupo Filtros de mensaje, marque la casilla de los niveles de gravedad" +" de los mensajes de error que le gustaría ver." #. type: Content of: <html><body><p><ol><li> #: en/log.html:79 msgid "Click <i>Save Settings</i> to apply your new message filter." msgstr "" +"Haga clic en <i>Guardar configuración</i> para aplicar su nuevo filtro." #. type: Content of: <html><body> #: en/log.html:84 msgid "<a name=\"logfile\"/>" -msgstr "" +msgstr "<a name=\"logfile\"/>" #. type: Content of: <html><body><h3> #: en/log.html:85 msgid "Logging to a File" -msgstr "" +msgstr "Guardar entradas de registro en un archivo" #. type: Content of: <html><body><p> #: en/log.html:87 @@ -146,11 +176,17 @@ msgid "" "Vidalia can also write log messages to a file, as well as logging them in " "the message log window. To enable logging to a file, follow these steps:" msgstr "" +"Mientras se registran mensajes en la ventana de registros, Vidalia también " +"puede crear un archivo con ellos. Para habilitar el guardado de registros en" +" un archivo, siga los siguientes pasos:" #. type: Content of: <html><body><ol><li> #: en/log.html:94 -msgid "Check the box labeled <i>Automatically save new log messages to a file</i>." +msgid "" +"Check the box labeled <i>Automatically save new log messages to a file</i>." msgstr "" +"Marque la casilla <i>Guardar de manera automática mensajes de registro en un" +" archivo</i>." #. type: Content of: <html><body><ol><li> #: en/log.html:96 @@ -159,8 +195,15 @@ msgid "" "either type the path and filename into the text box, or click <i>Browse</i> " "to navigate to a location for your log file." msgstr "" +"Si quiere cambiar el archivo donde se guardan los mensajes de error, escriba" +" el destino y el nombre del archivo en el cuadro de texto o haga clic en " +"<i>Explorar</i> para elegir el lugar de guardado de su archivo de registro." #. type: Content of: <html><body><ol><li> #: en/log.html:100 msgid "Click <i>Save Settings</i> to save your log destination." msgstr "" +"Para guardar el destino del archivo haga clic en <i>Guardar " +"configuración</i>." + +

1 0

r25156: {website} Minor cleanup to TBB design doc. (website/trunk/projects/torbrowser/design)
by Mike Perry 07 Oct '11

07 Oct '11

Author: mikeperry Date: 2011-10-07 02:52:40 +0000 (Fri, 07 Oct 2011) New Revision: 25156 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Minor cleanup to TBB design doc. Modified: website/trunk/projects/torbrowser/design/index.html.en =================================================================== --- website/trunk/projects/torbrowser/design/index.html.en 2011-10-07 00:35:15 UTC (rev 25155) +++ website/trunk/projects/torbrowser/design/index.html.en 2011-10-07 02:52:40 UTC (rev 25156) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 6 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2597772">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pri vacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Clic k-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2597772"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 6 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2650133">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pri vacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Clic k-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2650133"></a>1. Introduction</h2></div></div></div><p> This document describes the <a class="link" href="#adversary" title="1.1. Adversary Model">adversary model</a>, <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">design requirements</a>, @@ -120,12 +120,12 @@ is definitely useful, and the metric is probably the appropriate one for determining how identifying a particular browser property is. However, some quirks of their study means that they do not extract as much information as -they could from display information: they only use desktop resolution (which -Torbutton reports as the window resolution) and do not attempt to infer the -size of toolbars. In the other direction, they may be over-counting in some -areas, as they did not compute joint entropy over multiple attributes that may -exhibit a high degree of correlation. Also, new browser features are added -regularly, so the data should not be taken as final. +they could from display information: they only use desktop resolution and do +not attempt to infer the size of toolbars. In the other direction, they may be +over-counting in some areas, as they did not compute joint entropy over +multiple attributes that may exhibit a high degree of correlation. Also, new +browser features are added regularly, so the data should not be taken as +final. </p><p> @@ -143,14 +143,20 @@ </p></li><li class="listitem"><span class="command"><strong>Inserting Javascript</strong></span><p> Javascript can reveal a lot of fingerprinting information. It provides DOM -objects, just as window.screen and window.navigator to extract information -about the useragent. Also, Javascript can be used to query the user's timezone -via the <code class="function">Date()</code> object, and to use timing information to -<a class="ulink" href="http://w2spconf.com/2011/papers/jspriv.pdf" target="_top">fingerprint the CPU -and interpreter speed</a>. +objects such as window.screen and window.navigator to extract information +about the useragent. +Also, Javascript can be used to query the user's timezone via the +<code class="function">Date()</code> object, <a class="ulink" href="https://www.khronos.org/registry/webgl/specs/1.0/#5.13" target="_top">WebGL</a> can +reveal information about the video cart in use, and high precision timing +information can be used to <a class="ulink" href="http://w2spconf.com/2011/papers/jspriv.pdf" target="_top">fingerprint the CPU and +interpreter speed</a>. In the future, new JavaScript features such as +<a class="ulink" href="http://w3c-test.org/webperf/specs/ResourceTiming/" target="_top">Resource +Timing</a> may leak an unknown amount of network timing related +information. + </p></li><li class="listitem"><span class="command"><strong>Inserting Plugins</strong></span><p> The Panopticlick project found that the mere list of installed plugins (in @@ -422,13 +428,13 @@ Tor Browser State is separated from existing browser state through use of a custom Firefox profile. Furthermore, plugins are disabled, which prevents Flash cookies from leaking from a pre-existing Flash directory. - </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2616664"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2666962"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> Tor Browser MUST (at user option) prevent all disk records of browser activity. The user should be able to optionally enable URL history and other history features if they so desire. Once we <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3100" target="_top">simplify the preferences interface</a>, we will likely just enable Private Browsing mode by default to handle this goal. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2606128"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2666425"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> For now, Tor Browser blocks write access to the disk through Torbutton using several Firefox preferences. @@ -493,7 +499,7 @@ context-menu option to drill down into specific types of state or permissions. An example of this simplification can be seen in Figure 1. - </p><div class="figure"><a id="id2612402"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> + </p><div class="figure"><a id="id2663383"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> On the left is the standard Firefox cookie manager. On the right is a mock-up of how isolating identifiers to the URL bar origin might simplify the privacy @@ -604,7 +610,9 @@ </p><p><span class="command"><strong>Implementation Status:</strong></span> We <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/4099" target="_top">plan to -disable</a> TLS session resumption, and limit HTTP Keep-alive duration. +disable</a> TLS session resumption, and limit HTTP Keep-alive duration. We +currently clear TLS Session IDs upon <a class="link" href="#new-identity" title="3.7. Long-Term Unlinkability via "New Identity" button">New +Identity</a>. </p></li><li class="listitem">User confirmation for cross-origin redirects <p><span class="command"><strong>Design Goal:</strong></span> @@ -910,11 +918,11 @@ </p></li></ol></div></div><div class="sect2" title="3.7. Long-Term Unlinkability via "New Identity" button"><div class="titlepage"><div><div><h3 class="title"><a id="new-identity"></a>3.7. Long-Term Unlinkability via "New Identity" button</h3></div></div></div><p> In order to avoid long-term linkability, we provide a "New Identity" context menu option in Torbutton. - </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2626323"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2662516"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> All linkable identifiers and browser state MUST be cleared by this feature. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2612376"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2678689"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> First, Torbutton disables all open tabs and windows via nsIContentPolicy blocking, and then closes each tab and window. The extra step for blocking @@ -1013,7 +1021,7 @@ This patch prevents random URLs from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps other site prefs?). - </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2621568"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2614080"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2613296"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> + </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2671107"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2671454"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2674390"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> The purpose of this section is to cover all the known ways that Tor browser security can be subverted from a penetration testing perspective. The hope

1 0

r25155: {website} Update TBB design doc based on comments from pde. (website/trunk/projects/torbrowser/design)
by Mike Perry 07 Oct '11

07 Oct '11

Author: mikeperry Date: 2011-10-07 00:35:15 +0000 (Fri, 07 Oct 2011) New Revision: 25155 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Update TBB design doc based on comments from pde. Modified: website/trunk/projects/torbrowser/design/index.html.en =================================================================== --- website/trunk/projects/torbrowser/design/index.html.en 2011-10-06 16:18:04 UTC (rev 25154) +++ website/trunk/projects/torbrowser/design/index.html.en 2011-10-07 00:35:15 UTC (rev 25155) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 4 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2857732">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pri vacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Clic k-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2857732"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 6 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2597772">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pri vacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Clic k-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2597772"></a>1. Introduction</h2></div></div></div><p> This document describes the <a class="link" href="#adversary" title="1.1. Adversary Model">adversary model</a>, <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">design requirements</a>, @@ -58,11 +58,11 @@ The adversary can run exit nodes, or alternatively, they may control routers upstream of exit nodes. Both of these scenarios have been observed in the wild. - </p></li><li class="listitem"><span class="command"><strong>Adservers and/or Malicious Websites</strong></span><p> + </p></li><li class="listitem"><span class="command"><strong>Ad servers and/or Malicious Websites</strong></span><p> The adversary can also run websites, or more likely, they can contract out -ad space from a number of different adservers and inject content that way. For -some users, the adversary may be the adservers themselves. It is not -inconceivable that adservers may try to subvert or reduce a user's anonymity +ad space from a number of different ad servers and inject content that way. For +some users, the adversary may be the ad servers themselves. It is not +inconceivable that ad servers may try to subvert or reduce a user's anonymity through Tor for marketing purposes. </p></li><li class="listitem"><span class="command"><strong>Local Network/ISP/Upstream Router</strong></span><p> The adversary can also inject malicious content at the user's upstream router @@ -80,7 +80,7 @@ positions to accomplish various aspects of their goals. It should be noted that many of these attacks (especially those involving IP address leakage) are often performed by accident by websites that simply have Javascript, dynamic -CSS elements, and plugins. Others are performed by adservers seeking to +CSS elements, and plugins. Others are performed by ad servers seeking to correlate users' activity across different IP addresses, and still others are performed by malicious agents on the Tor network and at national firewalls. @@ -187,7 +187,8 @@ </p></li></ol></div></div></div></div><div class="sect1" title="2. Design Requirements and Philosophy"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="DesignRequirements"></a>2. Design Requirements and Philosophy</h2></div></div></div><p> The Tor Browser Design Requirements are meant to describe the properties of a -Private Browsing Mode that defends against both network and forensic adversaries. +Private Browsing Mode that defends against both network and local forensic +adversaries. </p><p> @@ -237,7 +238,9 @@ of private browsing to disk outside of the application's control. The user must be able to ensure that secure removal of the software is sufficient to remove evidence of the use of the software. All exceptions and shortcomings -due to operating system behavior MUST BE wiped by an uninstaller. +due to operating system behavior MUST BE wiped by an uninstaller. However, due +to permissions issues with access to swap, implementations MAY choose to leave +it out of scope, and/or leave it to the user to implement encrypted swap. </p></li><li class="listitem"><span class="command"><strong>Update Safety</strong></span><p>The browser SHOULD NOT perform unsafe updates or upgrades.</p></li></ol></div></div><div class="sect2" title="2.2. Privacy Requirements"><div class="titlepage"><div><div><h3 class="title"><a id="privacy"></a>2.2. Privacy Requirements</h3></div></div></div><p> @@ -259,10 +262,12 @@ </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Cross-Origin Identifier Unlinkability</strong></span><p> User activity on one url bar origin MUST NOT be linkable to their activity in -any other url bar origin by any third party. This property specifically applies to -linkability from stored browser identifiers, authentication tokens, and shared -state. This functionality SHOULD NOT interfere with federated login in a -substantial way. +any other url bar origin by any third party automatically or without user +interaction or approval. This requirement specifically applies to linkability +from stored browser identifiers, authentication tokens, and shared state. The +requirement does not apply to linkable information the user manually submits +to sites, or due information submitted during manual link traversal. This +functionality SHOULD NOT interfere with federated login in a substantial way. </p></li><li class="listitem"><span class="command"><strong>Cross-Origin Fingerprinting Unlinkability</strong></span><p> @@ -417,13 +422,13 @@ Tor Browser State is separated from existing browser state through use of a custom Firefox profile. Furthermore, plugins are disabled, which prevents Flash cookies from leaking from a pre-existing Flash directory. - </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2886678"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2616664"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> Tor Browser MUST (at user option) prevent all disk records of browser activity. The user should be able to optionally enable URL history and other history features if they so desire. Once we <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3100" target="_top">simplify the preferences interface</a>, we will likely just enable Private Browsing mode by default to handle this goal. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2874561"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2606128"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> For now, Tor Browser blocks write access to the disk through Torbutton using several Firefox preferences. @@ -488,7 +493,7 @@ context-menu option to drill down into specific types of state or permissions. An example of this simplification can be seen in Figure 1. - </p><div class="figure"><a id="id2867838"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> + </p><div class="figure"><a id="id2612402"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> On the left is the standard Firefox cookie manager. On the right is a mock-up of how isolating identifiers to the URL bar origin might simplify the privacy @@ -578,6 +583,7 @@ make this behavior unlinkable, we wish to include a settings file for all platforms that disables flash cookies using the <a class="ulink" href="http://www.macromedia.com/support/documentation/en/flashplayer/help/setting…" target="_top">Flash settings manager</a>. + </p><p><span class="command"><strong>Implementation Status:</strong></span> We are currently <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3974" target="_top">having @@ -608,11 +614,17 @@ MUST prompt users before following redirects that would cause the user to automatically navigate between two different url bar origins. - </p><p><span class="command"><strong>Implementation status:</strong></span> +</p><p> -There are numerous ways for the user to be redirected, and the Firefox API -support to detect each of them is poor. We have a <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3600" target="_top">trac bug -open</a> to implement what we can. +However, to +reduce the occurrence of warning fatigue, these warning messages MAY be limited +to automated redirect cycles only. For example, the automated redirect +sequence <span class="command"><strong>User Click -> t.co -> bit.ly -> cnn.com</strong></span> can be +assumed to be benign, but the redirect sequence <span class="command"><strong>User Click -> t.co -> +bit.ly -> cnn.com -> 2o7.net -> scorecardresearch.net -> cnn.com</strong></span> is +clearly due to tracking. Non-automated redirect cycles that require +user input at some step (such as federated login systems) need not be +interrupted by the UI. </p><p> @@ -622,6 +634,12 @@ especially with frequent use of the <a class="link" href="#new-identity" title="3.7. Long-Term Unlinkability via "New Identity" button">New Identity</a> button. + </p><p><span class="command"><strong>Implementation status:</strong></span> + +There are numerous ways for the user to be redirected, and the Firefox API +support to detect each of them is poor. We have a <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3600" target="_top">trac bug +open</a> to implement what we can. + </p></li><li class="listitem">window.name <p> @@ -639,7 +657,36 @@ for the duration of a link-driven navigation session, but as soon as the user enters a new URL or navigates between https/http schemes, the property is cleared. - </p></li><li class="listitem">Exit node usage + </p></li><li class="listitem">Auto form-fill + <p> + +We disable the password saving functionality in the browser as part of our +<a class="link" href="#disk-avoidance" title="3.3. Disk Avoidance">Disk Avoidance</a> requirement. However, +since users may decide to re-enable disk history records and password saving, +we also set the <a class="ulink" href="http://kb.mozillazine.org/Signon.autofillForms" target="_top">signon.autofillForms</a> +preference to false to prevent saved values from immediately populating +fields upon page load. Since Javascript can read these values as soon as they +appear, setting this preference prevents automatic linkability from stored passwords. + + </p></li><li class="listitem">HSTS supercookies + <p> +An extreme (but not impossible) attack to mount is the creation of <a class="ulink" href="https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_Strict_Transport_Securi…" target="_top">HSTS</a> +supercookies. Since HSTS effectively stores one bit of information per domain +name, an adversary in possession of numerous domains can use them to construct +cookies based on stored HSTS state. + + </p><p><span class="command"><strong>Design Goal:</strong></span> + +There appears to be three options for us: 1. Disable HSTS entirely, and rely +instead on HTTPS-Everywhere. 2. Restrict the number of HSTS-enabled third +parties allowed per url bar origin. 3. Prevent third parties from storing HSTS +rules. We have not yet decided upon the best approach. + + </p><p><span class="command"><strong>Implementation Status:</strong></span> Currently, HSTS state is +cleared by <a class="link" href="#new-identity" title="3.7. Long-Term Unlinkability via "New Identity" button">New Identity</a>, but we don't +defend against the creation of these cookies between <span class="command"><strong>New +Identity</strong></span> invocations. + </p></li><li class="listitem">Exit node usage <p><span class="command"><strong>Design Goal:</strong></span> Every distinct navigation session (as defined by a non-blank referer header) @@ -715,11 +762,22 @@ pre-built list to query, a large amount of fingerprintable information may still be available. + </p><p> + +The sure-fire way to address font linkability is to ship the browser with a +font for every language, typeface, and style in use in the world, and to only +use those fonts at the exclusion of system fonts. However, this set may be +impractically large. It is possible that a smaller <a class="ulink" href="https://secure.wikimedia.org/wikipedia/en/wiki/Unicode_typeface#List_of_Uni…" target="_top">common +subset</a> may be found that provides total coverage. However, we believe +that with strong url bar origin identifier isolation, a simpler approach can reduce the +number of bits available to the adversary while avoiding the rendering and +language issues of supporting a global font set. + </p><p><span class="command"><strong>Design Goal:</strong></span> -To address the Javascript issue, we intend to <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/2872" target="_top">limit the number of -fonts</a> an origin can load, gracefully degrading to built-in and/or -remote fonts once the limit is reached. +We intend to <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/2872" target="_top">limit the number of +fonts</a> a url bar origin can load, gracefully degrading to built-in +and/or remote fonts once the limit is reached. </p><p><span class="command"><strong>Implementation Status:</strong></span> @@ -805,7 +863,7 @@ even with the default precision in most browsers, they required up to 120 seconds of amortization and repeated trials to get stable results from their feature set. We intend to work with the research community to establish the -optimum tradeoff between quantization+jitter and amortization time. +optimum trade-off between quantization+jitter and amortization time. </p><p><span class="command"><strong>Implementation Status:</strong></span> @@ -852,22 +910,24 @@ </p></li></ol></div></div><div class="sect2" title="3.7. Long-Term Unlinkability via "New Identity" button"><div class="titlepage"><div><div><h3 class="title"><a id="new-identity"></a>3.7. Long-Term Unlinkability via "New Identity" button</h3></div></div></div><p> In order to avoid long-term linkability, we provide a "New Identity" context menu option in Torbutton. - </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2853903"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2626323"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> All linkable identifiers and browser state MUST be cleared by this feature. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2874701"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> - First, Torbutton disables -all open tabs and windows via nsIContentPolicy blocking, and then closes each -tab and window. The extra step for blocking tabs is done as a precaution to -ensure that any asynchronous Javascript is in fact properly disabled. After -closing all of the windows, we then clear the following state: OCSP (by -toggling security.OCSP.enabled), cache, site-specific zoom and content -preferences, Cookies, DOM storage, safe browsing key, the Google wifi -geolocation token (if exists), HTTP auth, SSL Session IDs, and the last opened URL -field (via the pref general.open_location.last_url). After clearing the -browser state, we then send the NEWNYM signal to the Tor control port to cause -a new circuit to be created. + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2612376"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + + First, Torbutton disables all open tabs and windows via nsIContentPolicy +blocking, and then closes each tab and window. The extra step for blocking +tabs is done as a precaution to ensure that any asynchronous Javascript is in +fact properly disabled. After closing all of the windows, we then clear the +following state: OCSP (by toggling security.OCSP.enabled), cache, +site-specific zoom and content preferences, Cookies, DOM storage, safe +browsing key, the Google wifi geolocation token (if exists), HTTP auth, SSL +Session IDs, HSTS state, and the last opened URL field (via the pref +general.open_location.last_url). After clearing the browser state, we then +send the NEWNYM signal to the Tor control port to cause a new circuit to be +created. + </blockquote></div></div></div><div class="sect2" title="3.8. Click-to-play for plugins and invasive content"><div class="titlepage"><div><div><h3 class="title"><a id="click-to-play"></a>3.8. Click-to-play for plugins and invasive content</h3></div></div></div><p> Some content types are too invasive and/or too opaque for us to properly eliminate their linkability properties. For these content types, we use @@ -895,7 +955,8 @@ This patch exposes a pref 'permissions.memory_only' that properly isolates the permissions manager to memory, which is responsible for all user specified -site permissions, as well as stored HTTPS STS policy from visited sites. +site permissions, as well as stored <a class="ulink" href="https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_Strict_Transport_Securi…" target="_top">HSTS</a> +policy from visited sites. The pref does successfully clear the permissions manager memory if toggled. It does not need to be set in prefs.js, and can be handled by Torbutton. @@ -952,7 +1013,7 @@ This patch prevents random URLs from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps other site prefs?). - </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2886800"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2882777"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2864076"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> + </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2621568"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2614080"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2613296"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> The purpose of this section is to cover all the known ways that Tor browser security can be subverted from a penetration testing perspective. The hope

1 0

[torbutton/master] Bug 4197: Torbutton formfill blocking can't be undone
by mikeperry＠torproject.org 06 Oct '11

06 Oct '11

commit 9e2cbd2993c595abf1e67bdf887578bd086c73b5 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Oct 6 14:10:08 2011 -0700 Bug 4197: Torbutton formfill blocking can't be undone We still require a toggle, which is very difficult for TBB users. Filed #4198 for that, as several prefs are involved, and we probably want to wait for bug #3100 anyways. Also, we should set signon.autoformFill to false during Tor usage regardless of this pref, for unlinkability. So we now do so. --- src/chrome/content/torbutton.js | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8b0837e..1c76f03 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -300,6 +300,8 @@ var torbutton_unique_pref_observer = torbutton_update_status( m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"), true); + // XXX: We should try to get rid of these warnings now that toggle + // is not supported in TBB. case "extensions.torbutton.disable_domstorage": case "extensions.torbutton.no_updates": case "extensions.torbutton.no_search": @@ -1838,8 +1840,16 @@ function torbutton_update_status(mode, force_update) { false, mode, changed); torbutton_setBoolPref("signon.rememberSignons", "remember_signons", false, mode, changed); + } else { + torbutton_setBoolPref("browser.formfill.enable", "formfill", + true, mode, changed); + torbutton_setBoolPref("signon.rememberSignons", "remember_signons", + true, mode, changed); } + torbutton_setBoolPref("signon.autofillForms", "autofillForms", + false, mode, changed); + if (m_tb_ff4) { if(m_tb_prefs.getBoolPref('extensions.torbutton.block_thwrite')) { m_tb_prefs.setBoolPref("places.history.enabled", false); @@ -1866,6 +1876,10 @@ function torbutton_update_status(mode, force_update) { torbutton_setBoolPref("signon.rememberSignons", "remember_signons", false, mode, changed); } + + torbutton_setBoolPref("signon.autofillForms", "autofillForms", + true, mode, changed); + if (m_tb_ff4) { if(m_tb_prefs.getBoolPref('extensions.torbutton.block_nthwrite')) { m_tb_prefs.setBoolPref("places.history.enabled", false);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 06 Oct '11

06 Oct '11

commit 443f020f9de919363a71becc841e445dab9e808c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 6 19:04:39 2011 +0000 Update translations for vidalia_help --- de/running.po | 63 ++++++++++++++++++++++++++------------------------------ 1 files changed, 29 insertions(+), 34 deletions(-) diff --git a/de/running.po b/de/running.po index b73d5d3..688c035 100644 --- a/de/running.po +++ b/de/running.po @@ -1,27 +1,19 @@ # -# $Id$ -# -# This file is part of Vidalia, and is subject to the license terms in -# the LICENSE file, found in the top level directory of this -# distribution. If you did not receive the LICENSE file with this -# file, you may obtain it from the Vidalia source package distributed -# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. -# No part of Vidalia, including this file, may be copied, modified, -# propagated, or distributed except according to the terms described -# in the LICENSE file. -# +# Translators: +# runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-06-26 15:18-0600\n" -"Last-Translator: Runa Sandvik <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2010-11-30 05:03+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #. type: Content of: <html><body><h1> #: en/running.html:16 @@ -80,8 +72,8 @@ msgstr "" msgid "" "If Vidalia is unable to start Tor, Vidalia will display an error message " "telling you what went wrong. You can also look at your <a " -"href=\"log.html\">message log</a> to see if Tor printed any more information " -"about what went wrong." +"href=\"log.html\">message log</a> to see if Tor printed any more information" +" about what went wrong." msgstr "" "Falls Vidalia Tor nicht starten konnte, wird Ihnen eine Fehlermeldung mit " "entsprechenden Hinweisen angezeigt. Sie können außerdem im <a " @@ -97,8 +89,8 @@ msgstr "Um Tor zu <i>stoppen</i>," #: en/running.html:45 msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>" msgstr "" -"wählen Sie <i>Stop</i> aus Vidalias Traymenü oder drücken Sie " -"<i>Strg+T</i>" +"wählen Sie <i>Stop</i> aus Vidalias Traymenü oder drücken Sie" +" <i>Strg+T</i>" #. type: Content of: <html><body><p><ol><li> #: en/running.html:47 @@ -114,8 +106,8 @@ msgstr "" msgid "" "If Vidalia was unable to stop Tor, Vidalia will display an error message " "telling you what went wrong. You can also look at your <a " -"href=\"log.html\">message log</a> to see if Tor printed any more information " -"about what went wrong." +"href=\"log.html\">message log</a> to see if Tor printed any more information" +" about what went wrong." msgstr "" "Falls Vidalia Tor nicht beenden konnte, wird Ihnen eine Fehlermeldung mit " "entsprechenden Hinweisen angezeigt. Sie können außerdem im <a " @@ -145,7 +137,8 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:69 -msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor." +msgid "" +"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor." msgstr "" "Tor wurde gestoppt. Wählen Sie <i>Start</i> aus dem Vidalia-Menü " "um Tor zu starten." @@ -163,15 +156,15 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:84 msgid "" -"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia " -"menu. Tor will print informational messages to the <a " +"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia" +" menu. Tor will print informational messages to the <a " "href=\"log.html\">message log</a> while it is running, if you want to see " "what Tor is doing." msgstr "" "Tor wird ausgeführt. Falls Sie Tor stoppen wollen, wählen Sie " "<i>Stop</i> aus dem Vidalia-Menü. Tor speichert während des " -"Betriebs Informationen im <a href=\\\"log.html\\\">Nachrichtenprotokoll</a>. Um " -"weitere Informationen zu erfahren, können Sie dort nachschauen." +"Betriebs Informationen im <a href=\\\"log.html\\\">Nachrichtenprotokoll</a>." +" Um weitere Informationen zu erfahren, können Sie dort nachschauen." #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:92 @@ -182,12 +175,14 @@ msgstr "Tor wird gerade gestoppt." #: en/running.html:98 msgid "" "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion " -"with a red X and display an error message letting you know what went " -"wrong. You can also check the <a href=\"log.html\">message log</a> for " -"details about any problems Tor encountered before it exited." +"with a red X and display an error message letting you know what went wrong. " +"You can also check the <a href=\"log.html\">message log</a> for details " +"about any problems Tor encountered before it exited." msgstr "" -"Falls Tor unerwartet beendet wird, verändert sich das Vidalia-Symbol zu " -"einer dunklen Zwiebel mit einem roten X und eine entsprechende " +"Falls Tor unerwartet beendet wird, verändert sich das Vidalia-Symbol zu" +" einer dunklen Zwiebel mit einem roten X und eine entsprechende " "Fehlermeldung wird angezeigt. Sie können außerdem das <a " -"href=\\\"log.html\\\">Nachrichtenprotokoll</a> auf weitere Details zu Problemen " -"untersuchen, die zur Beendigung von Tor geführt haben." +"href=\\\"log.html\\\">Nachrichtenprotokoll</a> auf weitere Details zu " +"Problemen untersuchen, die zur Beendigung von Tor geführt haben." + +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 06 Oct '11

06 Oct '11

commit 9f0a041fad2d4883b48d3aec28be80b87865a2ca Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 6 18:34:39 2011 +0000 Update translations for vidalia_help --- zh_CN/troubleshooting.po | 96 +++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 51 deletions(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 92dddad..d07ac05 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -1,34 +1,24 @@ # -# $Id$ -# -# This file is part of Vidalia, and is subject to the license terms in -# the LICENSE file, found in the top level directory of this -# distribution. If you did not receive the LICENSE file with this -# file, you may obtain it from the Vidalia source package distributed -# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html. -# No part of Vidalia, including this file, may be copied, modified, -# propagated, or distributed except according to the terms described -# in the LICENSE file. -# +# Translators: +# jhk <j_hk001(a)126.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2010-11-18 16:08+0200\n" -"Last-Translator: jonchil <abcd666(a)gmail.com>\n" +"PO-Revision-Date: 2011-03-22 16:45+0000\n" +"Last-Translator: jhk <j_hk001(a)126.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0\n" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 msgid "Troubleshooting" -msgstr "故障处理" +msgstr "疑难解答" # type: Content of: <html><body> #: en/troubleshooting.html:19 @@ -38,8 +28,8 @@ msgid "" "having, check out our website at <i>www.vidalia-project.net</i> for more " "support and information. <a name=\"start\"/>" msgstr "" -"以下列表中是一些运行 Tor 时常见的问题。如果以下没有您所遇到的问题。请访问我们的网站来获取更多的支持和信息<i>www.vidalia-" -"project.net</i><a name=\"start\"/>" +"下面列出常见的问题或疑问。如果你不能找到任何有关于你的具体问题，请访问<i>www.vidalia-" +"project.net</i>以获得更多的信息和支持。" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25 @@ -51,25 +41,27 @@ msgstr "我无法启动 Tor" msgid "" "The most likely reason that Vidalia could not start Tor is because Vidalia " "is looking for your Tor installation in the wrong directory. You can tell " -"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in " -"the <a href=\"config.html#general\">general configuration settings</a>." +"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in" +" the <a href=\"config.html#general\">general configuration settings</a>." msgstr "" +"Vidalia 无法启动Tor最可能的原因是因为Vidalia在错误的目录寻找你的Tor安装。你可以通过查阅<a " +"href=\"config.html#general\">一般设置</a>并修改<i>Tor执行文件</i>选项以告诉Vidalia Tor的正确路径。" # type: Content of: <html><body><p> #: en/troubleshooting.html:33 msgid "" "Another possible reason that Tor cannot start is because there is already " -"another Tor process running. Check your list of running process and stop the " -"previous Tor process, if you find one. Then, try running Tor again." -msgstr "" +"another Tor process running. Check your list of running process and stop the" +" previous Tor process, if you find one. Then, try running Tor again." +msgstr "Tor不能启动的另一个可能原因是因为已经有另一个Tor进程运行。检查您的运行进程列表，并停止以前的Tor进程。然后，尝试再次运行Tor。" # type: Content of: <html><body><p> #: en/troubleshooting.html:38 msgid "" -"If that did not help, check your <a href=\"log.html\">message log</a> to see " -"if Tor printed any information about errors it encountered while trying to " +"If that did not help, check your <a href=\"log.html\">message log</a> to see" +" if Tor printed any information about errors it encountered while trying to " "start." -msgstr "" +msgstr "如果这样没有帮助，检查您的<a href=\"log.html\">消息日志</a> ，看看Tor是否记录有尝试启动时遇到错误的任何信息。" # type: Content of: <html><body> #: en/troubleshooting.html:43 @@ -83,7 +75,8 @@ msgstr "" # type: Content of: <html><body><p> #: en/troubleshooting.html:46 -msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>." +msgid "" +"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>." msgstr "" # type: Content of: <html><body><p> @@ -101,9 +94,9 @@ msgid "" "If Tor is listening on a different port than Vidalia expects, Vidalia will " "be unable to connect to Tor. You rarely need to change this setting, but if " "there is another service running on your machine that conflicts with Tor's " -"control port, you will need to specify a different port. You can change this " -"setting in Vidalia's <a href=\"config.html#advanced\">advanced configuration " -"settings</a>." +"control port, you will need to specify a different port. You can change this" +" setting in Vidalia's <a href=\"config.html#advanced\">advanced " +"configuration settings</a>." msgstr "" # type: Content of: <html><body> @@ -147,9 +140,9 @@ msgstr "" # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:89 msgid "" -"Vidalia crashed, but left Tor running with the last known random " -"password. After you restart Vidalia, it generates a new random password, but " -"Vidalia can't talk to Tor, because the random passwords are different." +"Vidalia crashed, but left Tor running with the last known random password. " +"After you restart Vidalia, it generates a new random password, but Vidalia " +"can't talk to Tor, because the random passwords are different." msgstr "" # type: Content of: <html><body><ul><li><p> @@ -174,11 +167,11 @@ msgstr "" msgid "" "You had previously set Tor to run as a service. When Tor is set to run as a " "service, it starts up when the system boots. If you configured Tor to start " -"as a service through Vidalia, a random password was set and saved in " -"Tor. When you reboot, Tor starts up and uses the random password it saved. " -"You login and start up Vidalia. Vidalia attempts to talk to the already " -"running Tor. Vidalia generates a random password, but it is different than " -"the saved password in the Tor service." +"as a service through Vidalia, a random password was set and saved in Tor. " +"When you reboot, Tor starts up and uses the random password it saved. You " +"login and start up Vidalia. Vidalia attempts to talk to the already running " +"Tor. Vidalia generates a random password, but it is different than the saved" +" password in the Tor service." msgstr "" # type: Content of: <html><body><ul><li><p> @@ -186,8 +179,8 @@ msgstr "" msgid "" "You need to reconfigure Tor to not be a service. See the Tor wiki page on " "running <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\"> " -"Tor as a service</a> for more information on how to remove the Tor service." +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" +" Tor as a service</a> for more information on how to remove the Tor service." msgstr "" # type: Content of: <html><body> @@ -203,18 +196,17 @@ msgstr "" # type: Content of: <html><body><p> #: en/troubleshooting.html:125 msgid "" -"If Tor exits immediately after trying to start, you most likely have another " -"Tor process already running. Check the <a href=\"log.html\">message log</a> " -"to see if any of the last few messages in the list are highlighted in yellow " -"and contain a message similar to the following:" +"If Tor exits immediately after trying to start, you most likely have another" +" Tor process already running. Check the <a href=\"log.html\">message log</a>" +" to see if any of the last few messages in the list are highlighted in " +"yellow and contain a message similar to the following:" msgstr "" # type: Content of: <html><body><pre> #: en/troubleshooting.html:131 #, no-wrap msgid "" -"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address " -"already in use. \n" +"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" msgstr "" @@ -232,8 +224,8 @@ msgstr "" #: en/troubleshooting.html:141 msgid "" "If Tor had been running successfully for awhile (that is, longer than a few " -"seconds), then you should check the <a href=\"log.html\">message log</a> for " -"information about any errors Tor experienced before it exited. Such errors " +"seconds), then you should check the <a href=\"log.html\">message log</a> for" +" information about any errors Tor experienced before it exited. Such errors " "will be highlighted in either red or yellow." msgstr "" @@ -254,3 +246,5 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." msgstr "" + +

1 0

[stem/master] Removing checked in binaries
by atagar＠torproject.org 06 Oct '11

06 Oct '11

commit e1c31c060c0246a62e911643a383372889214300 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 6 09:57:24 2011 -0700 Removing checked in binaries Forgot to establish a gitignore before the prior commit. An extra copy of run_tests.py also snuck in (haven't a clue how). --- stem/__init__.pyc | Bin 228 -> 0 bytes stem/run_tests.py | 13 ------------- stem/types.pyc | Bin 3406 -> 0 bytes test/__init__.pyc | Bin 237 -> 0 bytes test/version.pyc | Bin 3982 -> 0 bytes 5 files changed, 0 insertions(+), 13 deletions(-) diff --git a/stem/__init__.pyc b/stem/__init__.pyc deleted file mode 100644 index 43c6f7d..0000000 Binary files a/stem/__init__.pyc and /dev/null differ diff --git a/stem/run_tests.py b/stem/run_tests.py deleted file mode 100644 index ad52f9c..0000000 --- a/stem/run_tests.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python - -""" -Runs unit and integration tests. -""" - -import unittest -import test.types - -if __name__ == '__main__': - suite = unittest.TestLoader().loadTestsFromTestCase(test.types.TestVerionFunctions) - unittest.TextTestRunner(verbosity=2).run(suite) - diff --git a/stem/types.pyc b/stem/types.pyc deleted file mode 100644 index 27a5bb1..0000000 Binary files a/stem/types.pyc and /dev/null differ diff --git a/test/__init__.pyc b/test/__init__.pyc deleted file mode 100644 index 6b41a10..0000000 Binary files a/test/__init__.pyc and /dev/null differ diff --git a/test/version.pyc b/test/version.pyc deleted file mode 100644 index c459fa7..0000000 Binary files a/test/version.pyc and /dev/null differ

1 0

[stem/master] Class and function for Tor Versions
by atagar＠torproject.org 06 Oct '11

06 Oct '11

commit 69083da95c5ab536adcd23f19a424ed9395015bb Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 6 09:52:04 2011 -0700 Class and function for Tor Versions Starting with a simple (but non-trivial) class that will be needed for handling PROTOCOLINFO responses. This is partly to establish conventions for documentation and unit tests. --- run_tests.py | 13 ++++++ stem/__init__.py | 6 +++ stem/__init__.pyc | Bin 0 -> 228 bytes stem/run_tests.py | 13 ++++++ stem/types.py | 99 +++++++++++++++++++++++++++++++++++++++++++ stem/types.pyc | Bin 0 -> 3406 bytes test/__init__.py | 6 +++ test/__init__.pyc | Bin 0 -> 237 bytes test/version.py | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++ test/version.pyc | Bin 0 -> 3982 bytes 10 files changed, 258 insertions(+), 0 deletions(-) diff --git a/run_tests.py b/run_tests.py old mode 100644 new mode 100755 index e69de29..0fe6365 --- a/run_tests.py +++ b/run_tests.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python + +""" +Runs unit and integration tests. +""" + +import unittest +import test.version + +if __name__ == '__main__': + suite = unittest.TestLoader().loadTestsFromTestCase(test.version.TestVerionFunctions) + unittest.TextTestRunner(verbosity=2).run(suite) + diff --git a/stem/__init__.py b/stem/__init__.py new file mode 100644 index 0000000..01c350c --- /dev/null +++ b/stem/__init__.py @@ -0,0 +1,6 @@ +""" +Library for working with the tor process. +""" + +__all__ = ["types"] + diff --git a/stem/__init__.pyc b/stem/__init__.pyc new file mode 100644 index 0000000..43c6f7d Binary files /dev/null and b/stem/__init__.pyc differ diff --git a/stem/run_tests.py b/stem/run_tests.py new file mode 100644 index 0000000..ad52f9c --- /dev/null +++ b/stem/run_tests.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python + +""" +Runs unit and integration tests. +""" + +import unittest +import test.types + +if __name__ == '__main__': + suite = unittest.TestLoader().loadTestsFromTestCase(test.types.TestVerionFunctions) + unittest.TextTestRunner(verbosity=2).run(suite) + diff --git a/stem/types.py b/stem/types.py new file mode 100644 index 0000000..0f7030b --- /dev/null +++ b/stem/types.py @@ -0,0 +1,99 @@ +""" +Classes for miscellaneous tor object. This includes... + +types.Version - Tor versioning information. + * get_version(versionStr) + Converts a version string to a types.Version instance. +""" + +import re + +class Version: + """ + Comparable tor version, as per the 'new version' of the version-spec... + https://gitweb.torproject.org/torspec.git/blob/HEAD:/version-spec.txt + + Attributes: + major (int) - major version + minor (int) - minor version + micro (int) - micro version + patch (int) - optional patch level (None if undefined) + status (str) - optional status tag without the preceding dash such as + 'alpha', 'beta-dev', etc (None if undefined) + """ + + def __init__(self, major, minor, micro, patch = None, status = None): + self.major = major + self.minor = minor + self.micro = micro + self.patch = patch + self.status = status + + def __str__(self): + """ + Provides the normal representation for the version, for instance: + "0.2.2.23-alpha" + """ + + suffix = "" + + if self.patch: + suffix += ".%i" % self.patch + + if self.status: + suffix += "-%s" % self.status + + return "%i.%i.%i%s" % (self.major, self.minor, self.micro, suffix) + + def __cmp__(self, other): + """ + Simple comparision of versions. An undefined patch level is treated as zero + and status tags are compared lexically (as per the version spec). + """ + + if not isinstance(other, Version): + raise ValueError("types.Version can only be compared with other Version instances") + + for attr in ("major", "minor", "micro", "patch"): + myVersion = max(0, self.__dict__[attr]) + otherVersion = max(0, other.__dict__[attr]) + + if myVersion > otherVersion: return 1 + elif myVersion < otherVersion: return -1 + + myStatus = self.status if self.status else "" + otherStatus = other.status if other.status else "" + + return cmp(myStatus, otherStatus) + +def get_version(versionStr): + """ + Parses a version string, providing back a types.Version instance. + + Arguments: + versionStr (str) - string representing a tor version (ex. "0.2.2.23-alpha") + + Returns: + types.Version instance + + Throws: + ValueError if input isn't a valid tor version + """ + + if not isinstance(versionStr, str): + raise ValueError("argument is not a string") + + m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', versionStr) + + if m: + major, minor, micro, patch, status = m.groups() + + # The patch and status matches are optional (may be None) and have an extra + # proceeding period or dash if they exist. Stripping those off. + + if patch: patch = int(patch[1:]) + if status: status = status[1:] + + return Version(int(major), int(minor), int(micro), patch, status) + else: raise ValueError("'%s' isn't a properly formatted tor version" % versionStr) + diff --git a/stem/types.pyc b/stem/types.pyc new file mode 100644 index 0000000..27a5bb1 Binary files /dev/null and b/stem/types.pyc differ diff --git a/test/__init__.py b/test/__init__.py new file mode 100644 index 0000000..6d651bb --- /dev/null +++ b/test/__init__.py @@ -0,0 +1,6 @@ +""" +Unit and integration tests for the stem library. +""" + +__all__ = ["version"] + diff --git a/test/__init__.pyc b/test/__init__.pyc new file mode 100644 index 0000000..6b41a10 Binary files /dev/null and b/test/__init__.pyc differ diff --git a/test/version.py b/test/version.py new file mode 100644 index 0000000..fd32886 --- /dev/null +++ b/test/version.py @@ -0,0 +1,121 @@ +""" +Unit tests for types functions and classes. +""" + +import unittest +import stem.types + +class TestVerionFunctions(unittest.TestCase): + """ + Tests methods and functions related to 'types.Version'. + """ + + def test_parsing(self): + """ + Tests parsing by the 'get_version' function. + """ + + # valid versions with various number of compontents to the version + version = stem.types.get_version("0.1.2.3-tag") + self.assert_versions_match(version, 0, 1, 2, 3, "tag") + + version = stem.types.get_version("0.1.2.3") + self.assert_versions_match(version, 0, 1, 2, 3, None) + + version = stem.types.get_version("0.1.2-tag") + self.assert_versions_match(version, 0, 1, 2, None, "tag") + + version = stem.types.get_version("0.1.2") + self.assert_versions_match(version, 0, 1, 2, None, None) + + # checks an empty tag + version = stem.types.get_version("0.1.2.3-") + self.assert_versions_match(version, 0, 1, 2, 3, "") + + version = stem.types.get_version("0.1.2-") + self.assert_versions_match(version, 0, 1, 2, None, "") + + # checks invalid version strings + self.assertRaises(ValueError, stem.types.get_version, "") + self.assertRaises(ValueError, stem.types.get_version, "1.2.3.4nodash") + self.assertRaises(ValueError, stem.types.get_version, "1.2.3.a") + self.assertRaises(ValueError, stem.types.get_version, "1.2.a.4") + self.assertRaises(ValueError, stem.types.get_version, "12.3") + self.assertRaises(ValueError, stem.types.get_version, "1.-2.3") + + def test_comparison(self): + """ + Tests comparision between Version instances. + """ + + # check for basic incrementing in each portion + self.assert_version_is_greater("1.1.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.2.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.3.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.2.4-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.2.3-ugg", "0.1.2.3-tag") + self.assert_version_is_equal("0.1.2.3-tag", "0.1.2.3-tag") + + # checks that a missing patch level equals zero + self.assert_version_is_equal("0.1.2", "0.1.2.0") + self.assert_version_is_equal("0.1.2-tag", "0.1.2.0-tag") + + # checks for missing patch or status + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2.3") + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2-tag") + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2") + + self.assert_version_is_equal("0.1.2.3", "0.1.2.3") + self.assert_version_is_equal("0.1.2", "0.1.2") + + def test_string(self): + """ + Tests the Version -> string conversion. + """ + + # checks conversion with various numbers of arguments + + self.assert_string_matches("0.1.2.3-tag") + self.assert_string_matches("0.1.2.3") + self.assert_string_matches("0.1.2") + + def assert_versions_match(self, version, major, minor, micro, patch, status): + """ + Asserts that the values for a types.Version instance match the given + values. + """ + + self.assertEqual(version.major, major) + self.assertEqual(version.minor, minor) + self.assertEqual(version.micro, micro) + self.assertEqual(version.patch, patch) + self.assertEqual(version.status, status) + + def assert_version_is_greater(self, firstVersion, secondVersion): + """ + Asserts that the parsed version of the first version is greate than the + second (also checking the inverse). + """ + + version1 = stem.types.get_version(firstVersion) + version2 = stem.types.get_version(secondVersion) + self.assertEqual(version1 > version2, True) + self.assertEqual(version1 < version2, False) + + def assert_version_is_equal(self, firstVersion, secondVersion): + """ + Asserts that the parsed version of the first version equals the second. + """ + + version1 = stem.types.get_version(firstVersion) + version2 = stem.types.get_version(secondVersion) + self.assertEqual(version1, version2) + + def assert_string_matches(self, version): + """ + Parses the given version string then checks that its string representation + matches the input. + """ + + self.assertEqual(version, str(stem.types.get_version(version))) + diff --git a/test/version.pyc b/test/version.pyc new file mode 100644 index 0000000..c459fa7 Binary files /dev/null and b/test/version.pyc differ

1 0