- tor-commits - lists.torproject.org

[stem/master] Begin version requirements for events
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 86524bf589014f2f6d7a4a9704cc0801663654b2 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 7 04:03:19 2012 -0700 Begin version requirements for events Check that the tor process is of a minimum version able to generate the events requested. Checking versions here improves on the 'Unrecognized event "XXX"' response from the tor process. The SETEVENT control message was added to tor version 0.0.9-pre5 (commit 347d3f9d629df74b). But control protocol V1 changed the message syntax in tor version 0.1.1.1-alpha (commit 9b4aa8d2abbce713) and V0 is not supported. Therefor, version 0.1.1.1-alpha is the baseline for any and all events in Stem. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 8 ++++++-- stem/response/events.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index a53b9b1..f7463b0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -660,8 +660,12 @@ class Controller(BaseController): :raises: :class:`stem.socket.ControllerError` if unable to set the events """ - with self._event_listeners_lock: - for event_type in events: + for event_type in events: + event_version = stem.response.events.EVENT_TYPE_TO_CLASS[event_type]._VERSION_ADDED + if not self.get_version().meets_requirements(event_version): + raise stem.InvalidRequest(552, "%s event requires Tor version %s or later" % (event_type, event_version)) + + with self._event_listeners_lock: self._event_listeners.setdefault(event_type, []).append(listener) self._attach_listeners() diff --git a/stem/response/events.py b/stem/response/events.py index 7526c88..e6ef1a0 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -6,6 +6,7 @@ import stem import stem.control import stem.response import stem.descriptor.router_status_entry +import stem.version from stem.util import connection, log, str_tools, tor_tools @@ -32,6 +33,7 @@ class Event(stem.response.ControlMessage): _KEYWORD_ARGS = {} # map of 'keyword => attribute' for recognized attributes _QUOTED = () # positional arguments that are quoted _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args + _VERSION_ADDED = stem.version.Version('0.1.1.1-alpha') # minimum version with control-spec V1 event support def _parse_message(self, arrived_at): if not str(self).strip():

1 0

[stem/master] Add version requirements for event types
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 8506a43e04df43166f009c523cb63762d2243aeb Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 15:04:18 2012 -0800 Add version requirements for event types Patch from Sean to add the version requirements for numerous event types... * AUTHDIR_NEWDESCS (added in tor commit b9d37a2d58e76ee2) * BUILDTIMEOUT_SET (version information taken from control-spec.txt) * CIRC_MINOR (added in tor commit 5519e633ec4c48c5) * CLIENTS_SEEN (added in tor commit 5519e633ec4c48c5) * CONF_CHANGED (added in tor commit 5a801a8c8b71c955) * DESCCHANGED (version information taken from control-spec.txt) * GUARD (added in tor commit 31e09bb5242b24d5) * NS (version information taken from control-spec.txt) * NEWCONSENSUS (version information taken from control-spec.txt) * SIGNAL (version information taken from control-spec.txt) * STATUS_* (added in tor commit 4401c47f638a60da) * STREAM_BW (added in tor commit 4a74812c70b75df8) --- stem/response/events.py | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index c4abe12..a8dfa1f 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -181,9 +181,12 @@ class AuthDirNewDescEvent(Event): :var stem.AuthDescriptorAction action: what is being done with the descriptor :var str message: explanation of why we chose this action :var str descriptor: content of the descriptor + + The AUTHDIR_NEWDESCS event was introduced in tor version 0.1.1.10-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.1.1.10-alpha') def _parse(self): lines = str(self).split('\n') @@ -235,6 +238,8 @@ class BuildTimeoutSetEvent(Event): :var float timeout_rate: ratio of circuits that have time out :var int close_timeout: duration to keep measurement circuits in milliseconds :var float close_rate: ratio of measurement circuits that are closed + + The BUILDTIMEOUT_SET event was introduced in tor version 0.2.2.7-alpha. """ _POSITIONAL_ARGS = ("set_type",) @@ -248,6 +253,7 @@ class BuildTimeoutSetEvent(Event): "CLOSE_MS": "close_timeout", "CLOSE_RATE": "close_rate", } + _VERSION_ADDED = stem.version.Version('0.2.2.7-alpha') def _parse(self): # convert our integer and float parameters @@ -347,6 +353,8 @@ class CircMinorEvent(Event): :var datetime created: time when the circuit was created or cannibalized :var stem.CircPurpose old_purpose: prior purpose for the circuit :var stem.HiddenServiceState old_hs_state: prior status as a hidden service circuit + + The CIRC_MINOR event was introduced in tor version 0.2.3.11-alpha. """ _POSITIONAL_ARGS = ("id", "event", "path") @@ -359,6 +367,7 @@ class CircMinorEvent(Event): "OLD_PURPOSE": "old_purpose", "OLD_HS_STATE": "old_hs_state", } + _VERSION_ADDED = stem.version.Version('0.2.3.11-alpha') def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) @@ -389,6 +398,8 @@ class ClientsSeenEvent(Event): :var datetime start_time: time in UTC that we started collecting these stats :var dict locales: mapping of country codes to a rounded count for the number of users :var dict ip_versions: mapping of ip protocols to a rounded count for the number of users + + The CLIENTS_SEEN event was introduced in tor version 0.2.1.10-alpha. """ _KEYWORD_ARGS = { @@ -396,6 +407,7 @@ class ClientsSeenEvent(Event): "CountrySummary": "locales", "IPVersions": "ip_versions", } + _VERSION_ADDED = stem.version.Version('0.2.1.10-alpha') def _parse(self): if self.start_time is not None: @@ -444,9 +456,12 @@ class ConfChangedEvent(Event): :var dict config: mapping of configuration options to their new values (**None** if the option is being unset) + + The CONF_CHANGED event was introduced in tor version 0.2.3.3-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.2.3.3-alpha') def _parse(self): self.config = {} @@ -470,10 +485,13 @@ class ConfChangedEvent(Event): class DescChangedEvent(Event): """ - Event that indicates that our descriptor has changed. This was first added in - tor version 0.1.2.2. + Event that indicates that our descriptor has changed. + + The DESCCHANGED event was introduced in tor version 0.1.2.2-alpha. """ + _VERSION_ADDED = stem.version.Version('0.1.2.2-alpha') + pass class GuardEvent(Event): @@ -483,8 +501,12 @@ class GuardEvent(Event): :var stem.GuardType guard_type: purpose the guard relay is for :var str name: nickname or fingerprint of the guard relay :var stem.GuardStatus status: status of the guard relay + + The GUARD event was introduced in tor version 0.1.2.5-alpha. """ + _VERSION_ADDED = stem.version.Version('0.1.2.5-alpha') + # TODO: We should replace the 'name' field with a fingerprint or nickname # attribute once we know what it can be... # @@ -521,9 +543,12 @@ class NetworkStatusEvent(Event): tor version 0.1.2.3. :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors + + The NS event was introduced in tor version 0.1.2.3-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): content = str(self).lstrip("NS\n") @@ -541,12 +566,13 @@ class NewConsensusEvent(Event): the whole consensus so anything not listed is implicitly no longer recommended. - This was introduced in tor version 0.2.1.13. - :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors + + The NEWCONSENSUS event was introduced in tor version 0.2.1.13-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.2.1.13-alpha') def _parse(self): content = str(self).lstrip("NEWCONSENSUS\n") @@ -648,12 +674,13 @@ class SignalEvent(Event): * NEWNYM * CLEARDNSCACHE - This was introduced in tor version 0.2.3.1. - :var stem.Signal signal: signal that tor received + + The SIGNAL event was introduced in tor version 0.2.3.1-alpha. """ _POSITIONAL_ARGS = ("signal",) + _VERSION_ADDED = stem.version.Version('0.2.3.1-alpha') def _parse(self): # log if we recieved an unrecognized signal @@ -677,9 +704,13 @@ class StatusEvent(Event): :var stem.StatusType status_type: category of the status event :var stem.Runlevel runlevel: runlevel of the logged message :var str message: logged message + + The STATUS_GENERAL, STATUS_CLIENT, STATUS_SERVER events were introduced + in tor version 0.1.2.3-alpha. """ _POSITIONAL_ARGS = ("runlevel", "action") + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): if self.type == 'STATUS_GENERAL': @@ -772,9 +803,12 @@ class StreamBwEvent(Event): :var str id: stream identifier :var long written: bytes sent by the application :var long read: bytes received by the application + + The STREAM_BW event was introduced in tor version 0.1.2.8-beta. """ _POSITIONAL_ARGS = ("id", "written", "read") + _VERSION_ADDED = stem.version.Version('0.1.2.8-beta') def _parse(self): if self.id is not None and not tor_tools.is_valid_stream_id(self.id):

1 0

[stem/master] Checking event version prereqs before setting any
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 40827b365e3a5f3dac6d1f8e8ffddd589be6cd70 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 15:10:08 2012 -0800 Checking event version prereqs before setting any Checking that our tor version meets all of the event's version prereqs before setting any. This has a few advantages... * It makes add_event_listener() an all-or-nothing operation (ie, failing one of the checks means that no listeners are attached, rather than a few) * Avoids repeated acquisitions of _event_listeners_lock (so other lock users can't slip in-between). * Lets me fix a bug where we were calling SETEVENTS for each event type, rather than a single call when we're done adding the listeners. --- stem/control.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index f7463b0..74127c0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -660,14 +660,17 @@ class Controller(BaseController): :raises: :class:`stem.socket.ControllerError` if unable to set the events """ + # first checking that tor supports these event types for event_type in events: event_version = stem.response.events.EVENT_TYPE_TO_CLASS[event_type]._VERSION_ADDED if not self.get_version().meets_requirements(event_version): raise stem.InvalidRequest(552, "%s event requires Tor version %s or later" % (event_type, event_version)) - - with self._event_listeners_lock: + + with self._event_listeners_lock: + for event_type in events: self._event_listeners.setdefault(event_type, []).append(listener) - self._attach_listeners() + + self._attach_listeners() def remove_event_listener(self, listener): """

1 0

[stem/master] Unexpected TypeError when get_conf() called for non-existant value
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 9fc23f64d3534a7e68bb0b66dddbd18b3e8db63c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 15:24:50 2012 -0800 Unexpected TypeError when get_conf() called for non-existant value Calling the Controller's get_conf() method would result in a TypeError if the configuration option didn't exist. For instance... ====================================================================== ERROR: test_reattaching_listeners ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 134, in test_reattaching_listeners controller.authenticate() File "/home/atagar/Desktop/stem/stem/control.py", line 954, in authenticate stem.connection.authenticate(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/connection.py", line 358, in authenticate authenticate_none(controller, False) File "/home/atagar/Desktop/stem/stem/connection.py", line 435, in authenticate_none auth_response = _msg(controller, "AUTHENTICATE") File "/home/atagar/Desktop/stem/stem/connection.py", line 787, in _msg return controller.msg(message) File "/home/atagar/Desktop/stem/stem/control.py", line 308, in msg self._post_authentication() File "/home/atagar/Desktop/stem/stem/control.py", line 1511, in _post_authentication owning_pid = self.get_conf("__OwningControllerProcess", None) File "/home/atagar/Desktop/stem/stem/control.py", line 1009, in get_conf return _case_insensitive_lookup(entries, param, default) File "/home/atagar/Desktop/stem/stem/control.py", line 1644, in _case_insensitive_lookup for entry in entries: TypeError: 'NoneType' object is not iterable --- stem/control.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index 74127c0..30c440b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1636,14 +1636,15 @@ def _case_insensitive_lookup(entries, key, default = UNDEFINED): :raises: **ValueError** if no such value exists """ - if isinstance(entries, dict): - for k, v in entries.items(): - if k.lower() == key.lower(): - return v - else: - for entry in entries: - if entry.lower() == key.lower(): - return entry + if entries is not None: + if isinstance(entries, dict): + for k, v in entries.items(): + if k.lower() == key.lower(): + return v + else: + for entry in entries: + if entry.lower() == key.lower(): + return entry if default != UNDEFINED: return default else: raise ValueError("key '%s' doesn't exist in dict: %s" % (key, entries))

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit 79afffb0e487cf7b28d4a25806633eb2a3b29158 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 23:15:07 2012 +0000 Update translations for gettor_completed --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index dd84720..52de291 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:43+0000\n" +"PO-Revision-Date: 2012-12-08 22:51+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgstr "Usted puede adquirir un puente enviando un correo electrónico que conte msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "También es posible obtener puentes con un navegador web en la siguiente dirección: https://bridges.torproject.org/" +msgstr "También es posible obtener repetidores puente (bridges) con un\nnavegador web en la dirección: https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -266,7 +266,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "NOTA IMPORTANTE:\nYa que esto es parte de una solicitud de un archivo fraccionado, necesita esperar a recibir todos los archivos parciales antes de que pueda guardarlos todos en el mismo directorio y desempacarlos haciendo clic en el primer archivo." +msgstr "NOTA IMPORTANTE:\nYa que esto forma parte de una solicitud de un archivo fraccionado,\nnecesita esperar a recibir todos los archivos parciales antes de que\npueda guardarlos todos en la misma carpeta y desempaquetarlos\nhaciendo doble-clic en el primero de los archivos." #: lib/gettor/i18n.py:176 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit 9736c07becd77d5560ecb3048745b1adac4f92ed Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 23:15:05 2012 +0000 Update translations for gettor --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index dd84720..52de291 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:43+0000\n" +"PO-Revision-Date: 2012-12-08 22:51+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgstr "Usted puede adquirir un puente enviando un correo electrónico que conte msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "También es posible obtener puentes con un navegador web en la siguiente dirección: https://bridges.torproject.org/" +msgstr "También es posible obtener repetidores puente (bridges) con un\nnavegador web en la dirección: https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -266,7 +266,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "NOTA IMPORTANTE:\nYa que esto es parte de una solicitud de un archivo fraccionado, necesita esperar a recibir todos los archivos parciales antes de que pueda guardarlos todos en el mismo directorio y desempacarlos haciendo clic en el primer archivo." +msgstr "NOTA IMPORTANTE:\nYa que esto forma parte de una solicitud de un archivo fraccionado,\nnecesita esperar a recibir todos los archivos parciales antes de que\npueda guardarlos todos en la misma carpeta y desempaquetarlos\nhaciendo doble-clic en el primero de los archivos." #: lib/gettor/i18n.py:176 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit d2de2b358c65e21d5856eb508b3a5f74f97c5971 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 22:45:07 2012 +0000 Update translations for gettor_completed --- es/gettor.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index ad2c38c..dd84720 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:13+0000\n" +"PO-Revision-Date: 2012-12-08 22:43+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -41,14 +41,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en el linea \"De:\" es realmente\nla dirección que envió el correo. " +msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en el linea \"De:\" es realmente\nla dirección que envió el correo." #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Pedimos disculpas si no ha solicitado este correo. Ya que su email es de un servicio que no usa DKIM, estamos enviando una corta explicación, y luego ignoraremos esta dirección de correo por un más o menos un día.)" +msgstr "(Le pedimos disculpas si usted no solicitó este correo. Como el\nservicio de su cuenta de correo electrónico no usa DKIM, le estamos\nenviando una explicación breve de la situación, y luego ignoraremos\nesta dirección de correo durante el día siguiente, aproximadamente.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -98,11 +98,11 @@ msgstr "Este ejemplo le enviará el paquete solicitado en la versión localizada #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "Lista de localidades con soporte:" +msgstr "Lista de configuraciones regionales soportadas:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" -msgstr "Aquí hay una lista de los idiomas disponibles:" +msgstr "Esta es una lista de los idiomas disponibles: " #: lib/gettor/i18n.py:75 msgid "" @@ -117,11 +117,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr " gettor+ar(a)torproject.org: Árabe\n gettor+de(a)torproject.org: Alemán\n gettor+en(a)torproject.org: Inglés\n gettor+es(a)torproject.org: Español\n gettor+fa(a)torproject.org: Farsi (Iran)\n gettor+fr(a)torproject.org: Francés\n gettor+it(a)torproject.org: Italiano\n gettor+nl(a)torproject.org: Neerlandés\n gettor+pl(a)torproject.org: Polaco\n gettor+ru(a)torproject.org: Ruso\n gettor+zh(a)torproject.org: Chino" +msgstr " gettor+ar(a)torproject.org: Árabe\n gettor+de(a)torproject.org: Alemán\n gettor+en(a)torproject.org: Inglés\n gettor+es(a)torproject.org: Español\n gettor+fa(a)torproject.org: Persa (Iran)\n gettor+fr(a)torproject.org: Francés\n gettor+it(a)torproject.org: Italiano\n gettor+nl(a)torproject.org: Holandés\n gettor+pl(a)torproject.org: Polaco\n gettor+ru(a)torproject.org: Ruso\n gettor+zh(a)torproject.org: Chino" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "Si no selecciona un idioma, recibirá la versión en Inglés." +msgstr "Si no selecciona un idioma, recibirá la versión en inglés." #: lib/gettor/i18n.py:89 msgid "" @@ -149,13 +149,13 @@ msgstr "Simplemente incluya la palabra clave 'split' en una nueva línea que no msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Enviar este texto en un email a GetTor causará que le enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1.4MB." +msgstr "Enviar este texto en un correo a GetTor causará que le enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1.4MB." #: lib/gettor/i18n.py:105 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Después de haber recibido todas las partes, necesita re-ensamblarlas en un sólo paquete de nuevo. Eso se hace de la siguiente manera:" +msgstr "Después de haber recibido todas las partes, necesita re-ensamblarlas\nen un sólo paquete de nuevo. Eso se hace de la siguiente manera:" #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." @@ -172,7 +172,7 @@ msgstr "2.) Descomprima todos los archivos que terminen en \".z\". Si ha guardad msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verifique todos los archivos tal como se describen en el correo que recibió con cada paquete (gpg --verify)" +msgstr "3.) Verifique todos los archivos tal como se describe en el correo \nque recibió con cada paquete (gpg --verify)." #: lib/gettor/i18n.py:117 msgid "" @@ -186,11 +186,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Una vez que termina de desempacar, debe encontrar el recién creado archivo \".exe\" en su carpeta de destino. Simplemente haga doble clic en el archivo y el Paquete de Navegador de Tor se iniciará en unos segundos." +msgstr "5.) Cuando termine de desempaquetar, debe encontrar el recién creado\narchivo \".exe\" en su carpeta destino. Simplemente haga doble clic en\nel archivo y el Paquete de Navegador Tor se iniciará en unos segundos." #: lib/gettor/i18n.py:125 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.)¡Eso es todo! Ya ha terminado. Gracias por utilizar Tor, esperamos que se divierta." +msgstr "6.) Eso es todo. Ya ha terminado. ¡Gracias por utilizar Tor y diviértase!" #: lib/gettor/i18n.py:127 msgid "" @@ -243,7 +243,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Si su conexión a Internet bloquea el acceso a la red Tor, usted podría necesitar un retransmisor puente. Los retransmisores puente (o \"puentes\" en versión corta) son retransmisores de Tor que no están listados en el directorio principal. Ya que no figuran en una lista pública, aún si su proveedor de servicios está filtrando las conexiones a los retransmisores de Tor conocidos, posiblemente no podrán bloquear todos los puentes." +msgstr "Si su conexión a Internet bloquea el acceso a la red Tor, podría\nnecesitar un repetidor puente (bridge). Los bridges son repetidores\nde Tor que no están listados en el repositorio principal de repetidores\n(relays). Como no están listados públicamente, incluso si su proveedor\nde internet (ISP) está filtrando las conexiones con los repetidores de\nTor conocidos, probablemente no podrá bloquear todos los bridges." #: lib/gettor/i18n.py:162 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit d1ec21b07d940c1002f463e2feaffc922a0767ba Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 22:45:05 2012 +0000 Update translations for gettor --- es/gettor.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index ad2c38c..dd84720 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:13+0000\n" +"PO-Revision-Date: 2012-12-08 22:43+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -41,14 +41,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en el linea \"De:\" es realmente\nla dirección que envió el correo. " +msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en el linea \"De:\" es realmente\nla dirección que envió el correo." #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Pedimos disculpas si no ha solicitado este correo. Ya que su email es de un servicio que no usa DKIM, estamos enviando una corta explicación, y luego ignoraremos esta dirección de correo por un más o menos un día.)" +msgstr "(Le pedimos disculpas si usted no solicitó este correo. Como el\nservicio de su cuenta de correo electrónico no usa DKIM, le estamos\nenviando una explicación breve de la situación, y luego ignoraremos\nesta dirección de correo durante el día siguiente, aproximadamente.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -98,11 +98,11 @@ msgstr "Este ejemplo le enviará el paquete solicitado en la versión localizada #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "Lista de localidades con soporte:" +msgstr "Lista de configuraciones regionales soportadas:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" -msgstr "Aquí hay una lista de los idiomas disponibles:" +msgstr "Esta es una lista de los idiomas disponibles: " #: lib/gettor/i18n.py:75 msgid "" @@ -117,11 +117,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr " gettor+ar(a)torproject.org: Árabe\n gettor+de(a)torproject.org: Alemán\n gettor+en(a)torproject.org: Inglés\n gettor+es(a)torproject.org: Español\n gettor+fa(a)torproject.org: Farsi (Iran)\n gettor+fr(a)torproject.org: Francés\n gettor+it(a)torproject.org: Italiano\n gettor+nl(a)torproject.org: Neerlandés\n gettor+pl(a)torproject.org: Polaco\n gettor+ru(a)torproject.org: Ruso\n gettor+zh(a)torproject.org: Chino" +msgstr " gettor+ar(a)torproject.org: Árabe\n gettor+de(a)torproject.org: Alemán\n gettor+en(a)torproject.org: Inglés\n gettor+es(a)torproject.org: Español\n gettor+fa(a)torproject.org: Persa (Iran)\n gettor+fr(a)torproject.org: Francés\n gettor+it(a)torproject.org: Italiano\n gettor+nl(a)torproject.org: Holandés\n gettor+pl(a)torproject.org: Polaco\n gettor+ru(a)torproject.org: Ruso\n gettor+zh(a)torproject.org: Chino" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "Si no selecciona un idioma, recibirá la versión en Inglés." +msgstr "Si no selecciona un idioma, recibirá la versión en inglés." #: lib/gettor/i18n.py:89 msgid "" @@ -149,13 +149,13 @@ msgstr "Simplemente incluya la palabra clave 'split' en una nueva línea que no msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Enviar este texto en un email a GetTor causará que le enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1.4MB." +msgstr "Enviar este texto en un correo a GetTor causará que le enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1.4MB." #: lib/gettor/i18n.py:105 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Después de haber recibido todas las partes, necesita re-ensamblarlas en un sólo paquete de nuevo. Eso se hace de la siguiente manera:" +msgstr "Después de haber recibido todas las partes, necesita re-ensamblarlas\nen un sólo paquete de nuevo. Eso se hace de la siguiente manera:" #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." @@ -172,7 +172,7 @@ msgstr "2.) Descomprima todos los archivos que terminen en \".z\". Si ha guardad msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verifique todos los archivos tal como se describen en el correo que recibió con cada paquete (gpg --verify)" +msgstr "3.) Verifique todos los archivos tal como se describe en el correo \nque recibió con cada paquete (gpg --verify)." #: lib/gettor/i18n.py:117 msgid "" @@ -186,11 +186,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Una vez que termina de desempacar, debe encontrar el recién creado archivo \".exe\" en su carpeta de destino. Simplemente haga doble clic en el archivo y el Paquete de Navegador de Tor se iniciará en unos segundos." +msgstr "5.) Cuando termine de desempaquetar, debe encontrar el recién creado\narchivo \".exe\" en su carpeta destino. Simplemente haga doble clic en\nel archivo y el Paquete de Navegador Tor se iniciará en unos segundos." #: lib/gettor/i18n.py:125 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.)¡Eso es todo! Ya ha terminado. Gracias por utilizar Tor, esperamos que se divierta." +msgstr "6.) Eso es todo. Ya ha terminado. ¡Gracias por utilizar Tor y diviértase!" #: lib/gettor/i18n.py:127 msgid "" @@ -243,7 +243,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Si su conexión a Internet bloquea el acceso a la red Tor, usted podría necesitar un retransmisor puente. Los retransmisores puente (o \"puentes\" en versión corta) son retransmisores de Tor que no están listados en el directorio principal. Ya que no figuran en una lista pública, aún si su proveedor de servicios está filtrando las conexiones a los retransmisores de Tor conocidos, posiblemente no podrán bloquear todos los puentes." +msgstr "Si su conexión a Internet bloquea el acceso a la red Tor, podría\nnecesitar un repetidor puente (bridge). Los bridges son repetidores\nde Tor que no están listados en el repositorio principal de repetidores\n(relays). Como no están listados públicamente, incluso si su proveedor\nde internet (ISP) está filtrando las conexiones con los repetidores de\nTor conocidos, probablemente no podrá bloquear todos los bridges." #: lib/gettor/i18n.py:162 msgid ""

1 0

[stem/master] Re-attaching event listeners
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 885a294646703a537c37cd2a5ac9aa8728561744 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 12:35:34 2012 -0800 Re-attaching event listeners When a controller disconnects then reconnects we want our event listeners to resume getting events. There's a couple things about this commit that I really don't like... * It includes a hack in our msg() method to add the hook. * Our tests include sleep() calls. This sucks since it makes our tests take considerably longer, and can break on systems under heavy load. --- stem/control.py | 40 +++++++++++++++++++++++++++++-------- test/integ/control/controller.py | 38 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0803ad4..79ad70f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -299,6 +299,13 @@ class BaseController(object): if isinstance(response, stem.ControllerError): raise response else: + # I really, really don't like putting hooks into this method, but + # this is the most reliable method I can think of for taking actions + # immediately after successfully authenticating to a connection. + + if message.upper().startswith("AUTHENTICATE"): + self._post_authentication() + return response except stem.SocketClosed, exc: # If the recv() thread caused the SocketClosed then we could still be @@ -435,6 +442,11 @@ class BaseController(object): self._notify_status_listeners(State.CLOSED, False) self._socket_close() + def _post_authentication(self): + # actions to be taken after we have a newly authenticated connection + + pass + def _notify_status_listeners(self, state, expect_alive = None): """ Informs our status listeners that a state change occurred. @@ -548,9 +560,6 @@ class Controller(BaseController): BaseController and provides a more user friendly API for library users. """ - # TODO: We need a set_up() (and maybe tear_down()?) method, so we can - # reattach listeners and set VERBOSE_NAMES. - def from_port(control_addr = "127.0.0.1", control_port = 9051): """ Constructs a :class:`~stem.socket.ControlPort` based Controller. @@ -653,12 +662,7 @@ class Controller(BaseController): with self._event_listeners_lock: for event_type in events: self._event_listeners.setdefault(event_type, []).append(listener) - - if self.is_alive(): - response = self.msg("SETEVENTS %s" % " ".join(self._event_listeners.keys())) - - if not response.is_ok(): - raise stem.socket.ProtocolError("SETEVENTS received unexpected response\n%s" % response) + self._attach_listeners() def remove_event_listener(self, listener): """ @@ -1484,6 +1488,14 @@ class Controller(BaseController): return response.entries + def _post_authentication(self): + # try to re-attach event listeners to the new instance + + try: + self._attach_listeners() + except stem.ProtocolError, exc: + log.warn("We were unable to re-attach our event listeners to the new tor instance (%s)" % exc) + def _handle_event(self, event_message): stem.response.convert("EVENT", event_message, arrived_at = time.time()) @@ -1492,6 +1504,16 @@ class Controller(BaseController): if event_type == event_message.type: for listener in event_listeners: listener(event_message) + + def _attach_listeners(self): + # issues the SETEVENTS call for our event listeners + + with self._event_listeners_lock: + if self.is_alive(): + response = self.msg("SETEVENTS %s" % " ".join(self._event_listeners.keys())) + + if not response.is_ok(): + raise stem.ProtocolError("SETEVENTS received unexpected response\n%s" % response) def _parse_circ_path(path): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 7c424cf..0ecece3 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -98,6 +98,44 @@ class TestController(unittest.TestCase): self.assertTrue(hasattr(event, 'read')) self.assertTrue(hasattr(event, 'written')) + def test_reattaching_listeners(self): + """ + Checks that event listeners are re-attached when a controller disconnects + then reconnects to tor. + """ + + if test.runner.require_control(self): return + + event_buffer = [] + + def listener(event): + event_buffer.append(event) + + runner = test.runner.get_runner() + with runner.get_tor_controller() as controller: + controller.add_event_listener(listener, EventType.BW) + + # get a BW event or two + + time.sleep(2) + self.assertTrue(len(event_buffer) >= 1) + + # disconnect and check that we stop getting events + + controller.close() + event_buffer = [] + + time.sleep(2) + self.assertTrue(len(event_buffer) == 0) + + # reconnect and check that we get events again + + controller.connect() + controller.authenticate() + + time.sleep(2) + self.assertTrue(len(event_buffer) >= 1) + def test_getinfo(self): """ Exercises GETINFO with valid and invalid queries.

1 0

[stem/master] Supporting TAKEOWNERSHIP when spawing a tor process
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 7fba50ff561578f746ceb3383b1bb16d709a14e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 14:13:43 2012 -0800 Supporting TAKEOWNERSHIP when spawing a tor process Adding a 'take_ownership' option to the stem.process module's launch_tor*() functions. When it's set we'll do the following... * Assert ownership over the tor process that we spawn by setting its __OwningControllerProcess to be our pid. * If a Controller connects to it then we replace our ownership via the pid with ownership via the socket connection (issuing a TAKEOWNERSHIP request and dropping __OwningControllerProcess). Thanks to lunar for the initial TAKEOWNERSHIP patch on #7666, and rransom for his advice on #7667. --- stem/control.py | 20 +++++++++ stem/process.py | 43 ++++++++++++++++--- stem/version.py | 4 +- test/integ/process.py | 112 +++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 160 insertions(+), 19 deletions(-) diff --git a/stem/control.py b/stem/control.py index 79ad70f..db5b9c5 100644 --- a/stem/control.py +++ b/stem/control.py @@ -110,6 +110,7 @@ providing its own for interacting at a higher level. from __future__ import with_statement +import os import time import Queue import StringIO @@ -1495,6 +1496,25 @@ class Controller(BaseController): self._attach_listeners() except stem.ProtocolError, exc: log.warn("We were unable to re-attach our event listeners to the new tor instance (%s)" % exc) + + # issue TAKEOWNERSHIP if we're the owning process for this tor instance + + owning_pid = self.get_conf("__OwningControllerProcess", None) + + if owning_pid == str(os.getpid()): + response = self.msg("TAKEOWNERSHIP") + stem.response.convert("SINGLELINE", response) + + if response.is_ok(): + # Now that tor is tracking our ownership of the process via the control + # connection, we can stop having it check for us via our pid. + + try: + self.reset_conf("__OwningControllerProcess") + except stem.ControllerError, exc: + log.warn("We were unable to reset tor's __OwningControllerProcess configuration. It will continue to periodically check if our pid exists. (%s)" % response) + else: + log.warn("We were unable assert ownership of tor through TAKEOWNERSHIP, despite being configured to be the owning process thrugh __OwningControllerProcess. (%s)" % response) def _handle_event(self, event_message): stem.response.convert("EVENT", event_message, arrived_at = time.time()) diff --git a/stem/process.py b/stem/process.py index 25ff88a..d0523bc 100644 --- a/stem/process.py +++ b/stem/process.py @@ -29,7 +29,7 @@ import stem.util.system NO_TORRC = "<no torrc>" DEFAULT_INIT_TIMEOUT = 90 -def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT, take_ownership = False): """ Initializes a tor process. This blocks until initialization completes or we error out. @@ -51,6 +51,9 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce tor's initialization stdout as we get it :param int timeout: time after which the attempt to start tor is aborted, no timeouts are applied if **None** + :param bool take_ownership: asserts ownership over the tor process so it + aborts if this python process terminates or a :class:`~stem.control.Controller` + we establish to it disconnects :returns: **subprocess.Popen** instance for the tor subprocess @@ -76,6 +79,9 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce else: runtime_args += ["-f", torrc_path] + if take_ownership: + runtime_args += ["--__OwningControllerProcess", _get_pid()] + tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) if timeout: @@ -140,13 +146,28 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce if ": " in msg: msg = msg.split(": ")[-1].strip() last_problem = msg -def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT, take_ownership = False): """ Initializes a tor process, like :func:`~stem.process.launch_tor`, but with a customized configuration. This writes a temporary torrc to disk, launches tor, then deletes the torrc. - :param dict config: configuration options, such as '{"ControlPort": "9051"}' + For example... + + :: + + tor_process = stem.process.launch_tor_with_config( + config = { + 'ControlPort': '2778', + 'Log': [ + 'NOTICE stdout', + 'ERR file /tmp/tor_error_log', + ], + }, + ) + + :param dict config: configuration options, such as '{"ControlPort": "9051"}', + values can either be a **str** or **list of str** if for multiple values :param str tor_cmd: command for starting tor :param int completion_percent: percent of bootstrap completion at which this'll return @@ -154,6 +175,9 @@ def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, in tor's initialization stdout as we get it :param int timeout: time after which the attempt to start tor is aborted, no timeouts are applied if **None** + :param bool take_ownership: asserts ownership over the tor process so it + aborts if this python process terminates or a :class:`~stem.control.Controller` + we establish to it disconnects :returns: **subprocess.Popen** instance for the tor subprocess @@ -165,11 +189,18 @@ def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, in try: with open(torrc_path, "w") as torrc_file: - for key, value in config.items(): - torrc_file.write("%s %s\n" % (key, value)) + for key, values in config.items(): + if isinstance(values, str): + torrc_file.write("%s %s\n" % (key, values)) + else: + for value in values: + torrc_file.write("%s %s\n" % (key, value)) - return launch_tor(tor_cmd, None, torrc_path, completion_percent, init_msg_handler, timeout) + return launch_tor(tor_cmd, None, torrc_path, completion_percent, init_msg_handler, timeout, take_ownership) finally: try: os.remove(torrc_path) except: pass +def _get_pid(): + return str(os.getpid()) + diff --git a/stem/version.py b/stem/version.py index a7f31c3..243fc50 100644 --- a/stem/version.py +++ b/stem/version.py @@ -37,7 +37,8 @@ easily parsed and compared, for instance... **AUTH_SAFECOOKIE** 'SAFECOOKIE' authentication method **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query **EXTENDCIRCUIT_PATH_OPTIONAL** 'EXTENDCIRCUIT' queries can omit the path if the circuit is zero - **LOADCONF** 'LOADCONF' query + **LOADCONF** 'LOADCONF' requests + **TAKEOWNERSHIP** 'TAKEOWNERSHIP' requests **TORRC_CONTROL_SOCKET** 'ControlSocket <path>' config option **TORRC_DISABLE_DEBUGGER_ATTACHMENT** 'DisableDebuggerAttachment' config option **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature @@ -257,6 +258,7 @@ Requirement = stem.util.enum.Enum( ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), ("LOADCONF", Version("0.2.1.1")), + ("TAKEOWNERSHIP", Version("0.2.2.28-beta")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), diff --git a/test/integ/process.py b/test/integ/process.py index fc2825a..1c99f88 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -7,20 +7,35 @@ import time import shutil import signal import unittest +import subprocess import stem.prereq import stem.socket import stem.process -import test.runner +import stem.version import stem.util.system +import test.runner +from test import mocking + DATA_DIRECTORY = '/tmp/stem_integ' +def _kill_process(process): + if stem.prereq.is_python_26(): + process.kill() + elif not stem.util.system.is_windows(): + os.kill(process.pid, signal.SIGTERM) + + process.communicate() # block until its definitely gone + class TestProcess(unittest.TestCase): def setUp(self): if not os.path.exists(DATA_DIRECTORY): os.makedirs(DATA_DIRECTORY) + def tearDown(self): + mocking.revert_mocking() + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config. @@ -57,17 +72,7 @@ class TestProcess(unittest.TestCase): self.assertEquals("ControlPort=2778", str(getconf_response)) finally: if control_socket: control_socket.close() - - if stem.prereq.is_python_26(): - tor_process.kill() - elif not stem.util.system.is_windows(): - os.kill(tor_process.pid, signal.SIGTERM) - - # On OSX, python 2.5 this kill call doesn't seem to block, causing our - # tor instance to linger and cause a port conflict with the following - # test. Giving it a moment to kill for realz. - - time.sleep(0.5) + _kill_process(tor_process) def test_launch_tor_with_timeout(self): """ @@ -88,4 +93,87 @@ class TestProcess(unittest.TestCase): if not (runtime > 2 and runtime < 3): self.fail("Test should have taken 2-3 seconds, took %i instead" % runtime) + + def test_take_ownership_via_pid(self): + """ + Checks that the tor process quits after we do if we set take_ownership. To + test this we spawn a process and trick tor into thinking that it is us. + """ + + if not stem.prereq.is_python_26() and stem.util.system.is_windows(): + test.runner.skip(self, "(unable to kill subprocesses)") + return + elif not stem.util.system.is_available("sleep"): + test.runner.skip(self, "('sleep' command is unavailable)") + return + elif test.runner.only_run_once(self, "test_take_ownership_via_pid"): return + elif test.runner.require_version(self, stem.version.Requirement.TAKEOWNERSHIP): return + + # Have os.getpid provide the pid of a process we can safely kill. I hate + # needing to a _get_pid() helper but after much head scratching I haven't + # been able to mock os.getpid() or posix.getpid(). + + sleep_process = subprocess.Popen(['sleep', '10']) + mocking.mock(stem.process._get_pid, mocking.return_value(str(sleep_process.pid))) + + tor_process = stem.process.launch_tor_with_config( + tor_cmd = test.runner.get_runner().get_tor_command(), + config = { + 'SocksPort': '2777', + 'ControlPort': '2778', + 'DataDirectory': DATA_DIRECTORY, + }, + completion_percent = 5, + take_ownership = True, + ) + + # Kill the sleep command. Tor should quit shortly after. + + _kill_process(sleep_process) + + # tor polls for the process every fifteen seconds so this may take a + # while... + + for seconds_waited in xrange(30): + if tor_process.poll() == 0: + return # tor exited + + time.sleep(1) + + self.fail("tor didn't quit after the process that owned it terminated") + + def test_take_ownership_via_controller(self): + """ + Checks that the tor process quits after the controller that owns it + connects, then disconnects.. + """ + + if test.runner.only_run_once(self, "test_take_ownership_via_controller"): return + elif test.runner.require_version(self, stem.version.Requirement.TAKEOWNERSHIP): return + + tor_process = stem.process.launch_tor_with_config( + tor_cmd = test.runner.get_runner().get_tor_command(), + config = { + 'SocksPort': '2777', + 'ControlPort': '2778', + 'DataDirectory': DATA_DIRECTORY, + }, + completion_percent = 5, + take_ownership = True, + ) + + # We're the controlling process. Just need to connect then disconnect. + + controller = stem.control.Controller.from_port(control_port = 2778) + controller.authenticate() + controller.close() + + # give tor a few seconds to quit + for seconds_waited in xrange(5): + if tor_process.poll() == 0: + return # tor exited + + time.sleep(1) + + self.fail("tor didn't quit after the controller that owned it disconnected")

1 0