Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-09 01:44:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Connecting to Tor in bundled mode now creates a temporary tor data dir, starts a new tor process, and connects to it. Also, refactored Settings dialog to allow Linux to use bundled tor as well

Browse source
This commit is contained in:
Micah Lee 2017-04-13 22:22:34 -07:00
parent 3bbefd7267
commit e295f90e68
4 changed files with 91 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

29
onionshare_gui/settings_dialog.py
View file

@ -25,7 +25,6 @@ from onionshare.settings import Settings
from onionshare.onion import *
from .alert import Alert
from .tor_dialog import TorDialog
class SettingsDialog(QtWidgets.QDialog):
"""
@ -74,16 +73,10 @@ class SettingsDialog(QtWidgets.QDialog):
self.connection_type_bundled_radio = QtWidgets.QRadioButton(strings._('gui_settings_connection_type_bundled_option', True))
self.connection_type_bundled_radio.toggled.connect(self.connection_type_bundled_toggled)
# Bundled Tor only works in Windows and Mac
# Bundled Tor doesn't work on dev mode in Windows or Mac
p = platform.system()
if (p == 'Windows' or p == 'Darwin'):
# Bundled Tor doesn't work on dev mode
if getattr(sys, 'onionshare_dev_mode', False):
self.connection_type_bundled_radio.setEnabled(False)
else:
# If not using Windows or Mac, disable and hide bundled Tor
if (p == 'Windows' or p == 'Darwin') and getattr(sys, 'onionshare_dev_mode', False):
self.connection_type_bundled_radio.setEnabled(False)
self.connection_type_bundled_radio.hide()
# Automatic
self.connection_type_automatic_radio = QtWidgets.QRadioButton(strings._('gui_settings_connection_type_automatic_option', True))
@ -285,20 +278,14 @@ class SettingsDialog(QtWidgets.QDialog):
"""
settings = self.settings_from_fields()
# If using bundled Tor, first connect to Tor
if settings.get('connection_type') == 'bundled':
tor_dialog = TorDialog()
tor_dialog.start()
try:
onion = Onion(settings=settings)
else:
try:
onion = Onion(settings=settings)
# If an exception hasn't been raised yet, the Tor settings work
Alert(strings._('settings_test_success', True).format(onion.tor_version, onion.supports_ephemeral, onion.supports_stealth))
# If an exception hasn't been raised yet, the Tor settings work
Alert(strings._('settings_test_success', True).format(onion.tor_version, onion.supports_ephemeral, onion.supports_stealth))
except (TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorNotSupported) as e:
Alert(e.args[0], QtWidgets.QMessageBox.Warning)
except (TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorNotSupported) as e:
Alert(e.args[0], QtWidgets.QMessageBox.Warning)
def save_clicked(self):
"""