From bd6390042f73ec64be6cbe3eed4cbc67875f9f6d Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 19 Oct 2021 11:46:21 +1100 Subject: [PATCH] Try to bail if we are not in local-only mode and couldn't start the Meek client --- desktop/src/onionshare/moat_dialog.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/desktop/src/onionshare/moat_dialog.py b/desktop/src/onionshare/moat_dialog.py index 78a05482..cedc52d8 100644 --- a/desktop/src/onionshare/moat_dialog.py +++ b/desktop/src/onionshare/moat_dialog.py @@ -25,6 +25,7 @@ import base64 from . import strings from .gui_common import GuiCommon +from onionshare_cli.meek import MeekNotRunning class MoatDialog(QtWidgets.QDialog): @@ -227,6 +228,11 @@ class MoatThread(QtCore.QThread): # Start Meek so that we can do domain fronting self.meek.start() + # We should only fetch bridges if we can domain front, + # but we can override this in local-only mode. + if not self.meek.meek_proxies and not self.common.gui.local_only: + raise MeekNotRunning() + if self.action == "fetch": self.common.log("MoatThread", "run", f"starting fetch")