July 2020 - tor-commits - lists.torproject.org

[stem/master] Make `Controller.get_accounting_stats` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit d2c65fe459457fc038ec8a1281816abbacb2be9d Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Wed Apr 15 22:05:32 2020 +0300 Make `Controller.get_accounting_stats` asynchronous --- stem/control.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/stem/control.py b/stem/control.py index c5cbbf81..d6034fff 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1440,7 +1440,7 @@ class Controller(BaseController): return listeners @with_default() - def get_accounting_stats(self, default: Any = UNDEFINED) -> 'stem.control.AccountingStats': + async def get_accounting_stats(self, default: Any = UNDEFINED) -> 'stem.control.AccountingStats': """ get_accounting_stats(default = UNDEFINED) @@ -1457,14 +1457,16 @@ class Controller(BaseController): and no default was provided """ - if self.get_info('accounting/enabled') != '1': + if await self.get_info('accounting/enabled') != '1': raise stem.ControllerError("Accounting isn't enabled") retrieved = time.time() - status = self.get_info('accounting/hibernating') - interval_end = self.get_info('accounting/interval-end') - used = self.get_info('accounting/bytes') - left = self.get_info('accounting/bytes-left') + status, interval_end, used, left = await asyncio.gather( + self.get_info('accounting/hibernating'), + self.get_info('accounting/interval-end'), + self.get_info('accounting/bytes'), + self.get_info('accounting/bytes-left'), + ) interval_end = stem.util.str_tools._parse_timestamp(interval_end) used_read, used_written = [int(val) for val in used.split(' ', 1)]

1 0

[stem/master] Make `Controller.get_start_time` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit f3d173eaa364cbd2982f3713cf628bbf25881194 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Wed Apr 15 22:12:27 2020 +0300 Make `Controller.get_start_time` asynchronous --- stem/control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 88778a8e..f847207f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1600,7 +1600,7 @@ class Controller(BaseController): raise ValueError("Unable to resolve tor's pid" if self.is_localhost() else "Tor isn't running locally") @with_default() - def get_start_time(self, default: Any = UNDEFINED) -> float: + async def get_start_time(self, default: Any = UNDEFINED) -> float: """ get_start_time(default = UNDEFINED) @@ -1621,7 +1621,7 @@ class Controller(BaseController): if start_time: return start_time - uptime = self.get_info('uptime', None) + uptime = await self.get_info('uptime', None) if uptime: if not uptime.isdigit(): @@ -1636,7 +1636,7 @@ class Controller(BaseController): if not self.is_localhost(): raise ValueError('Unable to determine the uptime when tor is not running locally') - pid = self.get_pid(None) + pid = await self.get_pid(None) if not pid: raise ValueError('Unable to determine the pid of the tor process')

1 0

[stem/master] Make `Controller.get_network_statuses` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 7c6ef4e234ec3c1ff40b912d7d8349df4d03f44f Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 19:53:24 2020 +0300 Make `Controller.get_network_statuses` asynchronous --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4469e9c5..86af0e8a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1970,7 +1970,7 @@ class Controller(BaseController): return stem.descriptor.router_status_entry.RouterStatusEntryV3(desc_content) @with_default(yields = True) - def get_network_statuses(self, default: Any = UNDEFINED) -> Iterator[stem.descriptor.router_status_entry.RouterStatusEntryV3]: + async def get_network_statuses(self, default: Any = UNDEFINED) -> Iterator[stem.descriptor.router_status_entry.RouterStatusEntryV3]: """ get_network_statuses(default = UNDEFINED) @@ -1992,7 +1992,7 @@ class Controller(BaseController): # # https://trac.torproject.org/8248 - desc_content = self.get_info('ns/all', get_bytes = True) + desc_content = await self.get_info('ns/all', get_bytes = True) if not desc_content: raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it')

1 0

[stem/master] Make `Controller.get_microdescriptor` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit cbc86e49f878de9e2cd7871355010a82f1a83125 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 18:53:00 2020 +0300 Make `Controller.get_microdescriptor` asynchronous --- stem/control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 92172101..d8d3d5e4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1725,7 +1725,7 @@ class Controller(BaseController): return UserTrafficAllowed(inbound_allowed, outbound_allowed) @with_default() - def get_microdescriptor(self, relay: Optional[str] = None, default: Any = UNDEFINED) -> stem.descriptor.microdescriptor.Microdescriptor: + async def get_microdescriptor(self, relay: Optional[str] = None, default: Any = UNDEFINED) -> stem.descriptor.microdescriptor.Microdescriptor: """ get_microdescriptor(relay = None, default = UNDEFINED) @@ -1758,7 +1758,7 @@ class Controller(BaseController): if relay is None: try: - relay = self.get_info('fingerprint') + relay = await self.get_info('fingerprint') except stem.ControllerError as exc: raise stem.ControllerError('Unable to determine our own fingerprint: %s' % exc) @@ -1770,7 +1770,7 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) try: - desc_content = self.get_info(query, get_bytes = True) + desc_content = await self.get_info(query, get_bytes = True) except stem.InvalidArguments as exc: if str(exc).startswith('GETINFO request contained unrecognized keywords:'): raise stem.DescriptorUnavailable("Tor was unable to provide the descriptor for '%s'" % relay)

1 0

[stem/master] Add support for asynchronous event handlers
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 933a7b30663c2ab41115c2796a58ea236633ead5 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 23:03:12 2020 +0300 Add support for asynchronous event handlers --- stem/control.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index 86af0e8a..20d7c8ef 100644 --- a/stem/control.py +++ b/stem/control.py @@ -844,7 +844,7 @@ class BaseController(object): await def __aexit__(self, exit_type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]) -> None: await self.close() - def _handle_event(self, event_message: stem.response.ControlMessage) -> None: + async def _handle_event(self, event_message: stem.response.ControlMessage) -> None: """ Callback to be overwritten by subclasses for event listening. This is notified whenever we receive an event from the control socket. @@ -975,7 +975,7 @@ class BaseController(object): while True: try: event_message = self._event_queue.get_nowait() - self._handle_event(event_message) + await self._handle_event(event_message) self._event_queue.task_done() # Attempt to finish processing enqueued events when our controller closes @@ -3802,7 +3802,7 @@ class Controller(BaseController): else: log.warn('We were unable assert ownership of tor through TAKEOWNERSHIP, despite being configured to be the owning process through __OwningControllerProcess. (%s)' % response) - def _handle_event(self, event_message: stem.response.ControlMessage) -> None: + async def _handle_event(self, event_message: stem.response.ControlMessage) -> None: event = None # type: Optional[stem.response.events.Event] try: @@ -3822,7 +3822,10 @@ class Controller(BaseController): if listener_type == event_type: for listener in event_listeners: try: - listener(event) + if asyncio.iscoroutinefunction(listener): + await listener(event_message) + else: + listener(event_message) except Exception as exc: log.warn('Event listener raised an uncaught exception (%s): %s' % (exc, event))

1 0

[stem/master] Fix an unawaited coroutine
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit a3ffe6fd54d15ceffba31ca2c2fc5523b8b477b8 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 23:04:27 2020 +0300 Fix an unawaited coroutine --- stem/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/control.py b/stem/control.py index 20d7c8ef..37e9c689 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3077,7 +3077,7 @@ class Controller(BaseController): for event_type in events: event_type = stem.response.events.EVENT_TYPE_TO_CLASS.get(event_type) - if event_type and (self.get_version() < event_type._VERSION_ADDED): + if event_type and (await self.get_version() < event_type._VERSION_ADDED): raise stem.InvalidRequest('552', '%s event requires Tor version %s or later' % (event_type, event_type._VERSION_ADDED)) for event_type in events:

1 0

[stem/master] Make `Controller.is_user_traffic_allowed` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 51d216f5ff405a9bd0899d6f6d78f8bdbf52a37d Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 18:43:01 2020 +0300 Make `Controller.is_user_traffic_allowed` asynchronous --- stem/control.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/control.py b/stem/control.py index 47d9cbb3..92172101 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1683,7 +1683,7 @@ class Controller(BaseController): return time.time() - (await self.get_start_time()) - def is_user_traffic_allowed(self) -> 'stem.control.UserTrafficAllowed': + async def is_user_traffic_allowed(self) -> 'stem.control.UserTrafficAllowed': """ Checks if we're likely to service direct user traffic. This essentially boils down to... @@ -1711,15 +1711,15 @@ class Controller(BaseController): inbound_allowed, outbound_allowed = False, False - if self.get_conf('BridgeRelay', None) == '1': + if (await self.get_conf('BridgeRelay', None)) == '1': inbound_allowed = True - if self.get_conf('ORPort', None): + if await self.get_conf('ORPort', None): if not inbound_allowed: - consensus_entry = self.get_network_status(default = None) + consensus_entry = await self.get_network_status(default = None) inbound_allowed = consensus_entry and 'Guard' in consensus_entry.flags - exit_policy = self.get_exit_policy(None) + exit_policy = await self.get_exit_policy(None) outbound_allowed = exit_policy and exit_policy.is_exiting_allowed() return UserTrafficAllowed(inbound_allowed, outbound_allowed)

1 0

[stem/master] Make `Controller.get_server_descriptor` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 20cb5855025c375e6bf7f0d116d9d9cea2fa5b25 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 19:51:26 2020 +0300 Make `Controller.get_server_descriptor` asynchronous --- stem/control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 59f0ce9a..6ccf2262 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1812,7 +1812,7 @@ class Controller(BaseController): yield desc @with_default() - def get_server_descriptor(self, relay: Optional[str] = None, default: Any = UNDEFINED) -> stem.descriptor.server_descriptor.RelayDescriptor: + async def get_server_descriptor(self, relay: Optional[str] = None, default: Any = UNDEFINED) -> stem.descriptor.server_descriptor.RelayDescriptor: """ get_server_descriptor(relay = None, default = UNDEFINED) @@ -1850,7 +1850,7 @@ class Controller(BaseController): if relay is None: try: - relay = self.get_info('fingerprint') + relay = await self.get_info('fingerprint') except stem.ControllerError as exc: raise stem.ControllerError('Unable to determine our own fingerprint: %s' % exc) @@ -1862,7 +1862,7 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) try: - desc_content = self.get_info(query, get_bytes = True) + desc_content = await self.get_info(query, get_bytes = True) except stem.InvalidArguments as exc: if str(exc).startswith('GETINFO request contained unrecognized keywords:'): raise stem.DescriptorUnavailable("Tor was unable to provide the descriptor for '%s'" % relay)

1 0

[stem/master] Make `Controller.remove_event_listener` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit 916afa92b61b9e9dc95c6d0fdf343ad1d8bf62a2 Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Fri Apr 17 23:06:02 2020 +0300 Make `Controller.remove_event_listener` asynchronous --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 37e9c689..1a107a79 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3092,7 +3092,7 @@ class Controller(BaseController): if failed_events: raise stem.ProtocolError('SETEVENTS rejected %s' % ', '.join(failed_events)) - def remove_event_listener(self, listener: Callable[[stem.response.events.Event], None]) -> None: + async def remove_event_listener(self, listener: Callable[[stem.response.events.Event], None]) -> None: """ Stops a listener from being notified of further tor events. @@ -3113,7 +3113,7 @@ class Controller(BaseController): del self._event_listeners[event_type] if event_types_changed: - response = self.msg('SETEVENTS %s' % ' '.join(self._event_listeners.keys())) + response = await self.msg('SETEVENTS %s' % ' '.join(self._event_listeners.keys())) if not response.is_ok(): raise stem.ProtocolError('SETEVENTS received unexpected response\n%s' % response)

1 0

[stem/master] Make `Controller.get_hidden_service_conf` asynchronous
by atagar＠torproject.org 16 Jul '20

16 Jul '20

commit a651e8d16653fc9f0f0adb1a9bd4d6f35ba8a59a Author: Illia Volochii <illia.volochii(a)gmail.com> Date: Mon Apr 20 22:17:07 2020 +0300 Make `Controller.get_hidden_service_conf` asynchronous --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 81f97581..443a16db 100644 --- a/stem/control.py +++ b/stem/control.py @@ -2473,7 +2473,7 @@ class Controller(BaseController): raise stem.ProtocolError('Returned unexpected status code: %s' % response.code) @with_default() - def get_hidden_service_conf(self, default: Any = UNDEFINED) -> Dict[str, Any]: + async def get_hidden_service_conf(self, default: Any = UNDEFINED) -> Dict[str, Any]: """ get_hidden_service_conf(default = UNDEFINED) @@ -2519,7 +2519,7 @@ class Controller(BaseController): start_time = time.time() try: - response = stem.response._convert_to_getconf(self.msg('GETCONF HiddenServiceOptions')) + response = stem.response._convert_to_getconf(await self.msg('GETCONF HiddenServiceOptions')) log.debug('GETCONF HiddenServiceOptions (runtime: %0.4f)' % (time.time() - start_time)) except stem.ControllerError as exc:

1 0