Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

You must connect to a socket file instead of a port for Tor Browser 6.5a6. Make automatic settings fallback to socket file if the port doesn't work (only for Linux so far, have not tested in OS X, and is not supported in Windows)

Browse Source
This commit is contained in:
Micah Lee 2016-12-29 13:36:29 -08:00
parent a0abab3653
commit 50835b67f8
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
onionshare/onion.py
View File

@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
from stem.control import Controller from stem.control import Controller
from stem import SocketError from stem import SocketError
from stem.connection import MissingPassword, UnreadableCookieFile from stem.connection import MissingPassword, UnreadableCookieFile
import os, sys, tempfile, shutil, urllib import os, sys, tempfile, shutil, urllib, platform
from . import socks from . import socks
from . import helpers, strings from . import helpers, strings
@ -109,16 +109,20 @@ class Onion(object):
if self.settings.get('connection_type') == 'automatic': if self.settings.get('connection_type') == 'automatic':
# Automatically try to guess the right way to connect to Tor Browser # Automatically try to guess the right way to connect to Tor Browser
# Try connecting # Try connecting to control port
try: found_tor = False
# If the TOR_CONTROL_PORT environment variable is set, use that # If the TOR_CONTROL_PORT environment variable is set, use that
env_port = os.environ.get('TOR_CONTROL_PORT') env_port = os.environ.get('TOR_CONTROL_PORT')
if env_port: if env_port:
try:
self.c = Controller.from_port(port=int(env_port)) self.c = Controller.from_port(port=int(env_port))
found_tor = True
except:
pass
else: else:
# Otherwise, try default ports for Tor Browser, Tor Messenger, and system tor # Otherwise, try default ports for Tor Browser, Tor Messenger, and system tor
found_tor = False
try: try:
ports = [9151, 9153, 9051] ports = [9151, 9153, 9051]
for port in ports: for port in ports:
@ -126,10 +130,24 @@ class Onion(object):
found_tor = True found_tor = True
except: except:
pass pass
# If connecting to default control ports failed, so let's try
# guessing the socket file name next
if not found_tor: if not found_tor:
try:
p = platform.system()
if p == 'Linux':
socket_file_path = '/run/user/{}/Tor/control.socket'.format(os.geteuid())
elif p == 'Darwin':
# TODO: figure out the unix socket path in OS X
socket_file_path = '/run/user/{}/Tor/control.socket'.format(os.geteuid())
elif p == 'Windows':
# Windows doesn't support unix sockets
raise TorErrorAutomatic(strings._('settings_error_automatic')) raise TorErrorAutomatic(strings._('settings_error_automatic'))
except TorErrorAutomatic: self.c = Controller.from_socket_file(path=socket_file_path)
except:
raise TorErrorAutomatic(strings._('settings_error_automatic')) raise TorErrorAutomatic(strings._('settings_error_automatic'))
# Try authenticating # Try authenticating