phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 03:37:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save/load moat bridges to/from settings

Browse source
This commit is contained in:
Micah Lee 2021-10-17 14:26:56 -07:00
parent 2212589625
commit 01b51e94bf
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/onionshare_cli/settings.py
View file

@ -109,6 +109,8 @@ class Settings(object):
"tor_bridges_use_obfs4": False,
"tor_bridges_use_meek_lite_azure": False,
"tor_bridges_use_snowflake": False,
"tor_bridges_use_moat": False,
"tor_bridges_use_moat_bridges": "",
"tor_bridges_use_custom_bridges": "",
"persistent_tabs": [],
"locale": None, # this gets defined in fill_in_defaults()

2
cli/tests/test_cli_settings.py
View file

@ -33,6 +33,8 @@ class TestSettings:
"tor_bridges_use_obfs4": False,
"tor_bridges_use_meek_lite_azure": False,
"tor_bridges_use_snowflake": False,
"tor_bridges_use_moat": False,
"tor_bridges_use_moat_bridges": "",
"tor_bridges_use_custom_bridges": "",
"persistent_tabs": [],
"theme": 0,

43
desktop/src/onionshare/tor_settings_dialog.py
View file

@ -150,7 +150,6 @@ class TorSettingsDialog(QtWidgets.QDialog):
self.bridge_moat_textbox.setMaximumHeight(100)
self.bridge_moat_textbox.setReadOnly(True)
self.bridge_moat_textbox.setWordWrapMode(QtGui.QTextOption.NoWrap)
self.bridge_moat_textbox.hide()
bridge_moat_textbox_options_layout = QtWidgets.QVBoxLayout()
bridge_moat_textbox_options_layout.addWidget(self.bridge_moat_button)
bridge_moat_textbox_options_layout.addWidget(self.bridge_moat_textbox)
@ -417,6 +416,7 @@ class TorSettingsDialog(QtWidgets.QDialog):
self.bridge_obfs4_radio.setChecked(False)
self.bridge_meek_azure_radio.setChecked(False)
self.bridge_snowflake_radio.setChecked(False)
self.bridge_moat_radio.setChecked(False)
self.bridge_custom_radio.setChecked(False)
else:
self.bridge_none_radio.setChecked(False)
@ -429,14 +429,23 @@ class TorSettingsDialog(QtWidgets.QDialog):
self.bridge_snowflake_radio.setChecked(
self.old_settings.get("tor_bridges_use_snowflake")
)
self.bridge_moat_radio.setChecked(
self.old_settings.get("tor_bridges_use_moat")
)
moat_bridges = self.old_settings.get("tor_bridges_use_moat_bridges")
self.bridge_moat_textbox.document().setPlainText(moat_bridges)
if len(moat_bridges.strip()) > 0:
self.bridge_moat_textbox.show()
else:
self.bridge_moat_textbox.hide()
if self.old_settings.get("bridge_custom_bridges"):
if self.old_settings.get("tor_bridges_use_custom_bridges"):
self.bridge_custom_radio.setChecked(True)
# Remove the 'Bridge' lines at the start of each bridge.
# They are added automatically to provide compatibility with
# copying/pasting bridges provided from https://bridges.torproject.org
new_bridges = []
bridges = self.old_settings.get("bridge_custom_bridges").split(
bridges = self.old_settings.get("tor_bridges_use_custom_bridges").split(
"Bridge "
)
for bridge in bridges:
@ -654,7 +663,7 @@ class TorSettingsDialog(QtWidgets.QDialog):
"no_bridges",
"tor_bridges_use_obfs4",
"tor_bridges_use_meek_lite_azure",
"bridge_custom_bridges",
"tor_bridges_use_custom_bridges",
],
):
@ -761,30 +770,46 @@ class TorSettingsDialog(QtWidgets.QDialog):
settings.set("tor_bridges_use_obfs4", False)
settings.set("tor_bridges_use_meek_lite_azure", False)
settings.set("tor_bridges_use_snowflake", False)
settings.set("bridge_custom_bridges", "")
settings.set("tor_bridges_use_moat", False)
settings.set("tor_bridges_use_custom_bridges", "")
if self.bridge_obfs4_radio.isChecked():
settings.set("no_bridges", False)
settings.set("tor_bridges_use_obfs4", True)
settings.set("tor_bridges_use_meek_lite_azure", False)
settings.set("tor_bridges_use_snowflake", False)
settings.set("bridge_custom_bridges", "")
settings.set("tor_bridges_use_moat", False)
settings.set("tor_bridges_use_custom_bridges", "")
if self.bridge_meek_azure_radio.isChecked():
settings.set("no_bridges", False)
settings.set("tor_bridges_use_obfs4", False)
settings.set("tor_bridges_use_meek_lite_azure", True)
settings.set("tor_bridges_use_snowflake", False)
settings.set("bridge_custom_bridges", "")
settings.set("tor_bridges_use_moat", False)
settings.set("tor_bridges_use_custom_bridges", "")
if self.bridge_snowflake_radio.isChecked():
settings.set("no_bridges", False)
settings.set("tor_bridges_use_obfs4", False)
settings.set("tor_bridges_use_meek_lite_azure", False)
settings.set("tor_bridges_use_snowflake", True)
settings.set("bridge_custom_bridges", "")
settings.set("tor_bridges_use_moat", False)
settings.set("tor_bridges_use_custom_bridges", "")
if self.bridge_moat_radio.isChecked():
settings.set("no_bridges", False)
settings.set("tor_bridges_use_obfs4", False)
settings.set("tor_bridges_use_meek_lite_azure", False)
settings.set("tor_bridges_use_snowflake", False)
settings.set("tor_bridges_use_moat", True)
settings.set(
"tor_bridges_use_moat_bridges", self.bridge_moat_textbox.toPlainText()
)
settings.set("tor_bridges_use_custom_bridges", "")
if self.bridge_custom_radio.isChecked():
settings.set("no_bridges", False)
settings.set("tor_bridges_use_obfs4", False)
settings.set("tor_bridges_use_meek_lite_azure", False)
settings.set("tor_bridges_use_snowflake", False)
settings.set("tor_bridges_use_moat", False)
settings.set("tor_bridges_use_moat_bridges", "")
# Insert a 'Bridge' line at the start of each bridge.
# This makes it easier to copy/paste a set of bridges
@ -814,7 +839,7 @@ class TorSettingsDialog(QtWidgets.QDialog):
if bridges_valid:
new_bridges = "".join(new_bridges)
settings.set("bridge_custom_bridges", new_bridges)
settings.set("tor_bridges_use_custom_bridges", new_bridges)
else:
Alert(self.common, strings._("gui_settings_tor_bridges_invalid"))
settings.set("no_bridges", True)