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

[sbws/master] Set _ns to None when there's an exception
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 5bbb344c420c2b6102e3d927b95fb8b47fa93876 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 07:55:28 2018 +0000 Set _ns to None when there's an exception --- sbws/lib/relaylist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index bafd7b7..bb59a3b 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -32,6 +32,7 @@ class Relay: self._ns = cont.get_network_status(fp, default=None) except Exception as e: log.exception("Exception trying to get ns %s", e) + self._ns = None if desc is not None: assert isinstance(desc, ServerDescriptor) self._desc = desc

1 0

[sbws/master] Remove unused method get_circuit_path
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 3b92990816c9d8613488b3680dc5a5977555fc94 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 07:53:46 2018 +0000 Remove unused method get_circuit_path --- sbws/lib/circuitbuilder.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index b8d4db7..b806a9d 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -56,16 +56,6 @@ class CircuitBuilder: its (str) ID. If it cannot be built, it should return None. ''' raise NotImplementedError() - def get_circuit_path(self, circ_id): - c = self.controller - try: - circ = c.get_circuit(circ_id, default=None) - except Exception as e: - log.exception("Exception trying to get circuit: %s.", e) - else: - return [relay[0] for relay in circ.path] - return None - def close_circuit(self, circ_id): c = self.controller try:

1 0

[sbws/master] Replace ns by desc in log message
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit e6fb529cbd79c56b5b6f457ed3779991b0af2cc7 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:02:46 2018 +0000 Replace ns by desc in log message --- sbws/lib/relaylist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index e623ab7..d0c903c 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -40,7 +40,7 @@ class Relay: try: self._desc = cont.get_server_descriptor(fp, default=None) except Exception as e: - log.exception("Exception trying to get ns %s", e) + log.exception("Exception trying to get desc %s", e) def _from_desc(self, attr): if not self._desc:

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 3ee931dbdb43386fec8274c311e33ca94d93293f Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:01:56 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/relaylist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index bb59a3b..e623ab7 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -1,6 +1,6 @@ from stem.descriptor.router_status_entry import RouterStatusEntryV3 from stem.descriptor.server_descriptor import ServerDescriptor -from stem import Flag +from stem import Flag, DescriptorUnavailable, ControllerError from stem.util.connection import is_valid_ipv4_address from stem.util.connection import is_valid_ipv6_address import random @@ -30,7 +30,7 @@ class Relay: else: try: self._ns = cont.get_network_status(fp, default=None) - except Exception as e: + except (DescriptorUnavailable, ControllerError) as e: log.exception("Exception trying to get ns %s", e) self._ns = None if desc is not None:

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit a398aaffedaa4270aa16a4e25cbba71c910cb7fa Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:04:14 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/relaylist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index d0c903c..f674b62 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -39,7 +39,7 @@ class Relay: else: try: self._desc = cont.get_server_descriptor(fp, default=None) - except Exception as e: + except (DescriptorUnavailable, ControllerError) as e: log.exception("Exception trying to get desc %s", e) def _from_desc(self, attr):

1 0

[sbws/master] Replace log message by which stream/circuit failed
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit e5dca77d1c788cb97bf4beb4273be93b60481d81 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:08:36 2018 +0000 Replace log message by which stream/circuit failed --- sbws/util/stem.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 7224c10..d52fea2 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -28,7 +28,8 @@ def attach_stream_to_circuit_listener(controller, circ_id): log.warning('Couldn\'t attach stream to circ %s: %s', circ_id, e) except Exception as e: - log.exception("Exception trying to get ns %s", e) + log.exception("Error attaching stream %s to circ %s: %s", + st.id, circ_id, e) else: pass return closure_stream_event_listener

1 0

[sbws/master] Replace Exception by the possible exception
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 8ca26840f210438d5dc049007547fabfb054b0ff Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:09:46 2018 +0000 Replace Exception by the possible exception --- sbws/util/stem.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index d52fea2..8d4989e 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -1,5 +1,6 @@ from stem.control import (Controller, Listener) -from stem import (SocketError, InvalidRequest, UnsatisfiableRequest) +from stem import (SocketError, InvalidRequest, UnsatisfiableRequest, + OperationFailed) from stem.connection import IncorrectSocketType import stem.process from configparser import ConfigParser @@ -27,7 +28,7 @@ def attach_stream_to_circuit_listener(controller, circ_id): except (UnsatisfiableRequest, InvalidRequest) as e: log.warning('Couldn\'t attach stream to circ %s: %s', circ_id, e) - except Exception as e: + except OperationFailed as e: log.exception("Error attaching stream %s to circ %s: %s", st.id, circ_id, e) else:

1 0

[sbws/master] Move the exception where it actually would happen
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 03ba568621bcce04a4dce8156a9d26cf5090c654 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:23:43 2018 +0000 Move the exception where it actually would happen --- sbws/util/stem.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 0c36d61..255ce22 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -192,14 +192,15 @@ def launch_tor(conf): # And return a controller to it cont = _init_controller_socket(conf['tor']['control_socket']) # Because we build things by hand and can't set these before Tor bootstraps - cont.set_conf('__DisablePredictedCircuits', '1') - cont.set_conf('__LeaveStreamsUnattached', '1') try: - log.info('Started and connected to Tor %s via %s', cont.get_version(), - conf['tor']['control_socket']) - return cont + cont.set_conf('__DisablePredictedCircuits', '1') + cont.set_conf('__LeaveStreamsUnattached', '1') except Exception as e: log.exception("Exception trying to launch tor %s", e) + exit(1) + log.info('Started and connected to Tor %s via %s', cont.get_version(), + conf['tor']['control_socket']) + return cont def get_socks_info(controller):

1 0

[sbws/master] Replace log message, unify with previous log
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit db7ebb39df4bc34341eea870a27704c87a75db70 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:24:26 2018 +0000 Replace log message, unify with previous log --- sbws/util/stem.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 255ce22..b4190ef 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -196,7 +196,9 @@ def launch_tor(conf): cont.set_conf('__DisablePredictedCircuits', '1') cont.set_conf('__LeaveStreamsUnattached', '1') except Exception as e: - log.exception("Exception trying to launch tor %s", e) + log.exception("Error trying to launch tor: %s. " + "Maybe the tor directory is being used by other " + "sbws instance?", e) exit(1) log.info('Started and connected to Tor %s via %s', cont.get_version(), conf['tor']['control_socket'])

1 0

[sbws/master] Remove docstring about removed get_circuit_path
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 46b64f7283867572e08fa55df64faf4b06d81047 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:28:48 2018 +0000 Remove docstring about removed get_circuit_path --- sbws/lib/circuitbuilder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index b806a9d..f143b6a 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -27,7 +27,6 @@ class CircuitBuilder: ''' The CircuitBuilder interface. Subclasses must implement their own build_circuit() function. - Subclasses probably shouldn't implement their own get_circuit_path(). Subclasses may keep additional state if they'd find it helpful. The primary way to use a CircuitBuilder of any type is to simply create it

1 0