January 2013 - tor-commits - lists.torproject.org

[stem/master] Moving event version requrements to the version module
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit 1f498f1ce24e149e166ce280872283a61fa76ef4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 16 07:33:22 2013 -0800 Moving event version requrements to the version module Moving the location to the Requirement enum so users can more easily check if an event is available or not. --- stem/response/events.py | 114 +++++++++++++++++++++++------------------------ stem/version.py | 42 ++++++++++++++---- 2 files changed, 89 insertions(+), 67 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index b7c84cf..4b199ce 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -147,6 +147,9 @@ class AddrMapEvent(Event): """ Event that indicates a new address mapping. + The ADDRMAP event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. + :var str hostname: address being resolved :var str destination: destionation of the resolution, this is usually an ip, but could be a hostname if TrackHostExits is enabled or **NONE** if the @@ -154,9 +157,6 @@ class AddrMapEvent(Event): :var datetime expiry: expiration time of the resolution in local time :var str error: error code if the resolution failed :var datetime utc_expiry: expiration time of the resolution in UTC - - The ADDRMAP event was one of the first Control Protocol V1 events and was - introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("hostname", "destination", "expiry") @@ -183,15 +183,15 @@ class AuthDirNewDescEvent(Event): descriptors. The descriptor type contained within this event is unspecified so the descriptor contents are left unparsed. + The AUTHDIR_NEWDESCS event was introduced in tor version 0.1.1.10-alpha. + :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') + _VERSION_ADDED = stem.version.Requirement.EVENT_AUTHDIR_NEWDESCS def _parse(self): lines = str(self).split('\n') @@ -210,11 +210,11 @@ class BandwidthEvent(Event): """ Event emitted every second with the bytes sent and received by tor. - :var long read: bytes received by tor that second - :var long written: bytes sent by tor that second - The BW event was one of the first Control Protocol V1 events and was introduced in tor version 0.1.1.1-alpha. + + :var long read: bytes received by tor that second + :var long written: bytes sent by tor that second """ _POSITIONAL_ARGS = ("read", "written") @@ -236,6 +236,8 @@ class BuildTimeoutSetEvent(Event): Event indicating that the timeout value for a circuit has changed. This was first added in tor version 0.2.2.7. + The BUILDTIMEOUT_SET event was introduced in tor version 0.2.2.7-alpha. + :var stem.TimeoutSetType set_type: way in which the timeout is changing :var int total_times: circuit build times tor used to determine the timeout :var int timeout: circuit timeout value in milliseconds @@ -245,8 +247,6 @@ 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",) @@ -260,7 +260,7 @@ class BuildTimeoutSetEvent(Event): "CLOSE_MS": "close_timeout", "CLOSE_RATE": "close_rate", } - _VERSION_ADDED = stem.version.Version('0.2.2.7-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_BUILDTIMEOUT_SET def _parse(self): # convert our integer and float parameters @@ -294,6 +294,9 @@ class CircuitEvent(Event): VERBOSE_NAMES feature isn't enabled. The option was first introduced in tor version 0.1.2.2, and on by default after 0.2.2.1. + The CIRC event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. + :var str id: circuit identifier :var stem.CircStatus status: reported status for the circuit :var tuple path: relays involved in the circuit, these are @@ -306,9 +309,6 @@ class CircuitEvent(Event): :var datetime created: time when the circuit was created or cannibalized :var stem.CircClosureReason reason: reason for the circuit to be closed :var stem.CircClosureReason remote_reason: remote side's reason for the circuit to be closed - - The CIRC event was one of the first Control Protocol V1 events and was - introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("id", "status", "path") @@ -350,6 +350,8 @@ class CircMinorEvent(Event): Event providing information about minor changes in our circuits. This was first added in tor version 0.2.3.11. + The CIRC_MINOR event was introduced in tor version 0.2.3.11-alpha. + :var str id: circuit identifier :var stem.CircEvent event: type of change in the circuit :var tuple path: relays involved in the circuit, these are @@ -362,8 +364,6 @@ 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") @@ -376,7 +376,7 @@ class CircMinorEvent(Event): "OLD_PURPOSE": "old_purpose", "OLD_HS_STATE": "old_hs_state", } - _VERSION_ADDED = stem.version.Version('0.2.3.11-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_CIRC_MINOR def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) @@ -405,11 +405,11 @@ class ClientsSeenEvent(Event): """ Periodic event on bridge relays that provides a summary of our users. + The CLIENTS_SEEN event was introduced in tor version 0.2.1.10-alpha. + :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 = { @@ -417,7 +417,7 @@ class ClientsSeenEvent(Event): "CountrySummary": "locales", "IPVersions": "ip_versions", } - _VERSION_ADDED = stem.version.Version('0.2.1.10-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_CLIENTS_SEEN def _parse(self): if self.start_time is not None: @@ -465,14 +465,14 @@ class ConfChangedEvent(Event): Event that indicates that our configuration changed, either in response to a SETCONF or RELOAD signal. + The CONF_CHANGED event was introduced in tor version 0.2.3.3-alpha. + :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') + _VERSION_ADDED = stem.version.Requirement.EVENT_CONF_CHANGED def _parse(self): self.config = {} @@ -502,23 +502,21 @@ class DescChangedEvent(Event): The DESCCHANGED event was introduced in tor version 0.1.2.2-alpha. """ - _VERSION_ADDED = stem.version.Version('0.1.2.2-alpha') - - pass + _VERSION_ADDED = stem.version.Requirement.EVENT_DESCCHANGED class GuardEvent(Event): """ Event that indicates that our guard relays have changed. + The GUARD event was introduced in tor version 0.1.2.5-alpha. + :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') + _VERSION_ADDED = stem.version.Requirement.EVENT_GUARD # TODO: We should replace the 'name' field with a fingerprint or nickname # attribute once we know what it can be... @@ -533,11 +531,11 @@ class LogEvent(Event): Tor logging event. These are the most visible kind of event since, by default, tor logs at the NOTICE :data:`~stem.Runlevel` to stdout. - :var stem.Runlevel runlevel: runlevel of the logged message - :var str message: logged message - The logging events were some of the first Control Protocol V1 events and were introduced in tor version 0.1.1.1-alpha. + + :var stem.Runlevel runlevel: runlevel of the logged message + :var str message: logged message """ _SKIP_PARSING = True @@ -557,13 +555,13 @@ class NetworkStatusEvent(Event): Event for when our copy of the consensus has changed. This was introduced in 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. + + :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors """ _SKIP_PARSING = True - _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_NS def _parse(self): content = str(self).lstrip("NS\n") @@ -582,13 +580,13 @@ class NewConsensusEvent(Event): the whole consensus so anything not listed is implicitly no longer recommended. - :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. + + :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors """ _SKIP_PARSING = True - _VERSION_ADDED = stem.version.Version('0.2.1.13-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_NEWCONSENSUS def _parse(self): content = str(self).lstrip("NEWCONSENSUS\n") @@ -608,11 +606,11 @@ class NewDescEvent(Event): VERBOSE_NAMES feature isn't enabled. The option was first introduced in tor version 0.1.2.2, and on by default after 0.2.2.1. - :var tuple relays: **(fingerprint, nickname)** tuples for the relays with - new descriptors - The NEWDESC event was one of the first Control Protocol V1 events and was introduced in tor version 0.1.1.1-alpha. + + :var tuple relays: **(fingerprint, nickname)** tuples for the relays with + new descriptors """ def _parse(self): @@ -631,6 +629,9 @@ class ORConnEvent(Event): The derived 'endpoint_*' attributes are generally more useful. + The ORCONN event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. + :var str endpoint: relay that the event concerns :var str endpoint_fingerprint: endpoint's finterprint if it was provided :var str endpoint_nickname: endpoint's nickname if it was provided @@ -639,9 +640,6 @@ class ORConnEvent(Event): :var stem.ORStatus status: state of the connection :var stem.ORClosureReason reason: reason for the connection to be closed :var int circ_count: number of established and pending circuits - - The ORCONN event was one of the first Control Protocol V1 events and was - introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("endpoint", "status") @@ -693,13 +691,13 @@ class SignalEvent(Event): * NEWNYM * CLEARDNSCACHE - :var stem.Signal signal: signal that tor received - The SIGNAL event was introduced in tor version 0.2.3.1-alpha. + + :var stem.Signal signal: signal that tor received """ _POSITIONAL_ARGS = ("signal",) - _VERSION_ADDED = stem.version.Version('0.2.3.1-alpha') + _VERSION_ADDED = stem.version.Requirement.EVENT_SIGNAL def _parse(self): # log if we recieved an unrecognized signal @@ -721,16 +719,16 @@ class StatusEvent(Event): However, unlike :class:`~stem.response.events.LogEvent` these contain well formed data. + The STATUS_GENERAL, STATUS_CLIENT, STATUS_SERVER events were introduced + in tor version 0.1.2.3-alpha. + :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') + _VERSION_ADDED = stem.version.Requirement.EVENT_STATUS def _parse(self): if self.type == 'STATUS_GENERAL': @@ -749,6 +747,9 @@ class StreamEvent(Event): """ Event that indicates that a stream has changed. + The STREAM event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. + :var str id: stream identifier :var stem.StreamStatus status: reported status for the stream :var str circ_id: circuit that the stream is attached to @@ -762,9 +763,6 @@ class StreamEvent(Event): :var str source_address: requester address (ip or hostname) :var int source_port: requester port :var stem.StreamPurpose purpose: purpose for the stream - - The STREAM event was one of the first Control Protocol V1 events and was - introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("id", "status", "circ_id", "target") @@ -821,15 +819,15 @@ class StreamBwEvent(Event): Event (emitted approximately every second) with the bytes sent and received by the application since the last such event on this stream. + The STREAM_BW event was introduced in tor version 0.1.2.8-beta. + :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') + _VERSION_ADDED = stem.version.Requirement.EVENT_STREAM_BW def _parse(self): if not tor_tools.is_valid_stream_id(self.id): diff --git a/stem/version.py b/stem/version.py index af6d248..47b8393 100644 --- a/stem/version.py +++ b/stem/version.py @@ -34,16 +34,28 @@ easily parsed and compared, for instance... ===================================== =========== Requirement Description ===================================== =========== - **AUTH_SAFECOOKIE** 'SAFECOOKIE' authentication method + **AUTH_SAFECOOKIE** SAFECOOKIE authentication method + **EVENT_AUTHDIR_NEWDESCS** AUTHDIR_NEWDESC events + **EVENT_BUILDTIMEOUT_SET** BUILDTIMEOUT_SET events + **EVENT_CIRC_MINOR** CIRC_MINOR events + **EVENT_CLIENTS_SEEN** CLIENTS_SEEN events + **EVENT_CONF_CHANGED** CONF_CHANGED events + **EVENT_DESCCHANGED** DESCCHANGED events + **EVENT_GUARD** GUARD events + **EVENT_NEWCONSENSUS** NEWCONSENSUS events + **EVENT_NS** NS events + **EVENT_SIGNAL** SIGNAL events + **EVENT_STATUS** STATUS_GENERAL, STATUS_CLIENT, and STATUS_SERVER events + **EVENT_STREAM_BW** STREAM_BW events + **EXTENDCIRCUIT_PATH_OPTIONAL** EXTENDCIRCUIT queries can omit the path if the circuit is zero + **FEATURE_EXTENDED_EVENTS** 'EXTENDED_EVENTS' optional feature + **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query - **EXTENDCIRCUIT_PATH_OPTIONAL** 'EXTENDCIRCUIT' queries can omit the path if the circuit is zero - **LOADCONF** 'LOADCONF' requests - **TAKEOWNERSHIP** 'TAKEOWNERSHIP' requests + **LOADCONF** LOADCONF requests + **TAKEOWNERSHIP** TAKEOWNERSHIP requests **TORRC_CONTROL_SOCKET** 'ControlSocket <path>' config option **TORRC_PORT_FORWARDING** 'PortForwarding' config option **TORRC_DISABLE_DEBUGGER_ATTACHMENT** 'DisableDebuggerAttachment' config option - **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature - **FEATURE_EXTENDED_EVENTS** 'EXTENDED_EVENTS' optional feature ===================================== =========== """ @@ -271,13 +283,25 @@ safecookie_req.greater_than(Version("0.2.3.13")) Requirement = stem.util.enum.Enum( ("AUTH_SAFECOOKIE", safecookie_req), - ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), + ("EVENT_AUTHDIR_NEWDESCS", Version('0.1.1.10-alpha')), + ("EVENT_BUILDTIMEOUT_SET", Version('0.2.2.7-alpha')), + ("EVENT_CIRC_MINOR", Version('0.2.3.11-alpha')), + ("EVENT_CLIENTS_SEEN", Version('0.2.1.10-alpha')), + ("EVENT_CONF_CHANGED", Version('0.2.3.3-alpha')), + ("EVENT_DESCCHANGED", Version('0.1.2.2-alpha')), + ("EVENT_GUARD", Version('0.1.2.5-alpha')), + ("EVENT_NS", Version('0.1.2.3-alpha')), + ("EVENT_NEWCONSENSUS", Version('0.2.1.13-alpha')), + ("EVENT_SIGNAL", Version('0.2.3.1-alpha')), + ("EVENT_STATUS", Version('0.1.2.3-alpha')), + ("EVENT_STREAM_BW", Version('0.1.2.8-beta')), ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), + ("FEATURE_EXTENDED_EVENTS", Version("0.2.2.1-alpha")), + ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), + ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), ("LOADCONF", Version("0.2.1.1")), ("TAKEOWNERSHIP", Version("0.2.2.28-beta")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_PORT_FORWARDING", Version("0.2.3.1-alpha")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), - ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), - ("FEATURE_EXTENDED_EVENTS", Version("0.2.2.1-alpha")), )

1 0

[stem/master] test_get_exit_policy failed if we get a public address
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit a0e13fbcc8fd8e0678b7906329d11e7f567839d1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 16 09:09:06 2013 -0800 test_get_exit_policy failed if we get a public address I forgot to account for the exit policy including a 'reject [public_addr]:*' entry. This is a bit of a pain both because it's dynamic, and because it may or may not be included at all. Accounting for this by just checking the policy prefix and suffix instead. --- test/integ/control/controller.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 8b75c6f..4d39a8b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -264,6 +264,7 @@ class TestController(unittest.TestCase): 'reject 192.168.0.0/16:*', 'reject 10.0.0.0/8:*', 'reject 172.16.0.0/12:*', + # this is where 'reject [public_addr]:*' may or may not be 'reject *:25', 'reject *:119', 'reject *:135-139', @@ -280,7 +281,17 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - self.assertEqual(expected, controller.get_exit_policy()) + # We can't simply compare the policies because the tor policy may or may + # not have a reject entry for our public address. Hence, stripping it + # from the policy's string, then comparing those. + + policy_str = str(controller.get_exit_policy()) + + public_addr_start = policy_str.find('reject 172.16.0.0/12:*') + 22 + public_addr_end = policy_str.find(', reject *:25') + + policy_str = policy_str[:public_addr_start] + policy_str[public_addr_end:] + self.assertEqual(str(expected), policy_str) def test_authenticate(self): """

1 0

[stem/master] Letting add_event_listener() work when unauthenticated
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit 5d9c25300e6783b092a64fc66877f39566fc4a4f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 16 09:21:18 2013 -0800 Letting add_event_listener() work when unauthenticated If we called add_event_listener() prior to authentication then we'd throw an error when calling get_version() to figure out if we meet the requirements. Changing the behavior so that we check requirements and issue SETEVENTS if able, but if not then simply enquing the listener. It'll then be attached during our post-authentication hook. The change that I'm more interested in this though is that our post-authentication hook is less likely to go belly up. If we, say, added a listener then attached the Controller to an older tor instance then our SETEVENTS call could fail. This was an all-or-nothing call. :( Changed it so that the hook will re-attach the events that it can, then warn about the rest. --- stem/control.py | 79 ++++++++++++++++++++++++++++++++------- test/unit/control/controller.py | 5 ++ 2 files changed, 70 insertions(+), 14 deletions(-) diff --git a/stem/control.py b/stem/control.py index 35d9701..8d6f1b7 100644 --- a/stem/control.py +++ b/stem/control.py @@ -139,6 +139,7 @@ import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor import stem.exit_policy import stem.response +import stem.response.events import stem.socket import stem.util.connection import stem.util.enum @@ -1420,16 +1421,24 @@ class Controller(BaseController): """ # 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: + if self.is_authenticated(): + 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)) + for event_type in events: self._event_listeners.setdefault(event_type, []).append(listener) - self._attach_listeners() + failed_events = self._attach_listeners()[1] + + # restricted the failures to just things we requested + failed_events = set(failed_events).intersection(set(events)) + + if failed_events: + raise stem.ProtocolError("SETEVENTS rejected %s" % ", ".join(failed_events)) def remove_event_listener(self, listener): """ @@ -1949,10 +1958,19 @@ class Controller(BaseController): # 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) + with self._event_listeners_lock: + try: + failed_events = self._attach_listeners()[1] + + if failed_events: + # remove our listeners for these so we don't keep failing + for event_type in failed_events: + del self._event_listeners[event_type] + + logging_id = "stem.controller.event_reattach-%s" % "-".join(failed_events) + log.log_once(logging_id, log.WARN, "We were unable to re-attach our event listeners to the new tor instance for: %s" % ", ".join(failed_events)) + except stem.ProtocolError, exc: + log.warn("Unable to issue the SETEVENTS request to re-attach our listeners (%s)" % exc) # issue TAKEOWNERSHIP if we're the owning process for this tor instance @@ -1983,14 +2001,47 @@ class Controller(BaseController): listener(event_message) def _attach_listeners(self): - # issues the SETEVENTS call for our event listeners + """ + Attempts to subscribe to the self._event_listeners events from tor. This is + a no-op if we're not presently authenticated. + + :returns: tuple of the form (set_events, failed_events) + + :raises: :class:`stem.ControllerError` if unable to make our request to tor + """ + + set_events, failed_events = [], [] with self._event_listeners_lock: - if self.is_alive(): + if self.is_authenticated(): + # try to set them all 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) + if response.is_ok(): + set_events = self._event_listeners.keys() + else: + # One of the following likely happened... + # + # * Our user attached listeners before having an authenticated + # connection, so we couldn't check if we met the version + # requirement. + # + # * User attached listeners to one tor instance, then connected us to + # an older tor instancce. + # + # * Some other controller hiccup (far less likely). + # + # See if we can set some subset of our events. + + for event in self._event_listeners.keys(): + response = self.msg("SETEVENTS %s" % " ".join(set_events + [event])) + + if response.is_ok(): + set_events.append(event) + else: + failed_events.append(event) + + return (set_events, failed_events) def _parse_circ_path(path): diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 77c8f84..bf910f2 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -18,7 +18,10 @@ from test import mocking class TestControl(unittest.TestCase): def setUp(self): socket = stem.socket.ControlSocket() + + mocking.mock_method(Controller, "add_event_listener", mocking.no_op()) self.controller = Controller(socket, enable_caching = True) + mocking.revert_mocking() def tearDown(self): mocking.revert_mocking() @@ -276,6 +279,8 @@ class TestControl(unittest.TestCase): """ # set up for failure to create any events + mocking.mock_method(Controller, "is_authenticated", mocking.return_true()) + mocking.mock_method(Controller, "_attach_listeners", mocking.return_value(([], []))) mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.1.0.14'))) self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.BW)

1 0

[stem/master] Adding a BaseController is_authenticated() method
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit 32092205f1be4ccc01ac2cd4bd78a63fd732ae45 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 16 07:38:29 2013 -0800 Adding a BaseController is_authenticated() method I've been running into some situations where I need to know if the controller is not only connected, but authenticated (since that determines if it's... well, usable). A use case where this could get confused is... * User gets a ControlSocket instance. * Manually authenticates via the send() and recv() methods. * Makes a new Controller object from this control socket. Unfortunately this is *exactly* what our test runner did, so tweaking it so that it hits our post_authentication method (I'm surprised that it hadn't bitten us before). --- stem/control.py | 23 +++++++++++++++++++++-- test/runner.py | 9 +++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5649b59..35d9701 100644 --- a/stem/control.py +++ b/stem/control.py @@ -62,6 +62,7 @@ providing its own for interacting at a higher level. BaseController - Base controller class asynchronous message handling |- msg - communicates with the tor process |- is_alive - reports if our connection to tor is open or closed + |- is_authenticated - checks if we're authenticated to tor |- connect - connects or reconnects to tor |- close - shuts down our connection to the tor process |- get_socket - provides the socket used for control communication @@ -253,6 +254,7 @@ class BaseController(object): self._socket._close = self._close self._last_heartbeat = 0.0 # timestamp for when we last heard from tor + self._is_authenticated = False if self._socket.is_alive(): self._launch_threads() @@ -346,6 +348,19 @@ class BaseController(object): return self._socket.is_alive() + def is_authenticated(self): + """ + Checks if our socket is both connected and authenticated. + + :returns: **bool** that's **True** if our socket is authenticated to tor + and **False** otherwise + """ + + if self.is_alive(): + return self._is_authenticated + + return False + def connect(self): """ Reconnects our control socket. This is a pass-through for our socket's @@ -456,6 +471,7 @@ class BaseController(object): self._launch_threads() self._notify_status_listeners(State.INIT) self._socket_connect() + self._is_authenticated = False def _close(self): # Our is_alive() state is now false. Our reader thread should already be @@ -463,6 +479,7 @@ class BaseController(object): # too so it can end. self._event_notice.set() + self._is_authenticated = False # joins on our threads if it's safe to do so @@ -476,7 +493,7 @@ class BaseController(object): def _post_authentication(self): # actions to be taken after we have a newly authenticated connection - pass + self._is_authenticated = True def _notify_status_listeners(self, state): """ @@ -1928,6 +1945,8 @@ class Controller(BaseController): return response.entries def _post_authentication(self): + super(Controller, self)._post_authentication() + # try to re-attach event listeners to the new instance try: @@ -1950,7 +1969,7 @@ class Controller(BaseController): 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) + log.warn("We were unable to reset tor's __OwningControllerProcess configuration. It will continue to periodically check if our pid exists. (%s)" % exc) else: log.warn("We were unable assert ownership of tor through TAKEOWNERSHIP, despite being configured to be the owning process through __OwningControllerProcess. (%s)" % response) diff --git a/test/runner.py b/test/runner.py index 8009e37..799e0d5 100644 --- a/test/runner.py +++ b/test/runner.py @@ -546,8 +546,13 @@ class Runner(object): :raises: :class: `test.runner.TorInaccessable` if tor can't be connected to """ - control_socket = self.get_tor_socket(authenticate) - return stem.control.Controller(control_socket) + control_socket = self.get_tor_socket(False) + controller = stem.control.Controller(control_socket) + + if authenticate: + controller.authenticate(password = CONTROL_PASSWORD, chroot_path = self.get_chroot()) + + return controller def get_tor_version(self): """

1 0

[stem/master] Notifying status listeners of SIGHUPs
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit 1fb3a96c75f5eb6f1706ab7d34d582df3ee2cce7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 16 09:27:27 2013 -0800 Notifying status listeners of SIGHUPs Our status listeners should be notified when three things happen... * we newly connect to a controller * we disconnect from a controller * tor's state is reset by a SIGHUP signal We had implemented the first two, but not the third. Correcting this oversight. --- stem/control.py | 8 ++++++- test/integ/control/controller.py | 42 +++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8d6f1b7..10bc667 100644 --- a/stem/control.py +++ b/stem/control.py @@ -146,7 +146,7 @@ import stem.util.enum import stem.util.tor_tools import stem.version -from stem import UNDEFINED, CircStatus +from stem import UNDEFINED, CircStatus, Signal from stem.util import log # state changes a control socket can have @@ -675,6 +675,12 @@ class Controller(BaseController): self._geoip_failure_count = 0 self._enabled_features = [] + def _sighup_listener(event): + if event.signal == Signal.RELOAD: + self._notify_status_listeners(State.RESET) + + self.add_event_listener(_sighup_listener, EventType.SIGNAL) + def connect(self): super(Controller, self).connect() self.clear_cache() diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4d39a8b..600403b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -9,6 +9,7 @@ import shutil import socket import tempfile import threading +import time import unittest import stem.connection @@ -22,7 +23,8 @@ import test.network import test.runner import test.util -from stem.control import EventType +from stem import Signal +from stem.control import EventType, State from stem.exit_policy import ExitPolicy from stem.version import Requirement @@ -56,6 +58,44 @@ class TestController(unittest.TestCase): else: self.assertRaises(stem.SocketError, stem.control.Controller.from_socket_file, test.runner.CONTROL_SOCKET_PATH) + def test_reset_notification(self): + """ + Checks that a notificiation listener is... well, notified of SIGHUPs. + """ + + if test.runner.require_control(self): + return + elif test.runner.require_version(self, stem.version.Requirement.EVENT_SIGNAL): + return + + with test.runner.get_runner().get_tor_controller() as controller: + received_events = [] + + def status_listener(my_controller, state, timestamp): + received_events.append((my_controller, state, timestamp)) + + controller.add_status_listener(status_listener) + + before = time.time() + controller.signal(Signal.HUP) + + # I really hate adding a sleep here, but signal() is non-blocking. + while len(received_events) == 0: + if (time.time() - before) > 2: + self.fail("We've waited a couple seconds for SIGHUP to generate an event, but it didn't come") + + time.sleep(0.1) + + after = time.time() + + self.assertEqual(1, len(received_events)) + + state_controller, state_type, state_timestamp = received_events[0] + + self.assertEqual(controller, state_controller) + self.assertEqual(State.RESET, state_type) + self.assertTrue(state_timestamp > before and state_timestamp < after) + def test_event_handling(self): """ Add a couple listeners for various events and make sure that they receive

1 0

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

16 Jan '13

commit eae786a02cb1a4567081cea57c49580c1fbcf071 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:16:09 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 49104f5..5127a95 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -1,29 +1,29 @@ <!ENTITY torbirdy.accountprefs.title "Configuración de la cuenta"> <!ENTITY torbirdy.accountprefs.startup.label "Buscar nuevos mensajes al iniciar"> -<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.startup.key "B"> <!ENTITY torbirdy.accountprefs.minutes.label "Buscar nuevos mensajes cada"> -<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.key "c"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos"> <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar"> <!ENTITY torbirdy.accountprefs.save.button "Guardar"> -<!ENTITY torbirdy.accountprefs.save.key "S"> +<!ENTITY torbirdy.accountprefs.save.key "G"> <!ENTITY torbirdy.prefs.title "Preferencias de TorBirdy"> <!ENTITY torbirdy.prefs.save.button "Guardar"> -<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.save.key "g"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra2.button "Probar la configuración"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Configuración del proxy"> +<!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración del proxy recomendada para TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración de proxy personalizada"> +<!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración para proxy personalizada"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "Servidor SOCKS:"> -<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_host.key "d"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Torificación transparente">

1 0

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

16 Jan '13

commit d564ad4df3e82339db499ea26b9358d859ec877d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:16:07 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 49104f5..5127a95 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -1,29 +1,29 @@ <!ENTITY torbirdy.accountprefs.title "Configuración de la cuenta"> <!ENTITY torbirdy.accountprefs.startup.label "Buscar nuevos mensajes al iniciar"> -<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.startup.key "B"> <!ENTITY torbirdy.accountprefs.minutes.label "Buscar nuevos mensajes cada"> -<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.key "c"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos"> <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar"> <!ENTITY torbirdy.accountprefs.save.button "Guardar"> -<!ENTITY torbirdy.accountprefs.save.key "S"> +<!ENTITY torbirdy.accountprefs.save.key "G"> <!ENTITY torbirdy.prefs.title "Preferencias de TorBirdy"> <!ENTITY torbirdy.prefs.save.button "Guardar"> -<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.save.key "g"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra2.button "Probar la configuración"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "Configuración del proxy"> +<!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración del proxy recomendada para TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración de proxy personalizada"> +<!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración para proxy personalizada"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "Servidor SOCKS:"> -<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_host.key "d"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Torificación transparente">

1 0

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

16 Jan '13

commit a20c58a3b648fd2c6087a06d5c2b95e48d269309 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:16:01 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 6647d73..7d88d2e 100644 --- a/es/es.po +++ b/es/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2013-01-16 16:44+0000\n" +"PO-Revision-Date: 2013-01-16 17:04+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" @@ -359,7 +359,7 @@ msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `sy #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset" -msgstr "La unidad es de tipo loopback, omitiendo el restablecimiento del MBR" +msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..." #: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 #, python-format @@ -376,12 +376,12 @@ msgstr "Error probando el dispositivo " #: ../liveusb/creator.py:1197 msgid "Unable to find any removable device" -msgstr "No fue posible encontrar algún dispositivo extraíble" +msgstr "No se pudo encontrar dispositivo extraíble alguno" #: ../liveusb/creator.py:1207 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "Asegúrese de que su memoria USB está conectada y formateada con el sistema de archivos FAT" +msgstr "Asegúrese de que su memoria USB está conectada, y formateada con el sistema de archivos FAT" #: ../liveusb/creator.py:1210 #, python-format

1 0

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

16 Jan '13

commit 6613d28ee0b2160fe20eb858e41444007e7420e7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:15:59 2013 +0000 Update translations for liveusb-creator --- es/es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 6647d73..7d88d2e 100644 --- a/es/es.po +++ b/es/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2013-01-16 16:44+0000\n" +"PO-Revision-Date: 2013-01-16 17:04+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" @@ -359,7 +359,7 @@ msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `sy #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset" -msgstr "La unidad es de tipo loopback, omitiendo el restablecimiento del MBR" +msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..." #: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 #, python-format @@ -376,12 +376,12 @@ msgstr "Error probando el dispositivo " #: ../liveusb/creator.py:1197 msgid "Unable to find any removable device" -msgstr "No fue posible encontrar algún dispositivo extraíble" +msgstr "No se pudo encontrar dispositivo extraíble alguno" #: ../liveusb/creator.py:1207 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "Asegúrese de que su memoria USB está conectada y formateada con el sistema de archivos FAT" +msgstr "Asegúrese de que su memoria USB está conectada, y formateada con el sistema de archivos FAT" #: ../liveusb/creator.py:1210 #, python-format

1 0

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

16 Jan '13

commit dd1146046705298450f7d52018bd16290e9db067 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 16:46:03 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/es.po b/es/es.po index 154fcdb..6647d73 100644 --- a/es/es.po +++ b/es/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2013-01-16 16:09+0000\n" +"PO-Revision-Date: 2013-01-16 16:44+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -266,7 +266,7 @@ msgstr "Está usando una versión antigua de syslinux-extlinux que no soporta el #: ../liveusb/creator.py:718 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "No fue posible escribir en %(device)s, omitiendo... " +msgstr "No se pudo escribir en %(device)s, omitiendo... " #: ../liveusb/creator.py:737 #, python-format @@ -277,14 +277,14 @@ msgstr "Algunas particiones del dispositivo USB %(device)s están montadas. Ser #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "Sistema de ficheros desconocido. Su dispositivo podría necesitar ser formateado." +msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser formateado." #: ../liveusb/creator.py:789 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone Tails\" action instead." -msgstr "Sistema de archivos no soportado: %s \nEn caso de que esté intentado actualizar la versión de un sistema Tails instalado manualmente (es decir, si fue instalado sin este instalador), esta opción no está soportada: para hacerlo así primero necesíta instalarlo de nuevo, por ejemplo seleccionando la acción \"Clonar Tails\", en lugar de como se hizo cuando se instaló." +msgstr "Sistema de archivos no soportado: %s \nEn caso de que esté intentado actualizar la versión de un sistema Tails instalado manualmente (es decir, si fue instalado con otro instalador), esta opción no está soportada: para hacerlo así primero necesita instalarlo de nuevo, v.g. seleccionando la acción \"Clonar Tails\", en lugar de como se hizo cuando se instaló." #: ../liveusb/creator.py:791 ../liveusb/creator.py:889 #, python-format @@ -299,7 +299,7 @@ msgstr "Excepción dbus desconocida al intentar montar el dispositivo: %(message #: ../liveusb/creator.py:811 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "No fue posible montar el dispositivo: %(message)s" +msgstr "No se pudo montar el dispositivo: %(message)s" #: ../liveusb/creator.py:823 msgid "No mount points found" @@ -313,7 +313,7 @@ msgstr "Desmontando %(device)s" #: ../liveusb/creator.py:846 #, python-format msgid "Mount %s exists after unmounting" -msgstr "El montaje %s existe después de desmontar " +msgstr "El punto de montaje %s sigue existiendo tras desmontar " #: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 msgid "Verifying filesystem..." @@ -322,11 +322,11 @@ msgstr "Verificando el sistema de archivos... " #: ../liveusb/creator.py:907 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "No fue posible cambiar la etiqueta del volumen: %(message)s" +msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s" #: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 msgid "Installing bootloader..." -msgstr "Instalando sistema de arranque (bootloader)... " +msgstr "Instalando gestor de arranque (bootloader)... " #: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 #, python-format @@ -355,7 +355,7 @@ msgstr "Restableciendo Master Boot Record de %s" #: ../liveusb/creator.py:1112 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "No fue posible restablecer el MBR. Podría no tener instalado el paquete `syslinux`" +msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `syslinux`" #: ../liveusb/creator.py:1115 msgid "Drive is a loopback, skipping MBR reset"

1 0