Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 15:05:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Show a dialog while waiting for Tor rendezvous nodes to close, and let the user quit early

Browse source
This commit is contained in:
Micah Lee 2020-11-27 14:50:07 -08:00
parent 184f126189
commit 134611a325
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

71
cli/onionshare_cli/onion.py
View file

@ -729,7 +729,7 @@ class Onion(object):
"Onion", "stop_onion_service", f"failed to remove {onion_host}"
)
def cleanup(self, stop_tor=True):
def cleanup(self, stop_tor=True, wait=True):
"""
Stop onion services that were created earlier. If there's a tor subprocess running, kill it.
"""
@ -756,42 +756,45 @@ class Onion(object):
if stop_tor:
# Stop tor process
if self.tor_proc:
# Wait for Tor rendezvous circuits to close
# Catch exceptions to prevent crash on Ctrl-C
try:
rendevouz_circuit_ids = []
for c in self.c.get_circuits():
if (
c.purpose == "HS_SERVICE_REND"
and c.rend_query in self.graceful_close_onions
):
rendevouz_circuit_ids.append(c.id)
symbols = [c for c in "\\|/-"]
symbols_i = 0
while True:
num_rend_circuits = 0
if wait:
# Wait for Tor rendezvous circuits to close
# Catch exceptions to prevent crash on Ctrl-C
try:
rendevouz_circuit_ids = []
for c in self.c.get_circuits():
if c.id in rendevouz_circuit_ids:
num_rend_circuits += 1
if (
c.purpose == "HS_SERVICE_REND"
and c.rend_query in self.graceful_close_onions
):
rendevouz_circuit_ids.append(c.id)
if num_rend_circuits == 0:
print("\rTor rendezvous circuits have closed" + " " * 20)
break
symbols = [c for c in "\\|/-"]
symbols_i = 0
if num_rend_circuits == 1:
circuits = "circuit"
else:
circuits = "circuits"
print(
f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close {symbols[symbols_i]} ",
end="",
)
symbols_i = (symbols_i + 1) % len(symbols)
time.sleep(1)
except:
pass
while True:
num_rend_circuits = 0
for c in self.c.get_circuits():
if c.id in rendevouz_circuit_ids:
num_rend_circuits += 1
if num_rend_circuits == 0:
print(
"\rTor rendezvous circuits have closed" + " " * 20
)
break
if num_rend_circuits == 1:
circuits = "circuit"
else:
circuits = "circuits"
print(
f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close {symbols[symbols_i]} ",
end="",
)
symbols_i = (symbols_i + 1) % len(symbols)
time.sleep(1)
except:
pass
self.tor_proc.terminate()
time.sleep(0.2)