Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-23 13:11:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Better detection of different types of bridges, different sources, and multiple bridges of the same type

Browse Source
This commit is contained in:
Miguel Jacq 2021-11-11 18:46:22 +11:00
parent b727a9651f
commit e2603ed7ad
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
1 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
desktop/src/onionshare/tor_connection.py
View File

@ -43,6 +43,7 @@ from .gui_common import GuiCommon
from .widgets import Alert from .widgets import Alert
from onionshare_cli.censorship import CensorshipCircumvention from onionshare_cli.censorship import CensorshipCircumvention
class TorConnectionDialog(QtWidgets.QProgressDialog): class TorConnectionDialog(QtWidgets.QProgressDialog):
""" """
Connecting to Tor dialog. Connecting to Tor dialog.
@ -269,19 +270,60 @@ class TorConnectionWidget(QtWidgets.QWidget):
# (e.g possible censorship) by obtaining bridges for the user, do so # (e.g possible censorship) by obtaining bridges for the user, do so
if self.settings.get("censorship_circumvention"): if self.settings.get("censorship_circumvention"):
# Automatically try to obtain bridges from the Censorship Circumvention API # Automatically try to obtain bridges from the Censorship Circumvention API
self.common.log("TorConnectionWidget", "_error_connecting_to_tor", "Trying to automatically obtain bridges") self.common.log(
"TorConnectionWidget",
"_error_connecting_to_tor",
"Trying to automatically obtain bridges",
)
self.meek.start() self.meek.start()
self.censorship_circumvention = CensorshipCircumvention(self.common, self.meek) self.censorship_circumvention = CensorshipCircumvention(
request_bridges = self.censorship_circumvention.request_settings(country="cn") self.common, self.meek
)
request_bridges = self.censorship_circumvention.request_settings(
country="tm"
)
if request_bridges: if request_bridges:
# @TODO there might be several bridges # @TODO there might be several bridge types recommended.
bridges = request_bridges["settings"][0]["bridges"]["bridge_strings"][0] # Should we attempt to iterate over each type if one of them fails to connect?
self.common.log("TorConnectionWidget", "_error_connecting_to_tor", f"Obtained bridges: {bridges}") # But if so, how to stop it starting 3 separate Tor connection threads?
self.settings.set("bridges_enabled", True) # for bridges in request_bridges["settings"]:
self.settings.set("bridges_type", "custom") bridges = request_bridges["settings"][0]["bridges"]
# @TODO there might be several bridges self.common.log(
self.settings.set("bridges_custom", bridges) "TorConnectionWidget",
self.common.log("TorConnectionWidget", "_error_connecting_to_tor", "Starting Tor again") "_error_connecting_to_tor",
f"Obtained bridges: {bridges}",
)
bridge_strings = bridges["bridge_strings"]
bridge_type = bridges["type"]
bridge_source = bridges["source"]
# If the recommended bridge source is to use the built-in
# bridges, set that in our settings, as if the user had
# selected the built-in bridges for a specific PT themselves.
#
# @TODO should we fetch the built-in bridges from
# censorship_circumvention.request_builtin_bridges()?
#
# In fact, the bridge_string returned for a bridge type 'builtin'
# is in fact the same bridges we'd get from that other method anyway.
if bridge_source == "builtin":
self.settings.set("bridges_type", "built-in")
if bridge_type == "obfs4":
self.settings.set("bridges_builtin_pt", "obfs4")
if bridge_type == "snowflake":
self.settings.set("bridges_builtin_pt", "snowflake")
if bridge_type == "meek":
self.settings.set("bridges_builtin_pt", "meek-azure")
else:
self.settings.set("bridges_type", "custom")
# @TODO do we want to to a sanity check on the bridges like custom ones?
self.settings.set("bridges_custom", "\n".join(bridge_strings))
self.common.log(
"TorConnectionWidget",
"_error_connecting_to_tor",
"Starting Tor again",
)
self.settings.save() self.settings.save()
# Now try and connect again # Now try and connect again
self.start() self.start()