almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Suppress output from all the VM subprocesses, and make the waiting for VM output nicer

Browse source
This commit is contained in:
Micah Lee 2021-07-02 10:09:34 -07:00
parent 5493292ba2
commit ed4586a051
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dangerzone/gui/vm.py
View file

@ -35,7 +35,7 @@ class Vm(QtCore.QObject):
# Processes # Processes
self.vpnkit_p = None self.vpnkit_p = None
self.hyperkit_p = None self.hyperkit_p = None
self.sshd_pid = None self.devnull = open(os.devnull, "w")
# Relevant paths # Relevant paths
self.vpnkit_path = self.global_common.get_resource_path("bin/vpnkit") self.vpnkit_path = self.global_common.get_resource_path("bin/vpnkit")
@ -101,7 +101,9 @@ class Vm(QtCore.QObject):
"", "",
"-f", "-f",
self.ssh_host_key_path, self.ssh_host_key_path,
] ],
stdout=self.devnull,
stderr=self.devnull,
) )
subprocess.run( subprocess.run(
[ [
@ -114,7 +116,9 @@ class Vm(QtCore.QObject):
"", "",
"-f", "-f",
self.ssh_client_key_path, self.ssh_client_key_path,
] ],
stdout=self.devnull,
stderr=self.devnull,
) )
with open(self.ssh_client_key_path) as f: with open(self.ssh_client_key_path) as f:
ssh_client_key = f.read() ssh_client_key = f.read()
@ -152,7 +156,7 @@ class Vm(QtCore.QObject):
] ]
args_str = " ".join(pipes.quote(s) for s in args) args_str = " ".join(pipes.quote(s) for s in args)
print("> " + args_str) print("> " + args_str)
subprocess.run(args) subprocess.run(args, stdout=self.devnull, stderr=self.devnull)
# Create a JSON object to pass into the VM # Create a JSON object to pass into the VM
# This is a 512kb file that starts with a JSON object, followed by null bytes # This is a 512kb file that starts with a JSON object, followed by null bytes
@ -193,7 +197,7 @@ class Vm(QtCore.QObject):
] ]
args_str = " ".join(pipes.quote(s) for s in args) args_str = " ".join(pipes.quote(s) for s in args)
print("> " + args_str) print("> " + args_str)
self.vpnkit_p = subprocess.Popen(args) self.vpnkit_p = subprocess.Popen(args, stdout=self.devnull, stderr=self.devnull)
# Run Hyperkit # Run Hyperkit
args = [ args = [
@ -225,15 +229,10 @@ class Vm(QtCore.QObject):
] ]
args_str = " ".join(pipes.quote(s) for s in args) args_str = " ".join(pipes.quote(s) for s in args)
print("> " + args_str) print("> " + args_str)
self.hyperkit_p = subprocess.Popen(args) # To be able to login to the VM from the console, remove the stdout, stderr, and stdin args below
self.hyperkit_p = subprocess.Popen(
# Get the sshd PID args, stdout=self.devnull, stderr=self.devnull, stdin=self.devnull
with open(self.sshd_pid_path) as f: )
self.sshd_pid = int(f.read())
print(f"sshd PID: {self.sshd_pid}")
print(f"vpnkit PID: {self.vpnkit_p.pid}")
print(f"hyperkit PID: {self.hyperkit_p.pid}")
# Wait for SSH thread # Wait for SSH thread
self.wait_t = WaitForSsh(self.sshd_tunnel_port) self.wait_t = WaitForSsh(self.sshd_tunnel_port)
@ -276,15 +275,17 @@ class Vm(QtCore.QObject):
return port return port
def kill_sshd(self): def kill_sshd(self):
if self.sshd_pid and psutil.pid_exists(self.sshd_pid): if os.path.exists(self.sshd_pid_path):
with open(self.sshd_pid_path) as f:
sshd_pid = int(f.read())
if psutil.pid_exists(sshd_pid):
try: try:
proc = psutil.Process(self.sshd_pid) proc = psutil.Process(sshd_pid)
proc.kill() proc.kill()
except Exception: except Exception:
pass pass
self.sshd_pid = None
class WaitForSsh(QtCore.QThread): class WaitForSsh(QtCore.QThread):
connected = QtCore.Signal() connected = QtCore.Signal()
@ -305,13 +306,14 @@ class WaitForSsh(QtCore.QThread):
sock.connect(("127.0.0.1", int(self.ssh_port))) sock.connect(("127.0.0.1", int(self.ssh_port)))
sock.close() sock.close()
success = True success = True
print("ssh port open!") print("\nVM is ready to use")
break break
except Exception: except Exception:
print("ssh port closed ...") so_far = int(time.time() - start_ts)
print(f"\rWaiting for SSH port to be available ({so_far}s)", end="")
pass pass
time.sleep(2) time.sleep(1)
if time.time() - start_ts >= timeout_seconds: if time.time() - start_ts >= timeout_seconds:
self.timeout.emit() self.timeout.emit()
break break