From 035c398f825a6e59c58e1eebdc921bbe10c6b611 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 16 Feb 2025 10:59:16 +1100 Subject: [PATCH 1/2] Only set Censorship Circumvention bridges if we actually received some --- cli/onionshare_cli/censorship.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cli/onionshare_cli/censorship.py b/cli/onionshare_cli/censorship.py index 4cff4862..2c0b1403 100644 --- a/cli/onionshare_cli/censorship.py +++ b/cli/onionshare_cli/censorship.py @@ -242,17 +242,18 @@ class CensorshipCircumvention(object): # 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"]: - bridges = bridge_settings["settings"][0]["bridges"] - bridge_strings = bridges["bridge_strings"] + if bridge_settings["settings"]: + bridges = bridge_settings["settings"][0]["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 # If we got any good bridges, save them to settings and return. if bridges_ok: From 03515b61285fbd41a3d9d946ad13af2e0a0524e2 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 18 Feb 2025 17:19:44 +1100 Subject: [PATCH 2/2] 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 --- cli/onionshare_cli/censorship.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cli/onionshare_cli/censorship.py b/cli/onionshare_cli/censorship.py index 2c0b1403..caa8dd24 100644 --- a/cli/onionshare_cli/censorship.py +++ b/cli/onionshare_cli/censorship.py @@ -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: