Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-28 00:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Catch exceptions for guessing default Tor Browser socket file path

Browse Source
This commit is contained in:
Micah Lee 2017-01-06 11:54:42 -08:00
parent d069cc2a29
commit f14b5ebfa1
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onionshare/onion.py
View File

@ -135,11 +135,14 @@ class Onion(object):
# If this still didn't work, try guessing the default socket file path # If this still didn't work, try guessing the default socket file path
socket_file_path = '' socket_file_path = ''
if not found_tor: if not found_tor:
try:
if p == 'Darwin': if p == 'Darwin':
socket_file_path = os.path.expanduser('~/Library/Application Support/TorBrowser-Data/Tor/control.socket') socket_file_path = os.path.expanduser('~/Library/Application Support/TorBrowser-Data/Tor/control.socket')
self.c = Controller.from_socket_file(path=socket_file_path) self.c = Controller.from_socket_file(path=socket_file_path)
found_tor = True found_tor = True
except:
pass
# If connecting to default control ports failed, so let's try # If connecting to default control ports failed, so let's try
# guessing the socket file name next # guessing the socket file name next