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

Improve the check for returned bridges from CensorShip Circumvention, so that we iterate over potential groups of bridges and break on the first valid set

Browse Source
This commit is contained in:
Miguel Jacq 2025-02-18 17:19:44 +11:00
parent 035c398f82
commit 03515b6128
No known key found for this signature in database
GPG Key ID: 59B3F0C24135C6A9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cli/onionshare_cli/censorship.py
View File

@ -238,22 +238,23 @@ class CensorshipCircumvention(object):
bridges_ok = False
self.settings = settings
# @TODO there might be several bridge types recommended.
# Should we attempt to iterate over each type if one of them fails to connect?
# But if so, how to stop it starting 3 separate Tor connection threads?
# for bridges in request_bridges["settings"]:
if bridge_settings["settings"]:
bridges = bridge_settings["settings"][0]["bridges"]
bridge_strings = bridges["bridge_strings"]
# We iterate over each group of bridges returned in settings.
# The first set of valid bridges are the ones we use.
if bridge_settings.get("settings", False):
for returned_bridge_settings in bridge_settings["settings"]:
if returned_bridge_settings.get("bridges", False):
bridges = returned_bridge_settings["bridges"]
bridge_strings = bridges["bridge_strings"]
self.settings.set("bridges_type", "custom")
self.settings.set("bridges_type", "custom")
# Sanity check the bridges provided from the Tor API before saving
bridges_checked = self.common.check_bridges_valid(bridge_strings)
# Sanity check the bridges provided from the Tor API before saving
bridges_checked = self.common.check_bridges_valid(bridge_strings)
if bridges_checked:
self.settings.set("bridges_custom", "\n".join(bridges_checked))
bridges_ok = True
if bridges_checked:
self.settings.set("bridges_custom", "\n".join(bridges_checked))
bridges_ok = True
break
# If we got any good bridges, save them to settings and return.
if bridges_ok: