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

Snap successfully builds meek-client, and WIP getting tor to connect

Browse source
This commit is contained in:
Micah Lee 2021-11-14 17:52:40 -08:00
parent 0f63c89a59
commit f09bb66425
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cli/onionshare_cli/onion.py
View file

@ -354,6 +354,11 @@ class Onion(object):
f.write("\nUseBridges 1\n")
# Execute a tor subprocess
self.common.log(
"Onion",
"connect",
f"starting {self.tor_path} subprocess",
)
start_ts = time.time()
if self.common.platform == "Windows":
# In Windows, hide console window when opening tor.exe subprocess
@ -374,22 +379,29 @@ class Onion(object):
)
# Wait for the tor controller to start
self.common.log(
"Onion",
"connect",
f"tor pid: {self.tor_proc.pid}",
)
time.sleep(2)
# Connect to the controller
try:
if (
self.common.platform == "Windows"
or self.common.platform == "Darwin"
):
self.c = Controller.from_port(port=self.tor_control_port)
self.c.authenticate()
else:
self.c = Controller.from_socket_file(path=self.tor_control_socket)
self.c.authenticate()
except Exception as e:
print("OnionShare could not connect to Tor:\n{}".format(e.args[0]))
raise BundledTorBroken(e.args[0])
self.common.log(
"Onion",
"connect",
"authenticating to tor controller",
)
# try:
if self.common.platform == "Windows" or self.common.platform == "Darwin":
self.c = Controller.from_port(port=self.tor_control_port)
self.c.authenticate()
else:
self.c = Controller.from_socket_file(path=self.tor_control_socket)
self.c.authenticate()
# except Exception as e:
# print("OnionShare could not connect to Tor:\n{}".format(e))
# raise BundledTorBroken(e.args[0])
while True:
try: