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

Treat censorship API returning None for bridge settings the same as if it doesn't return bridge settings (#1588)

Browse source
This commit is contained in:
Micah Lee 2022-05-30 14:26:46 -07:00
parent 8dd354f039
commit fb0e28c62b
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cli/onionshare_cli/censorship.py
View file

@ -78,6 +78,7 @@ class CensorshipCircumvention(object):
Note that this API endpoint doesn't return actual bridges, Note that this API endpoint doesn't return actual bridges,
it just returns the recommended bridge type countries. it just returns the recommended bridge type countries.
""" """
self.common.log("CensorshipCircumvention", "request_map", f"country={country}")
if not self.api_proxies: if not self.api_proxies:
return False return False
endpoint = "https://bridges.torproject.org/moat/circumvention/map" endpoint = "https://bridges.torproject.org/moat/circumvention/map"
@ -126,6 +127,11 @@ class CensorshipCircumvention(object):
Optionally, a list of transports can be specified in order to Optionally, a list of transports can be specified in order to
return recommended settings for just that transport type. return recommended settings for just that transport type.
""" """
self.common.log(
"CensorshipCircumvention",
"request_settings",
f"country={country}, transports={transports}",
)
if not self.api_proxies: if not self.api_proxies:
return False return False
endpoint = "https://bridges.torproject.org/moat/circumvention/settings" endpoint = "https://bridges.torproject.org/moat/circumvention/settings"
@ -155,6 +161,11 @@ class CensorshipCircumvention(object):
return False return False
result = r.json() result = r.json()
self.common.log(
"CensorshipCircumvention",
"request_settings",
f"result={result}",
)
if "errors" in result: if "errors" in result:
self.common.log( self.common.log(
@ -167,7 +178,7 @@ class CensorshipCircumvention(object):
# There are no settings - perhaps this country doesn't require censorship circumvention? # There are no settings - perhaps this country doesn't require censorship circumvention?
# This is not really an error, so we can just check if False and assume direct Tor # This is not really an error, so we can just check if False and assume direct Tor
# connection will work. # connection will work.
if not "settings" in result: if not "settings" in result or result["settings"] is None:
self.common.log( self.common.log(
"CensorshipCircumvention", "CensorshipCircumvention",
"request_settings", "request_settings",
@ -218,6 +229,12 @@ class CensorshipCircumvention(object):
""" """
Checks the bridges and saves them in settings. Checks the bridges and saves them in settings.
""" """
self.common.log(
"CensorshipCircumvention",
"save_settings",
f"bridge_settings: {bridge_settings}",
)
bridges_ok = False bridges_ok = False
self.settings = settings self.settings = settings
@ -226,11 +243,6 @@ class CensorshipCircumvention(object):
# But if so, how to stop it starting 3 separate Tor connection threads? # But if so, how to stop it starting 3 separate Tor connection threads?
# for bridges in request_bridges["settings"]: # for bridges in request_bridges["settings"]:
bridges = bridge_settings["settings"][0]["bridges"] bridges = bridge_settings["settings"][0]["bridges"]
self.common.log(
"CensorshipCircumvention",
"save_settings",
f"Obtained bridges: {bridges}",
)
bridge_strings = bridges["bridge_strings"] bridge_strings = bridges["bridge_strings"]
self.settings.set("bridges_type", "custom") self.settings.set("bridges_type", "custom")
@ -260,7 +272,6 @@ class CensorshipCircumvention(object):
) )
return False return False
def request_default_bridges(self): def request_default_bridges(self):
""" """
Retrieves the list of default fall-back bridges from the Tor Project. Retrieves the list of default fall-back bridges from the Tor Project.