From f14b5ebfa1f798f7dfde5076107e59a20dd6babc Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 6 Jan 2017 11:54:42 -0800 Subject: [PATCH] Catch exceptions for guessing default Tor Browser socket file path --- onionshare/onion.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/onionshare/onion.py b/onionshare/onion.py index 483d0195..bb5a31af 100644 --- a/onionshare/onion.py +++ b/onionshare/onion.py @@ -135,11 +135,14 @@ class Onion(object): # If this still didn't work, try guessing the default socket file path socket_file_path = '' if not found_tor: - if p == 'Darwin': - socket_file_path = os.path.expanduser('~/Library/Application Support/TorBrowser-Data/Tor/control.socket') + try: + if p == 'Darwin': + socket_file_path = os.path.expanduser('~/Library/Application Support/TorBrowser-Data/Tor/control.socket') - self.c = Controller.from_socket_file(path=socket_file_path) - found_tor = True + self.c = Controller.from_socket_file(path=socket_file_path) + found_tor = True + except: + pass # If connecting to default control ports failed, so let's try # guessing the socket file name next