mirror of
https://github.com/onionshare/onionshare.git
synced 2024-10-01 01:35:40 -04:00
Merge pull request #1552 from mig5/better_meek_logs
More verbose and consistent Meek exception logging
This commit is contained in:
commit
fbcad47138
@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
import requests
|
||||
|
||||
from .meek import MeekNotRunning
|
||||
|
||||
|
||||
class CensorshipCircumventionError(Exception):
|
||||
"""
|
||||
@ -47,9 +45,6 @@ class CensorshipCircumvention(object):
|
||||
self.api_proxies = {}
|
||||
if meek:
|
||||
self.meek = meek
|
||||
if not self.meek.meek_proxies:
|
||||
raise MeekNotRunning()
|
||||
else:
|
||||
self.common.log(
|
||||
"CensorshipCircumvention",
|
||||
"__init__",
|
||||
|
@ -69,7 +69,7 @@ class Meek(object):
|
||||
if self.meek_client_file_path is None or not os.path.exists(
|
||||
self.meek_client_file_path
|
||||
):
|
||||
raise MeekNotFound()
|
||||
raise MeekNotFound(self.common)
|
||||
|
||||
# Start the Meek Client as a subprocess.
|
||||
self.common.log("Meek", "start", "Starting meek client")
|
||||
@ -128,7 +128,7 @@ class Meek(object):
|
||||
|
||||
if "CMETHOD-ERROR" in line:
|
||||
self.cleanup()
|
||||
raise MeekNotRunning()
|
||||
raise MeekNotRunning(self.common, line)
|
||||
break
|
||||
|
||||
if self.meek_port:
|
||||
@ -137,9 +137,8 @@ class Meek(object):
|
||||
"https": f"socks5h://{self.meek_host}:{self.meek_port}",
|
||||
}
|
||||
else:
|
||||
self.common.log("Meek", "start", "Could not obtain the meek port")
|
||||
self.cleanup()
|
||||
raise MeekNotRunning()
|
||||
raise MeekNotRunning(self.common, "Could not obtain the meek port")
|
||||
|
||||
def cleanup(self):
|
||||
"""
|
||||
@ -182,8 +181,19 @@ class MeekNotRunning(Exception):
|
||||
number it started on, in order to do domain fronting.
|
||||
"""
|
||||
|
||||
def __init__(self, common, info=None):
|
||||
self.common = common
|
||||
msg = "Meek experienced an error starting up"
|
||||
if info:
|
||||
msg = msg + f": {info}"
|
||||
self.common.log("MeekNotRunning", "__init__", msg)
|
||||
|
||||
|
||||
class MeekNotFound(Exception):
|
||||
"""
|
||||
We were unable to find the Meek Client binary.
|
||||
"""
|
||||
|
||||
def __init__(self, common):
|
||||
self.common = common
|
||||
self.common.log("MeekNotFound", "__init__", "Could not find the meek binary")
|
||||
|
@ -181,6 +181,11 @@ class AutoConnectTab(QtWidgets.QWidget):
|
||||
self.tor_con.start(self.curr_settings)
|
||||
|
||||
def _got_no_bridges(self):
|
||||
self.common.log(
|
||||
"AutoConnectTab",
|
||||
"_got_no_bridges",
|
||||
"Could not obtain bridges, so falling back to trying built-in obfs4 bridges",
|
||||
)
|
||||
# If we got no bridges, try connecting again using built-in obfs4 bridges
|
||||
self.curr_settings.set("bridges_type", "built-in")
|
||||
self.curr_settings.set("bridges_builtin_pt", "obfs4")
|
||||
|
@ -236,14 +236,10 @@ class MoatThread(QtCore.QThread):
|
||||
# Start Meek so that we can do domain fronting
|
||||
try:
|
||||
self.meek.start()
|
||||
except MeekNotFound:
|
||||
self.common.log("MoatThread", "run", f"Could not find meek-client")
|
||||
self.bridgedb_error.emit()
|
||||
return
|
||||
except MeekNotRunning:
|
||||
self.common.log(
|
||||
"MoatThread", "run", f"Ran meek-client, but there was an error"
|
||||
)
|
||||
except (
|
||||
MeekNotFound,
|
||||
MeekNotRunning,
|
||||
):
|
||||
self.bridgedb_error.emit()
|
||||
return
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user