Fix meek-client in Windows

1 files changed, 11 insertions, 1 deletions

diff --git a/cli/onionshare_cli/meek.py b/cli/onionshare_cli/meek.py
index b2e70dc1..c5df7b7f 100644
--- a/cli/onionshare_cli/meek.py
+++ b/cli/onionshare_cli/meek.py
@@ -85,6 +85,10 @@ class Meek(object):
         self.common.log("Meek", "start", "Starting meek client")
 
         if self.common.platform == "Windows":
+            env = os.environ.copy()
+            for key in self.meek_env:
+                env[key] = self.meek_env[key]
+
             # In Windows, hide console window when opening meek-client.exe subprocess
             startupinfo = subprocess.STARTUPINFO()
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
@@ -100,7 +104,7 @@ class Meek(object):
                 stderr=subprocess.PIPE,
                 startupinfo=startupinfo,
                 bufsize=1,
-                env=self.meek_env,
+                env=env,
                 text=True,
             )
         else:
@@ -129,6 +133,7 @@ class Meek(object):
             # read stdout without blocking
             try:
                 line = q.get_nowait()
+                self.common.log("Meek", "start", line.strip())
             except Empty:
                 # no stdout yet?
                 pass
@@ -143,6 +148,10 @@ class Meek(object):
                     )
                     break
 
+                if "CMETHOD-ERROR" in line:
+                    self.cleanup()
+                    raise MeekNotRunning()
+
         if self.meek_port:
             self.meek_proxies = {
                 "http": f"socks5h://{self.meek_host}:{self.meek_port}",
@@ -150,6 +159,7 @@ class Meek(object):
             }
         else:
             self.common.log("Meek", "start", "Could not obtain the meek port")
+            self.cleanup()
             raise MeekNotRunning()
 
     def cleanup(self):