Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-10-10 20:28:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

Support for Censorship Circumvention API's /default route.

Browse source 
Fall back to trying Censorship API's /default route if no other bridges found.

At time of writing, this returns a couple of built-in obfs4 bridges.

If even that request fails, we will still fall back to our own full list of
obfs4 bridges.
This commit is contained in:
Miguel Jacq 2022-03-28 12:14:02 +11:00
parent be3b5b8ae5
commit 293dfffd3f
2 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
desktop/onionshare/connection_tab.py
View file

@ -181,7 +181,9 @@ class AutoConnectTab(QtWidgets.QWidget):
self.tor_con.start(self.curr_settings)
def _got_no_bridges(self):
# If we got no bridges, try connecting again using built-in obfs4 bridges
# If we got no bridges, even after trying the default bridges
# provided by the Censorship API, try connecting again using
# our built-in obfs4 bridges
self.curr_settings.set("bridges_type", "built-in")
self.curr_settings.set("bridges_builtin_pt", "obfs4")
self.curr_settings.set("bridges_enabled", True)
@ -244,6 +246,16 @@ class AutoConnectTab(QtWidgets.QWidget):
bridge_settings = self.censorship_circumvention.request_settings(
country=country
)
if not bridge_settings:
# Fall back to trying the default bridges from the API
self.common.log(
"AutoConnectTab",
"use_bridge_connect_clicked",
"Falling back to trying default bridges provided by the Censorship Circumvention API",
)
bridge_settings = self.censorship_circumvention.request_default_bridges()
self.common.gui.meek.cleanup()
if bridge_settings and self.censorship_circumvention.save_settings(